litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-742 Many changes to remove "solr" from the code base.

Browse source 
Comments, template names, Java classes, variables and method names (Java and JavaScript), etc.
This commit is contained in:
j2blake 2014-04-23 14:20:22 -04:00
parent 711afa44fa
commit 02bdddab23
14 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -67,7 +67,7 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
# For multiple language support
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
# Add VIVO specific DocumentModifers, this must come before SolrSetup
# Add VIVO specific DocumentModifers, this must come before SearchIndexerSetup
edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers
# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper

6
productMods/js/homePageUtils.js
View file

@ -23,7 +23,7 @@ $(document).ready(function(){
var individualList = "";
if ( facultyMemberCount > 0 ) {
// determine the row at which to start the solr query
// determine the row at which to start the search query
var rowStart = Math.floor((Math.random()*facultyMemberCount));
var diff;
var pageSize = 4; // the number of faculty to display on the home page
@ -34,7 +34,7 @@ $(document).ready(function(){
}
// in case the random number is equal to or within 3 of the facultyMemberCount
// subtract 1 from the facultyMemberCount because the Solr rows begin at 0, not 1
// subtract 1 from the facultyMemberCount because the search rows begin at 0, not 1
if ( (rowStart + (pageSize-1)) > (facultyMemberCount-1) ) {
diff = (rowStart + (pageSize-1)) - (facultyMemberCount-1);
if ( diff == 0 ) {
@ -48,7 +48,7 @@ $(document).ready(function(){
rowStart = 0;
}
var dataServiceUrl = urlsBase + "/dataservice?getRandomSolrIndividualsByVClass=1&vclassId=";
var dataServiceUrl = urlsBase + "/dataservice?getRandomSearchIndividualsByVClass=1&vclassId=";
var url = dataServiceUrl + encodeURIComponent("http://vivoweb.org/ontology/core#FacultyMember");
url += "&page=" + rowStart + "&pageSize=" + pageSize;

2
productMods/js/menupage/processDataGetterUtils.js
View file

@ -11,7 +11,7 @@ var processDataGetterUtils = {
"sparqlQuery": processSparqlDataGetterContent,
"fixedHtml":processFixedHTMLDataGetterContent,
"internalClass":processInternalClassDataGetterContent,
"solrIndividuals":processSolrDataGetterContent},
"searchIndividuals":processSearchDataGetterContent},
selectDataGetterType:function(pageContentSection) {
var contentType = pageContentSection.attr("contentType");
//The form can provide "browse class group" as content type but need to check

2
productMods/templates/freemarker/edit/forms/addConceptThroughObjectPropertyAutoComplete.ftl
View file

@ -103,7 +103,7 @@
<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
<#--Passing in object types only if there are any types returned, otherwise
the parameter should not be passed at all to the solr search.
the parameter should not be passed at all to the search.
Also multiple types parameter set to true only if more than one type returned-->
<script type="text/javascript">
var customFormData = {

2
productMods/templates/freemarker/edit/forms/autoCompleteDataPropForm.ftl
View file

@ -58,7 +58,7 @@
<#--Not including defaultFormScripts.ftl which would trigger tinyMce-->
<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
<#--Passing in object types only if there are any types returned, otherwise
the parameter should not be passed at all to the solr search.
the parameter should not be passed at all to the search.
Also multiple types parameter set to true only if more than one type returned-->
<script type="text/javascript">
var customFormData = {

2
productMods/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
View file

@ -15,7 +15,7 @@ scripts list.-->
"internalClass": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.InternalClassesDataGetter",
"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter",
"solrIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
"searchIndividuals":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SearchIndividualsDataGetter"
}
};
</script>

2
productMods/templates/freemarker/lib/lib-home-page.ftl
View file

@ -30,7 +30,7 @@
</section>
</#macro>
<#-- We need the faculty count in order to randomly select 4 faculty using a solr query -->
<#-- We need the faculty count in order to randomly select 4 faculty using a search query -->
<#macro facultyMemberCount classGroups>
<#assign foundClassGroup = false />
<#list classGroups as group>

2
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java
View file

@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/**
* Class that adds text from context nodes to Solr Documents for
* Class that adds text from context nodes to Search Documents for
* foaf:Agent individuals.
*/
public class VivoAgentContextNodeFields extends ContextNodeFields{

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java
View file

@ -44,9 +44,9 @@ public class VivoDocumentModifiers implements javax.servlet.ServletContextListen
Dataset dataset = DatasetFactory.create(ModelAccess.on(context).getJenaOntModel());
/* Put DocumentModifiers into servlet context for use later in startup by SolrSetup
/* Put DocumentModifiers into servlet context for use later in startup by SearchSetup
* This adds the code for VIVO specific additions to the building
* of solr Documents. */
* of search input Documents. */
List<DocumentModifier> modifiers = (List<DocumentModifier>)context.getAttribute("DocumentModifiers");
if( modifiers == null ){
modifiers = new ArrayList<DocumentModifier>();

4
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java
View file

@ -9,9 +9,9 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/**
* DocumentModifier to populate Solr fields for the basic ISF relationships.
* DocumentModifier to populate Search index fields for the basic ISF relationships.
*
* This will add the all rdfs:labels of the related individuals to the solr document.
* This will add the all rdfs:labels of the related individuals to the search document.
*
* @author bdc34
*/

32
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java
View file

@ -11,14 +11,14 @@ import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeField
/*
* This DocumentModifier is for the ISF style grants.
* It will
* add people's names to the grant's Solr Document
* add the grant's name to the people's Solr Document
* add the grant's name to the Organization's Solr Document
* add the organization's name to the grant's Solr Document
* add the grant's names to the project's Solr Document
* add the people's names to the project's Solr Document
* add the project's name to the grant's Solr Document
* add the project's name to the people's Solr Document
* add people's names to the grant's search Document
* add the grant's name to the people's search Document
* add the grant's name to the Organization's search Document
* add the organization's name to the grant's search Document
* add the grant's names to the project's search Document
* add the people's names to the project's search Document
* add the project's name to the grant's search Document
* add the project's name to the people's search Document
*/
public class VivoISFGrantFields extends ContextNodeFields {
private static String VIVONS = "http://vivoweb.org/ontology/core#";
@ -35,7 +35,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
}
/**
* Query to add people's names to the grant's Solr Document.
* Query to add people's names to the grant's search Document.
* ?uri is the URI of a grant.
*/
private static String peopleForGrant =
@ -48,7 +48,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the grant's name to the people's Solr Document.
* Query to add the grant's name to the people's search Document.
* ?uri is the URI of a person.
*/
private static String grantsForPerson =
@ -63,7 +63,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the grant's name to the Organization's Solr Document.
* Query to add the grant's name to the Organization's search Document.
* ?uri is the URI of an Organization.
*/
private static String grantsForOrganization =
@ -76,7 +76,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the organization's name to the grant's Solr Document.
* Query to add the organization's name to the grant's search Document.
* ?uri is the URI of a grant.
*/
private static String organizationsForGrant =
@ -89,7 +89,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the grant's names to the project's Solr Document.
* Query to add the grant's names to the project's search Document.
* ?uir is the URI of a Project.
*/
private static String grantsForProject =
@ -103,7 +103,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the people's names to the project's Solr Document.
* Query to add the people's names to the project's search Document.
* ?uri is the URI of a Project.
*/
private static String peopleForProject =
@ -117,7 +117,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the project's name to the grant's Solr Document.
* Query to add the project's name to the grant's search Document.
* ?uri is the URI of a grant.
*/
private static String projectsForGrant =
@ -133,7 +133,7 @@ public class VivoISFGrantFields extends ContextNodeFields {
"}";
/**
* Query to add the project's name to the people's Solr Document.
* Query to add the project's name to the people's search Document.
* ?uri is the URI of a person.
*/
private static String projectsForPerson =

8
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java
View file

@ -10,8 +10,8 @@ import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeField
/**
* This class will:
* add people's names to organization's Solr Documents.
* add organization names to people's Solr Documents.
* add people's names to organization's search Documents.
* add organization names to people's search Documents.
*
* @author bdc34
*
@ -31,7 +31,7 @@ public class VivoISFMemberFields extends ContextNodeFields {
}
/**
* Add people's names to organization's Solr Documents.
* Add people's names to organization's search Documents.
*/
private static String peopleForOrganization =
prefix +
@ -43,7 +43,7 @@ public class VivoISFMemberFields extends ContextNodeFields {
"}";
/**
* add organization names to people's Solr Documents.
* add organization names to people's search Documents.
*/
private static String organizationForPeople =
prefix +

2
src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java
View file

@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/**
* Class that adds text from context nodes to Solr Documents for
* Class that adds text from context nodes to search index Documents for
* obo:IAO_0000030 individuals.
*
* @author bdc34

2
themes/wilma/templates/page-home.ftl
View file

@ -25,7 +25,7 @@
</head>
<body class="${bodyClasses!}" onload="${bodyOnload!}">
<#-- supplies the faculty count to the js function that generates a random row number for the solr query -->
<#-- supplies the faculty count to the js function that generates a random row number for the search query -->
<@lh.facultyMemberCount vClassGroups! />
<#include "identity.ftl">