Changeset 3680

Timestamp:

2003-01-17T10:37:25+13:00 (21 years ago)

Author:

kjdon

Message:

small changes

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (2 diffs)

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

@@ -298 +298 @@
         
         // the field list - should be read from config file
-        String [] vals2 = {"TX", "SU", "TI"};
-        String [] vals2_texts = {"TextOnly", "Subject", "Title"};
+        String [] vals2 = {"TX", "SU", "TI", "OR"};
+        String [] vals2_texts = {"TextOnly", "Subject", "Title", "Organization"};
         
         if (display) {
@@ -511 +511 @@
 
     protected Element processFieldQuery(Element request) {
-    return processFieldQuery(request, "simple");
+    return processAnyFieldQuery(request, "simple");
     }
 
     protected Element processAdvancedFieldQuery(Element request) {
-    return processFieldQuery(request, "advanced");
+    return processAnyFieldQuery(request, "advanced");
     }
 
     /** process a fielded query */
-    protected Element processFieldQuery(Element request, String type) {
-    
-    System.out.println("processing Field Query...");
+    protected Element processAnyFieldQuery(Element request, String type) {
+    
+    System.out.println("processing any Field Query...");
     Element result = doc_.createElement(GSXML.RESPONSE_ELEM);
-    String from = GSPath.appendLink(cluster_name_, FIELD_QUERY_SERVICE);
+    String from = null;
+    if (type.equals("simple")) {
+        from = GSPath.appendLink(cluster_name_, FIELD_QUERY_SERVICE);
+    } else {
+        from = GSPath.appendLink(cluster_name_, ADVANCED_FIELD_QUERY_SERVICE);
+    }
     result.setAttribute(GSXML.FROM_ATT, from);
     result.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_QUERY);