Changeset 22295 for main/trunk/greenstone3
- Timestamp:
- 2010-06-23T14:49:07+12:00 (14 years ago)
- Location:
- main/trunk/greenstone3/resources/java
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in
r22224 r22295 41 41 import org.w3c.dom.Node; 42 42 43 import org.greenstone.util.GlobalProperties; 43 44 import org.greenstone.gsdl3.core.MessageRouter; 44 import org.greenstone.gsdl3.util.GlobalProperties;45 45 import org.greenstone.gsdl3.util.GSFile; 46 46 import org.greenstone.gsdl3.util.GSXML; … … 135 135 protected static final String serviceSubsetOptions = // services 136 136 "paramList displayItemList"; 137 protected static final String docStructureOptions =137 protected static final String structureOptions = 138 138 "entire ancestors parent siblings children descendants"; // note the spelling 139 139 protected static final String structureInfoOptions = 140 140 "numSiblings siblingPosition numChildren"; 141 protected static final String browseStructureOptions =142 "ancestors parent siblings children descendants"; // note the spelling143 141 144 142 … … 487 485 // Create the <paramlist></paramlist> element of param elements, 488 486 // if any; and only if values are legal (that is, if they occur in 489 // static Strings docStructureOptions and structureInfoOptions):487 // static Strings structureOptions and structureInfoOptions): 490 488 // <param name="structure" value = "structure[i]"> 491 489 // <param name="info" value = "info[i]"> … … 495 493 if(structure != null) { 496 494 for(int i = 0; i < structure.length; i++) { 497 if( docStructureOptions.indexOf(structure[i]) != -1) {495 if(structureOptions.indexOf(structure[i]) != -1) { 498 496 paramList.appendChild(GSXML.createParameter( 499 497 this.doc, "structure", structure[i])); … … 701 699 for(int i = 0; i < structureParams.length; i++) { 702 700 // check it is a valid structure parameter 703 if( browseStructureOptions.indexOf(structureParams[i]) != -1) {701 if(structureOptions.indexOf(structureParams[i]) != -1) { 704 702 paramList.appendChild(GSXML.createParameter( 705 703 this.doc, "structure", structureParams[i])); … … 707 705 } 708 706 709 if(infoParams != null ) {707 if(infoParams != null && !infoParams[0].equals("")) { 710 708 for(int i = 0; i < infoParams.length; i++) { 711 709 if(structureInfoOptions.indexOf(infoParams[i]) != -1) { 712 710 paramList.appendChild(GSXML.createParameter( 713 711 this.doc, "info", infoParams[i])); 714 712 } 715 713 } -
main/trunk/greenstone3/resources/java/SOAPServer.java.in
r16783 r22295 20 20 package org.greenstone.gsdl3; 21 21 22 import org.greenstone.util.GlobalProperties; 22 23 import org.greenstone.gsdl3.core.MessageRouter; 23 import org.greenstone.gsdl3.util.GlobalProperties;24 24 import org.greenstone.gsdl3.util.GSFile; 25 25 import org.greenstone.gsdl3.util.GSXML;
Note:
See TracChangeset
for help on using the changeset viewer.