Changeset 29428 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java
- Timestamp:
- 2014-11-13T13:14:59+13:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java
r29143 r29428 66 66 String physical_index_language_name = null; 67 67 String physical_sub_index_name = null; 68 int maxdocs = 100;69 int hits_per_page = 20;70 int start_page = 1;71 String sort_field = GS2LuceneQuery.SORT_RANK;72 String sort_order = SORT_ORDER_ASCENDING;68 int maxdocs = Integer.parseInt(paramDefaults.get(MAXDOCS_PARAM)); 69 int hits_per_page = Integer.parseInt(paramDefaults.get(HITS_PER_PAGE_PARAM)); 70 int start_page = Integer.parseInt(paramDefaults.get(START_PAGE_PARAM)); 71 String sort_field = getLuceneSort(default_sort); 72 String sort_order = paramDefaults.get(SORT_ORDER_PARAM); 73 73 // set up the query params 74 74 Set entries = params.entrySet(); … … 106 106 else if (name.equals(RANK_PARAM)) 107 107 { 108 if (value.equals(RANK_PARAM_RANK)) 109 { 110 value = GS2LuceneQuery.SORT_RANK; 111 } else if (value.equals(RANK_PARAM_NONE)) { 112 value = GS2LuceneQuery.SORT_NATURAL; 113 } 114 this.lucene_src.setSortField(value); 115 sort_field = value; 108 sort_field = getLuceneSort(value); 109 this.lucene_src.setSortField(sort_field); 110 116 111 } 117 112 else if (name.equals(SORT_ORDER_PARAM)) { … … 264 259 return null; 265 260 } 261 262 protected String getLuceneSort(String gs3_sort) { 263 264 if (gs3_sort.equals(RANK_PARAM_RANK)) { 265 return GS2LuceneQuery.SORT_RANK; 266 } 267 if (gs3_sort.equals(RANK_PARAM_NONE)) { 268 return GS2LuceneQuery.SORT_NATURAL; 269 } 270 return gs3_sort; 271 } 266 272 }
Note:
See TracChangeset
for help on using the changeset viewer.