Changeset 22224 for main

Timestamp:

2010-06-02T22:03:46+12:00 (14 years ago)

Author:

ak19

Message:

Browse takes structural info params just like DocumentStructureRetrieve. GS3 manual had already been updated a couple of days back'.

File:

• main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in (modified) (6 diffs)

main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in

@@ -137 +137 @@
     protected static final String docStructureOptions =
         "entire ancestors parent siblings children descendants"; // note the spelling
-    protected static final String docStructureInfo =
+    protected static final String structureInfoOptions =
         "numSiblings siblingPosition numChildren";
     protected static final String browseStructureOptions = 
@@ -487 +487 @@
         // Create the <paramlist></paramlist> element of param elements,
         // if any; and only if values are legal (that is, if they occur in  
-        // static Strings docStructureOptions and docStructureInfo):
+        // static Strings docStructureOptions and structureInfoOptions):
         // <param name="structure" value = "structure[i]">
         // <param name="info" value = "info[i]">
@@ -503 +503 @@
         if(info != null) {
             for(int i = 0; i < info.length; i++) {
-                if(docStructureInfo.indexOf(info[i]) != -1) {
+                if(structureInfoOptions.indexOf(info[i]) != -1) {
                     paramList.appendChild(GSXML.createParameter(
                             this.doc, "info", info[i]));
@@ -664 +664 @@
         return browse(collection, browseService, lang,   
                 classifierNodeIDs, 
-                new String[] {"descendants"}); // note the spelling
+                new String[] {"descendants"}, new String[] {""}); // note the spelling
     }
     
@@ -681 +681 @@
      * information is requested. Accepted values are ancestors, parent, siblings,
      * children, descendants.
+     * @param infoParams - structural info is requested. Can be numSiblings, 
+     * siblingPosition, numChildren
     */
     public String browse(String collection, String browseService, String lang, 
-            String[] classifierNodeIDs, String[] structureParams) 
+            String[] classifierNodeIDs, String[] structureParams, String[] infoParams) 
     {
         if(browseService.equals(""))
@@ -703 +705 @@
                         this.doc, "structure", structureParams[i]));
             }
+        }
+
+        if(infoParams != null) {
+            for(int i = 0; i < infoParams.length; i++) {
+            if(structureInfoOptions.indexOf(infoParams[i]) != -1) {
+                paramList.appendChild(GSXML.createParameter(
+                                    this.doc, "info", infoParams[i]));
+            }
+            }
         }