litvinovg/vitro
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:
Jim Blake 2014-04-23 14:20:14 -04:00
parent cceca1659b
commit ad9c08cf28
29 changed files with 97 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.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
webapp/web/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
View file

@ -3,4 +3,4 @@
<#include "pageManagement--browseClassGroups.ftl">
<#include "pageManagement--sparqlQuery.ftl">
<#include "pageManagement--fixedHtml.ftl">
<#include "pageManagement--solrIndividuals.ftl">
<#include "pageManagement--searchIndividuals.ftl">

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

@ -13,7 +13,7 @@ scripts list.-->
"individualsForClasses": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter",
"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>

8
webapp/web/templates/freemarker/edit/forms/pageManagement--solrIndividuals.ftl → webapp/web/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
View file

@ -3,7 +3,7 @@
<#assign classGroup = pageData.classGroup />
<#assign classGroups = pageData.classGroups />
<#assign classes = pageData.classes />
<section id="solrIndividuals" class="contentSectionContainer">
<section id="searchIndividuals" class="contentSectionContainer">
<label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
<input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
<label id="vclassUriLabel" for="vclassUri">${i18n().select_vclass_uri}<span class="requiredHint"> *</span></label>
@ -21,8 +21,8 @@
</#if>
</section>
<script>
var i18nStringsSolrIndividuals = {
solrIndividuals: '${i18n().solr_individual_results}',
var i18nStringsSearchIndividuals = {
searchIndividuals: '${i18n().solr_individual_results}',
supplyQueryVariable: '${i18n().supply_query_variable}',
noApostrophes: '${i18n().apostrophe_not_allowed}',
noDoubleQuotes: '${i18n().double_quote_note_allowed}',
@ -30,4 +30,4 @@
selectClass: '${i18n().select_class_for_solr}'
};
</script>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSolrDataGetterContent.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSearchDataGetterContent.js"></script>')}

4
webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
View file

@ -81,7 +81,7 @@
<option value="browseClassGroup">${i18n().browse_class_group}</option>
<option value="fixedHtml">${i18n().fixed_html}</option>
<option value="sparqlQuery">${i18n().sparql_query_results}</option>
<option value="solrIndividuals">${i18n().solr_individual_results}</option>
<option value="searchIndividuals">${i18n().solr_individual_results}</option>
</select>&nbsp;<span class="note">${i18n().add_types}</span>
</section>
<section id="contentDivs"></section>
@ -179,7 +179,7 @@
browseClassGroup: '${i18n().browse_class_group}',
fixedHtml: '${i18n().fixed_html}',
sparqlResults: '${i18n().sparql_query_results}',
solrIndividuals: '${i18n().solr_individual_results}',
searchIndividuals: '${i18n().solr_individual_results}',
orString: '${i18n().or}',
deleteString: '${i18n().delete}',
allCapitalized: '${i18n().all_capitalized}',