Changeset 6677 for trunk/gsdl3/src/java/org/greenstone/gsdl3/core

Timestamp:

2004-02-02T11:26:18+13:00 (20 years ago)

Author:

nzdl

Message:

now gets the query service description if on the about page

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/NZDLReceptionist.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/core/NZDLReceptionist.java

@@ -29 +29 @@
     // this gets the collection info
     Element page_response = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM);
+    Element page_request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
     Element collection_info = (Element)GSXML.getChildByTagName(page_response, GSXML.COLLECTION_ELEM);
     if (collection_info== null) {
@@ -42 +43 @@
         return;
     }
-
+    
+    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+    String lang = page.getAttribute(GSXML.LANG_ATT);
+    
+    boolean do_classifier = false;
+    boolean do_query = false;
     Element classifier_service = GSXML.getNamedElement(service_list, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, "ClassifierBrowse");
-    if (classifier_service == null) {
-        return; // no browsing stuff
+    Element query_service = GSXML.getNamedElement(service_list, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, "TextQuery");
+    if (classifier_service != null) {
+        do_classifier = true;
+        // find the list of classifiers
+    
+        String to = GSPath.appendLink(collection, "ClassifierBrowse");
+        Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, ""); 
+        info_message.appendChild(info_request);
     }
-        
-    String lang = page.getAttribute(GSXML.LANG_ATT);
-    // find the list of classifiers
-    Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    String to = GSPath.appendLink(collection, "ClassifierBrowse");
-    Element info_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, ""); 
-    info_message.appendChild(info_request);
     
-    Element info_response = (Element) this.mr.process(info_message);
-    String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
-    Element classifier_service_info = (Element)GSXML.getNodeByPath(info_response, path);
+    String action = page_request.getAttribute(GSXML.ACTION_ATT);
+    String subaction = page_request.getAttribute(GSXML.SUBACTION_ATT);
     
-    service_list.replaceChild(this.doc.importNode(classifier_service_info, true), classifier_service);
+    if (query_service != null && action.equals("p") && subaction.equals("about")) {
+        do_query = true;
+        // get the full description
+        String to = GSPath.appendLink(collection, "TextQuery");
+        Element query_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE, to, lang, "");
+        info_message.appendChild(query_request);
+        
+    }
+    
+    Element info_resp_message = (Element) this.mr.process(info_message);
+    Element info_response = (Element) GSXML.getChildByTagName(info_resp_message, GSXML.RESPONSE_ELEM); 
+    //  String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
+    if (do_classifier) {
+        Element classifier_service_info = (Element)GSXML.getNamedElement(info_response, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, "CLassifierBrowse");
+        if (classifier_service_info != null) {
+        service_list.replaceChild(this.doc.importNode(classifier_service_info, true), classifier_service);
+        }
+    }
+    if (do_query) {
+        Element query_service_info = (Element)GSXML.getNamedElement(info_response, GSXML.SERVICE_ELEM, GSXML.NAME_ATT, "TextQuery");
+        if (query_service_info != null) {
+        service_list.replaceChild(this.doc.importNode(query_service_info, true), query_service);
+        }
+    }
     ///ystem.out.println("the final page before transforming is");
     ///ystem.out.println(this.converter.getPrettyString(page));