Changeset 10193 for trunk/gsdl3

Timestamp:

2005-06-29T16:59:36+12:00 (19 years ago)

Author:

kjdon

Message:

check the field param before sending it to IVia - it may contain an invalid index name if no index is selcted on the query page

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java (modified) (4 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java

@@ -31 +31 @@
 
     protected String ivia_server_url = null;
-
+    protected ArrayList index_ids = null;
     public IViaSearch()
     {
@@ -56 +56 @@
     does_multi_index_search = true;
     this.default_index = ",kw,au,su,ti,de,fu,"; // all of them
+    index_ids = new ArrayList();
+    index_ids.add("kw");
+    index_ids.add("au");    
+    index_ids.add("su");    
+    index_ids.add("ti");
+    index_ids.add("de");
+    index_ids.add("fu");
+
     return true;
     }
@@ -88 +96 @@
     // check for fields
     String fields = (String) params.get(INDEX_PARAM);
-    if (fields != null && !fields.equals("")) {
+    fields = checkFieldParam(fields); // removes invalid fields
+    if (!fields.equals("")) {
         url_string += "&fields="+fields;
     }
-
     //check for hits per page
     String hits_per_page = (String) params.get(HITS_PER_PAGE_PARAM);
@@ -151 +159 @@
     }
      
-
+    protected String checkFieldParam(String fields) {
+    
+    if (fields == null) {
+        // return the default
+        return "";
+    }
+    StringBuffer new_fields = new StringBuffer();
+    String [] ids = fields.split(",");
+    for (int i=0; i<ids.length; i++) {
+        if(index_ids.contains(ids[i])) {
+        new_fields.append(ids[i]);
+        new_fields.append(",");
+        }
+    }
+    if (new_fields.length() == 0) {
+        return "";
+    }
+    return new_fields.toString();
+    }
     /**
        An IVia server has a fixed list of fields to search (I think) so we can hard code them here rather than reading them in from a config file
     */
     protected void getIndexData(ArrayList index_ids, ArrayList index_names,String lang){
-    index_ids.add("kw");
-    index_ids.add("au");    
-    index_ids.add("su");    
-    index_ids.add("ti");
-    index_ids.add("de");
-    index_ids.add("fu");
+    index_ids.addAll(this.index_ids);
     index_names.add(getTextString("param."+INDEX_PARAM+".kw", lang)); 
     index_names.add(getTextString("param."+INDEX_PARAM+".au", lang));