Changeset 5644 for trunk/gsdl3

Timestamp:

2003-10-16T09:59:02+13:00 (21 years ago)

Author:

kjdon

Message:

can now specify in teh config file what types of search should be provided - so just just have plain or form search

File:

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

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

@@ -71 +71 @@
     private static final String FIELD_COMBINE_PARAM_NOT = "2";
 
+    // some stuff for config files
+    private static final String SEARCH_TYPE_ELEM = "searchType";
+    private static final String SEARCH_TYPE_PLAIN = "plain";
+    private static final String SEARCH_TYPE_FORM = "form";
+    private static final String SEARCH_TYPE_FORM_SIMPLE = "simple";
+    private static final String SEARCH_TYPE_FORM_ADVANCED = "advanced";
+
+
     private static final int TEXT_QUERY = 0;
     private static final int SIMPLE_QUERY = 1;
@@ -80 +88 @@
     // the default level for retrieval - and we'll use it for searching too
     private String default_level=null;
+    // which search services will we offer??
+    private boolean plain_search = false;
+    private boolean simple_form_search = false;
+    private boolean advanced_form_search = false;
     
     /** constructor */
@@ -95 +107 @@
         return false;
     
+    // the format info is the same for all services
+    Element format_info = (Element)format_info_map.get(TEXT_QUERY_SERVICE);
+
+    // the generic config has set up the text query service, but we may not want it
+    Element search_type_list = (Element) GSXML.getChildByTagName(info, SEARCH_TYPE_ELEM + GSXML.LIST_MODIFIER);
+    if (search_type_list == null) {
+        // assume form and plain
+        this.plain_search = true;
+        this.simple_form_search = true;
+        this.advanced_form_search = true;
+    } else {
+        NodeList types = search_type_list.getElementsByTagName(SEARCH_TYPE_ELEM);
+        for (int i=0; i<types.getLength(); i++) {
+        Element t = (Element)types.item(i);
+        String type_name = t.getAttribute(GSXML.NAME_ATT);
+        if (type_name.equals(SEARCH_TYPE_PLAIN)) {
+            this.plain_search = true;
+        } else if (type_name.equals(SEARCH_TYPE_FORM)) {
+            String type_type = t.getAttribute(GSXML.TYPE_ATT);
+            if (type_type.equals("")) {
+            this.simple_form_search = true;
+            this.advanced_form_search = true;
+            } else if (type_type.equals(SEARCH_TYPE_FORM_SIMPLE)) {
+            this.simple_form_search = true;
+            } else if (type_type.equals(SEARCH_TYPE_FORM_ADVANCED)) {
+            this.advanced_form_search = true;
+            
+            }
+        }
+        }
+    }
+
+    if (!this.plain_search) {
+        // need to remove the TextQuery service
+        Element tq_service = GSXML.getNamedElement(short_service_info, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, TEXT_QUERY_SERVICE);
+        short_service_info.removeChild(tq_service);
+        
+    }
+
+    
     // Do specific configuration
     System.out.println("Configuring GS2MGPPSearch...");
@@ -126 +178 @@
     // else set up the fielded query services
     
-    // set up short_service_info_ - for now just has id and type - name will be added in on teh fly
-    Element fq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
-    fq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
-    fq_service.setAttribute(GSXML.NAME_ATT, FIELD_QUERY_SERVICE);
-    this.short_service_info.appendChild(fq_service);
-    
-    Element afq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
-    afq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
-    afq_service.setAttribute(GSXML.NAME_ATT, ADVANCED_FIELD_QUERY_SERVICE);
-    this.short_service_info.appendChild(afq_service);
-    
-
-    //set up format info - the info is the same as that for text query
-    Element format_info = (Element)format_info_map.get(TEXT_QUERY_SERVICE);
-    if (format_info != null) {
-        this.format_info_map.put(FIELD_QUERY_SERVICE, format_info);
-        this.format_info_map.put(ADVANCED_FIELD_QUERY_SERVICE, format_info);
+    if (this.simple_form_search) {
+        // set up short_service_info_ - for now just has id and type - name will be added in on teh fly
+        Element fq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        fq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
+        fq_service.setAttribute(GSXML.NAME_ATT, FIELD_QUERY_SERVICE);
+        this.short_service_info.appendChild(fq_service);
+
+        if (format_info != null) {
+        this.format_info_map.put(FIELD_QUERY_SERVICE, format_info);
+        }
+    }
+    
+    if (this.advanced_form_search) {
+        Element afq_service = this.doc.createElement(GSXML.SERVICE_ELEM);
+        afq_service.setAttribute(GSXML.TYPE_ATT, GSXML.SERVICE_TYPE_QUERY);
+        afq_service.setAttribute(GSXML.NAME_ATT, ADVANCED_FIELD_QUERY_SERVICE);
+        this.short_service_info.appendChild(afq_service);
+        
+        if (format_info != null) {
+        this.format_info_map.put(ADVANCED_FIELD_QUERY_SERVICE, format_info);
+        }
     }
     return true;
@@ -148 +204 @@
 
     protected Element getServiceDescription(String service_id, String lang, String subset) {
+    // should we check that the service is actually on offer? presumably we wont get asked for services that we haven't advertised previously.
     
     if (!service_id.equals(FIELD_QUERY_SERVICE) && !service_id.equals(ADVANCED_FIELD_QUERY_SERVICE)) {
         return super.getServiceDescription(service_id, lang, subset);
     }
+    
     
     Element service = this.doc.createElement(GSXML.SERVICE_ELEM);