Changeset 22279 for other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3services/QBRSOAPServer.java

Timestamp:

2010-06-22T19:33:59+12:00 (14 years ago)

Author:

ak19

Message:

Same changes as in greenstone3's src-java folder version.

File:

• other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3services/QBRSOAPServer.java (modified) (7 diffs)

other-projects/gs3-webservices-java-client/trunk/src/GS3DemoClient/org/greenstone/gs3services/QBRSOAPServer.java

@@ -132 +132 @@
     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 = 
@@ -481 +481 @@
         // 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]">
@@ -497 +497 @@
         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]));
@@ -675 +675 @@
      * 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(""))
@@ -698 +700 @@
             }
         }
+
+        if(infoParams != null) {
+            for(int i = 0; i < infoParams.length; i++) {
+            if(structureInfoOptions.indexOf(infoParams[i]) != -1) {
+                paramList.appendChild(GSXML.createParameter(
+                                    this.doc, "info", info[i]));
+            }
+            }
+        }
         
         // <classifierNodeList><classifier nodeID="CLx" />
@@ -731 +742 @@
              // won't be null except when Node returned is not an element
              // otherwise, MR always returns some response
+
+        // Return it as a String formatted for display
+        String responseMsg = this.converter.getPrettyString(response); 
+                          // this.converter.getString(response);
 
         // In order to avoid "Content is not allowed in prolog" exception on the 
@@ -857 +872 @@
         System.out.println("browse children of CL1-CL4:\n" +
                 ws.browse("gs2mgppdemo", "ClassifierBrowse", "", 
-                new String[]{"CL1", "CL2", "CL3", "CL4"}, new String[]{"children"}));
+                      new String[]{"CL1", "CL2", "CL3", "CL4"}, new String[]{"children"}, new String[]{"numChildren"}));
         
         System.out.println("browse descendants of CL2.3:\n" +
                 ws.browseDescendants("gs2mgppdemo", "ClassifierBrowse", "", 
-                new String[]{"CL2.3"}));
+                             new String[]{"CL2.3"}, new String[]{"siblingPosition"}));
         
         // (4) try 2 DocStructure