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
Download patch file Download diff file Expand all files Collapse all files

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