Changeset 5127

Timestamp:

2003-08-13T09:56:54+12:00 (21 years ago)

Author:

kjdon

Message:

made this a bit smarter about whether it gets teh coll description or not - wont get it if already there. it also gets teh service displayItem elements as well, so all teh services can be presented to the user on teh navigation bar.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/core/DefaultReceptionist.java (modified) (4 diffs)

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

@@ -25 +25 @@
     
     Element page_request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
-    System.out.println("add extra info, page request="+this.converter.getString(page_request));
+    ///ystem.out.println("add extra info, page request="+this.converter.getString(page_request));
     // is a collection defined?
     Element param_list = (Element)GSXML.getChildByTagName(page_request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
@@ -37 +37 @@
         return;
     }
-    String action = page_request.getAttribute(GSXML.ACTION_ATT);
-    if (action.equals("p")) {
-        System.out.println("DefaultReceptionist: page action, so returning");
-        return;
+
+    // see if the collection/cluster element is already there
+    String coll_name = coll_param.getAttribute(GSXML.VALUE_ATT);
+    String lang = page_request.getAttribute(GSXML.LANG_ATT);
+    
+    boolean get_service_description = false;
+    Element page_response = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM);
+    
+    Element coll_description = (Element)GSXML.getChildByTagName(page_response, GSXML.COLLECTION_ELEM);
+    if (coll_description == null) {
+        // try cluster
+        coll_description = (Element)GSXML.getChildByTagName(page_response, GSXML.CLUSTER_ELEM);
     }
-    // we have a collection, and we are not page action. get the coll description
-    
-    String collection = coll_param.getAttribute(GSXML.VALUE_ATT);
-    String lang = page_request.getAttribute(GSXML.LANG_ATT);
-    Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  collection, lang);
-    coll_about_message.appendChild(coll_about_request);
-    
-    Element coll_about_response_message = this.mr.process(coll_about_message);
-    Element coll_about_response = (Element)GSXML.getChildByTagName(coll_about_response_message, GSXML.RESPONSE_ELEM);
-    Element coll_description = (Element)GSXML.getChildByTagName(coll_about_response, GSXML.COLLECTION_ELEM);
-    if (coll_description==null) { // may be a cluster
-        coll_description = (Element)GSXML.getChildByTagName(coll_about_response, GSXML.CLUSTER_ELEM);
+    if (coll_description == null) { 
+        System.out.println("getting a coll description");
+        // we dont have one yet - get it
+        Element coll_about_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
+        Element coll_about_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_DESCRIBE,  coll_name, lang);
+        coll_about_message.appendChild(coll_about_request);
+        
+        Element coll_about_response_message = this.mr.process(coll_about_message);
+        Element coll_about_response = (Element)GSXML.getChildByTagName(coll_about_response_message, GSXML.RESPONSE_ELEM);
+        coll_description = (Element)GSXML.getChildByTagName(coll_about_response, GSXML.COLLECTION_ELEM);
+        if (coll_description==null) { // may be a cluster
+        coll_description = (Element)GSXML.getChildByTagName(coll_about_response, GSXML.CLUSTER_ELEM);
+        }
+        
+        if (coll_description == null) {
+        System.out.println("DefaultReceptionist: no collection description, returning");
+        return;
+        }
+        // have found one, append it to the page response
+        coll_description = (Element)this.doc.importNode(coll_description, true);
+        page_response.appendChild(coll_description);
+        get_service_description = true;
     }
-    if (coll_description == null) {
-        System.out.println("DefaultReceptionist: no collection description, returning");
-        return;
-    }
-    
-    Element page_response = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_RESPONSE_ELEM);
-    Element new_coll_description = (Element)this.doc.importNode(coll_description, true);
-    page_response.appendChild(new_coll_description);
+
+    // have got a coll description
     
     // now get the dispay info for the services
-    Element service_list = (Element)GSXML.getChildByTagName(new_coll_description, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+    Element service_list = (Element)GSXML.getChildByTagName(coll_description, GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
     if (service_list == null) {
         System.out.println("DefaultReceptionist: no service list, returning");
@@ -74 +85 @@
 
     NodeList services = service_list.getElementsByTagName(GSXML.SERVICE_ELEM);
+    // check one service for display items
+    if (!get_service_description) {
+        // we dont know yet if we need to get these
+        int i=1;
+        Element test_s = (Element)services.item(0);
+        while (i<services.getLength() && test_s.getAttribute(GSXML.TYPE_ATT).equals(GSXML.SERVICE_TYPE_RETRIEVE)) {
+        test_s = (Element)services.item(i); i++;
+        }
+        if (i==services.getLength()) {
+        // we have only found retrieve services, so dont need descripitons anyway
+        return;
+        }
+        if (GSXML.getChildByTagName(test_s, GSXML.DISPLAY_TEXT_ELEM) !=null) {
+        // have got descriptions already, 
+        return;
+        }
+    }
+
+    // if get here, we need to get the service descriptions
+    ///ystem.out.println("getting services description");
+        
     // we will send all the requests in a single message
     Element info_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
@@ -79 +111 @@
         Element c = (Element)services.item(i);
         String name = c.getAttribute(GSXML.NAME_ATT);
-        String address = GSPath.appendLink(collection, name);
+        String address = GSPath.appendLink(coll_name, name);
         Element info_request = GSXML.createBasicRequest(this.doc,  GSXML.REQUEST_TYPE_DESCRIBE, address, lang);
+        Element req_param_list = this.doc.createElement(GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
+        req_param_list.appendChild(GSXML.createParameter(this.doc, GSXML.SUBSET_PARAM, GSXML.DISPLAY_TEXT_ELEM));
+        info_request.appendChild(req_param_list);
         info_message.appendChild(info_request);
+        
     }