Index: /main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in
===================================================================
--- /main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in (revision 22294)
+++ /main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in (revision 22295)
@@ -41,6 +41,6 @@
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,10 +135,8 @@
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,5 +485,5 @@
// Create the 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):
//
//
@@ -495,5 +493,5 @@
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,5 +699,5 @@
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,9 +705,9 @@
}
- 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]));
}
}
Index: /main/trunk/greenstone3/resources/java/SOAPServer.java.in
===================================================================
--- /main/trunk/greenstone3/resources/java/SOAPServer.java.in (revision 22294)
+++ /main/trunk/greenstone3/resources/java/SOAPServer.java.in (revision 22295)
@@ -20,6 +20,6 @@
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;