Changeset 22295

Timestamp:

2010-06-23T14:49:07+12:00 (14 years ago)

Author:

ak19

Message:

1. Location of some Greenstone util classes had changed. 2. Removed duplication of variable value.

Location:

main/trunk/greenstone3/resources/java

Files:

• QBRSOAPServer.java.in (modified) (6 diffs)
• SOAPServer.java.in (modified) (1 diff)

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

@@ -41 +41 @@
 import org.w3c.dom.Node;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.core.MessageRouter;
-import org.greenstone.gsdl3.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;
@@ -135 +135 @@
     protected static final String serviceSubsetOptions = // services
         "paramList displayItemList";
-    protected static final String docStructureOptions =
+    protected static final String structureOptions =
         "entire ancestors parent siblings children descendants"; // note the spelling
     protected static final String structureInfoOptions =
         "numSiblings siblingPosition numChildren";
-    protected static final String browseStructureOptions = 
-        "ancestors parent siblings children descendants"; // note the spelling
     
         
@@ -487 +485 @@
         // 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 structureInfoOptions):
+        // static Strings structureOptions and structureInfoOptions):
         // <param name="structure" value = "structure[i]">
         // <param name="info" value = "info[i]">
@@ -495 +493 @@
         if(structure != null) {
             for(int i = 0; i < structure.length; i++) {
-                if(docStructureOptions.indexOf(structure[i]) != -1) {
+                if(structureOptions.indexOf(structure[i]) != -1) {
                     paramList.appendChild(GSXML.createParameter(
                             this.doc, "structure", structure[i]));                  
@@ -701 +699 @@
         for(int i = 0; i < structureParams.length; i++) {
             // check it is a valid structure parameter
-            if(browseStructureOptions.indexOf(structureParams[i]) != -1) {
+            if(structureOptions.indexOf(structureParams[i]) != -1) {
                 paramList.appendChild(GSXML.createParameter(
                         this.doc, "structure", structureParams[i]));
@@ -707 +705 @@
         }
 
-        if(infoParams != null) {
+        if(infoParams != null && !infoParams[0].equals("")) {
             for(int i = 0; i < infoParams.length; i++) {
             if(structureInfoOptions.indexOf(infoParams[i]) != -1) {
                 paramList.appendChild(GSXML.createParameter(
-                                    this.doc, "info", infoParams[i]));
+                        this.doc, "info", infoParams[i]));
             }
             }

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

@@ -20 +20 @@
 package org.greenstone.gsdl3;
 
+import org.greenstone.util.GlobalProperties;
 import org.greenstone.gsdl3.core.MessageRouter;
-import org.greenstone.gsdl3.util.GlobalProperties;
 import org.greenstone.gsdl3.util.GSFile;
 import org.greenstone.gsdl3.util.GSXML;