Changeset 16874

Timestamp:

2008-08-18T12:02:54+12:00 (16 years ago)

Author:

kjdon

Message:

when testing to see if we need to get service descriptions or not, ignore oai type services as well as retrieve services cos these never have descriptions

File:

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

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

@@ -22 +22 @@
      static Logger logger = Logger.getLogger(org.greenstone.gsdl3.core.DefaultReceptionist.class.getName());
     
+  /** add in the collection description to the page, then for each service, add in the service description */
     protected void addExtraInfo(Element page) {
-    // we want to add in the collection description for each page - cos
-    // our default xslt needs this.
-    super.addExtraInfo(page);
+      super.addExtraInfo(page);
     
     Element page_request = (Element)GSXML.getChildByTagName(page, GSXML.PAGE_REQUEST_ELEM);
@@ -108 +107 @@
         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)) {
+        while (i<services.getLength() && (test_s.getAttribute(GSXML.TYPE_ATT).equals(GSXML.SERVICE_TYPE_RETRIEVE) || test_s.getAttribute(GSXML.TYPE_ATT).equals(GSXML.SERVICE_TYPE_OAI))) {
         test_s = (Element)services.item(i); i++;
         }
         if (i==services.getLength()) {
-        // we have only found retrieve services, so dont need descripitons anyway
+        // we have only found retrieve or oai services, so dont need descripitons anyway
         return;
         }
@@ -122 +121 @@
 
     // if get here, we need to get the service descriptions
-    logger.debug("getting services description");
         
     // we will send all the requests in a single message