Changeset 11013 for trunk/gsdl3

Timestamp:

2005-12-20T16:36:06+13:00 (18 years ago)

Author:

kjdon

Message:

modified to work without an explicit collection - so can have e.g. a site wide cross coll search service

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (3 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -50 +50 @@
     String service_name = (String)params.get(GSParams.SERVICE);
     String collection = (String)params.get(GSParams.COLLECTION);
-    
+
+    // collection may be null or empty when we are doing cross coll services
     if (collection == null || collection.equals("")) {
-        System.err.println("QueryAction Error: no collection was specified!");
-        return page_response; // an empty response 
+        collection = null;
     }
     
     String lang = request.getAttribute(GSXML.LANG_ATT);
     String uid = request.getAttribute(GSXML.USER_ID_ATT);
-    String to = GSPath.appendLink(collection, service_name);
+    String to = service_name;
+    if (collection != null) {
+        to = GSPath.prependLink(to, collection);
+    }
     
     if (request_type.indexOf("d")!=-1) {
@@ -149 +152 @@
     Element format_elem = (Element)GSXML.getChildByTagName(format_response, GSXML.FORMAT_ELEM);
     if (format_elem != null) {
-        ///ystem.out.println("QueryAction: found a format element, adding it to the page response");
-        // set teh format type
+        // set the format type
         format_elem.setAttribute(GSXML.TYPE_ATT, "search");
         // for now just add to the response
@@ -162 +164 @@
     // do the metadata request on the filtered list
     Element mr_metadata_message = this.doc.createElement(GSXML.MESSAGE_ELEM);
-    to = GSPath.appendLink(collection, "DocumentMetadataRetrieve"); // Hard-wired?
+    to = "DocumentMetadataRetrieve";
+    if (collection != null) {
+        to = GSPath.prependLink(to, collection);
+    }
     Element mr_metadata_request = GSXML.createBasicRequest(this.doc, GSXML.REQUEST_TYPE_PROCESS, to, lang, uid);
     mr_metadata_message.appendChild(mr_metadata_request);