Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java
- Timestamp:
- 2012-05-22T13:01:04+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java
r25461 r25635 34 34 import java.util.Vector; 35 35 import java.io.File; 36 import java.io.Serializable; 36 37 37 38 import org.apache.log4j.*; … … 391 392 if (name.equals(LEVEL_PARAM)) 392 393 { 393 ArrayList level_ids = new ArrayList();394 ArrayList level_names = new ArrayList();394 ArrayList<String> level_ids = new ArrayList<String>(); 395 ArrayList<String> level_names = new ArrayList<String>(); 395 396 getLevelData(level_ids, level_names, lang); 396 397 if (level_ids.size() > 1) … … 429 430 else if (name.equals(FIELD_FIELD_PARAM)) 430 431 { 431 ArrayList fields = new ArrayList();432 ArrayList field_names = new ArrayList();432 ArrayList<String> fields = new ArrayList<String>(); 433 ArrayList<String> field_names = new ArrayList<String>(); 433 434 getIndexData(fields, field_names, lang); 434 435 // the field list - read from config file … … 438 439 // Changed from: 439 440 // param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names ); 440 String default_value = (fields.size() > 0) ? (String)fields.get(0) : null;441 String default_value = (fields.size() > 0) ? fields.get(0) : null; 441 442 // don't want to access element 0 if fields.size()==0, and 442 443 // GSXML.createParameterDescription2 checks for default_value==null condition … … 465 466 466 467 // should cache some of this 467 protected void getLevelData(ArrayList level_ids, ArrayListlevel_names, String lang)468 protected void getLevelData(ArrayList<String> level_ids, ArrayList<String> level_names, String lang) 468 469 { 469 470 Element level_list = (Element) GSXML.getChildByTagName(this.config_info, LEVEL_ELEM + GSXML.LIST_MODIFIER); … … 565 566 566 567 // Process the request parameters 567 HashMap params = GSXML.extractParams(param_list, false);568 HashMap<String, Serializable> params = GSXML.extractParams(param_list, false); 568 569 569 570 // Make sure a query has been specified … … 658 659 /** methods to handle actually doing the query */ 659 660 /** do any initialisation of the query object */ 660 abstract protected boolean setUpQueryer(HashMap params);661 abstract protected boolean setUpQueryer(HashMap<String, Serializable> params); 661 662 662 663 /** do the query */ … … 673 674 674 675 /** add in term info if available */ 675 abstract protected boolean addTermInfo(Element term_list, HashMap params, Object query_result);676 abstract protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, Object query_result); 676 677 677 678 /** … … 680 681 */ 681 682 /** We assume the combination (AND/OR) is done by the match param */ 682 protected String parseFieldQueryParams(HashMap params)683 protected String parseFieldQueryParams(HashMap<String, Serializable> params) 683 684 { 684 685 … … 707 708 * query 708 709 */ 709 protected String parseAdvancedFieldQueryParams(HashMap params)710 protected String parseAdvancedFieldQueryParams(HashMap<String, Serializable> params) 710 711 { 711 712
Note:
See TracChangeset
for help on using the changeset viewer.