Changeset 32378 for gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
- Timestamp:
- 2018-08-24T20:44:34+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs3-extensions/solr/trunk/src/src/java/org/greenstone/gsdl3/service/GS2SolrSearch.java
r32110 r32378 62 62 { 63 63 64 public static final String SOLR_SERVLET_SUFFIX = "/solr";65 64 protected static final String SORT_ORDER_PARAM = "sortOrder"; 66 65 protected static final String SORT_ORDER_DESCENDING = "1"; … … 97 96 globalProperties.load(Class.forName("org.greenstone.util.GlobalProperties").getClassLoader().getResourceAsStream("global.properties")); 98 97 String host = globalProperties.getProperty("tomcat.server", "localhost"); 99 String port = globalProperties.getProperty("tomcat.port ", "8383");98 String port = globalProperties.getProperty("tomcat.port.http", "8383"); 100 99 String protocol = globalProperties.getProperty("tomcat.protocol", "http"); 100 String solrContext = globalProperties.getProperty("solr.context", "solr"); 101 101 102 102 String portStr = port.equals("80") ? "" : ":"+port; 103 solr_servlet_base_url = protocol+"://"+host+portStr+ SOLR_SERVLET_SUFFIX;103 solr_servlet_base_url = protocol+"://"+host+portStr+"/"+solrContext; 104 104 } catch(Exception e) { 105 105 logger.error("Error reading greenstone's tomcat solr server properties from global.properties", e);
Note:
See TracChangeset
for help on using the changeset viewer.