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

10
webapp/web/templates/freemarker/body/admin/searchIndex.ftl
View file

@ -7,16 +7,16 @@
<h2>${i18n().search_index_status}</h2>
<#if !indexIsConnected>
<!-- Can't contact the Solr server. Indexing would be impossible. Show an error message. -->
<!-- Can't contact the search engine. Indexing would be impossible. Show an error message. -->
<section id="error-alert" role="alert">
<img src="${urls.images}/iconAlert.png" width="24" height="24" alt="Error alert icon" />
<p>${i18n().search_index_not_connected}</p>
<p><tt>SolrServer.ping()</tt> ${i18n().failed}.
<p><tt>SearchEngine.ping()</tt> ${i18n().failed}.
<p>${i18n().check_startup_status}</p>
</section>
<#elseif worklevel == "IDLE">
<!-- Solr indexer is idle. Show the button that rebuilds the index. -->
<!-- Search indexer is idle. Show the button that rebuilds the index. -->
<h3>${i18n().search_indexer_idle}</h3>
<#if hasPreviousBuild??>
<p>${i18n().most_recent_update} ${since?string("hh:mm:ss a, MMMM dd, yyyy")}</p>
@ -30,12 +30,12 @@
</form>
<#elseif totalToDo == 0>
<!-- Solr indexer is preparing the list of records. Show elapsed time since request. -->
<!-- Search indexer is preparing the list of records. Show elapsed time since request. -->
<h3>${i18n().preparing_to_rebuild_index}</h3>
<p>${i18n().since_elapsed_time(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed)}</p>
<#else>
<!-- Solr indexer is re-building the index. Show the progress. -->
<!-- Search indexer is re-building the index. Show the progress. -->
<h3>${i18n().current_task(currentTask)}</h3>
<p>${i18n().since_elapsed_time_est_total(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed,expected)}</p>
<p>${i18n().index_recs_completed(completedCount,totalToDo)}</p>

0
webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl → webapp/web/templates/freemarker/body/menupage/menupage--defaultSearchIndividuals.ftl
View file

5
webapp/web/templates/freemarker/body/menupage/menupage--exampleMultipleContentTypes.ftl
View file

@ -1,5 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--This is an example of including multiple content types in the same template, this combines the default templates for Fixed HTML, Class groups and Solr Individuals in one template-->
<#--This is an example of including multiple content types in the same template,
this combines the default templates for Fixed HTML, Class groups and Search Individuals in one template-->
<#include "menupage-checkForData.ftl">
<#--Fixed HTML portion-->
<#--Note that variableName is employed by both the fixed html and sparql query templates, this is used to store the
@ -32,7 +33,7 @@ variableName is used below.-->
${noDataNotification}
</#if>
<#--Solr Individuals section-->
<#--Search Individuals section-->
<#import "lib-list.ftl" as l>
<#include "individualList-checkForData.ftl">

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}',