Changeset 22297

Show
Ignore:
Timestamp:
23.06.2010 14:50:10 (9 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

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

    r22279 r22297  
    3838import org.w3c.dom.Node; 
    3939 
     40import org.greenstone.util.GlobalProperties; 
    4041import org.greenstone.gsdl3.core.MessageRouter; 
    41 import org.greenstone.gsdl3.util.GlobalProperties; 
    4242import org.greenstone.gsdl3.util.GSFile; 
    4343import org.greenstone.gsdl3.util.GSXML; 
     
    130130    protected static final String serviceSubsetOptions = // services 
    131131        "paramList displayItemList"; 
    132     protected static final String docStructureOptions = 
     132    protected static final String structureOptions = 
    133133        "entire ancestors parent siblings children descendants"; // note the spelling 
    134134    protected static final String structureInfoOptions = 
    135135        "numSiblings siblingPosition numChildren"; 
    136     protected static final String browseStructureOptions =  
    137         "ancestors parent siblings children descendants"; // note the spelling 
    138136     
    139137         
     
    481479        // Create the <paramlist></paramlist> element of param elements, 
    482480        // if any; and only if values are legal (that is, if they occur in   
    483         // static Strings docStructureOptions and structureInfoOptions): 
     481        // static Strings structureOptions and structureInfoOptions): 
    484482        // <param name="structure" value = "structure[i]"> 
    485483        // <param name="info" value = "info[i]"> 
     
    489487        if(structure != null) { 
    490488            for(int i = 0; i < structure.length; i++) { 
    491                 if(docStructureOptions.indexOf(structure[i]) != -1) { 
     489                if(structureOptions.indexOf(structure[i]) != -1) { 
    492490                    paramList.appendChild(GSXML.createParameter( 
    493491                            this.doc, "structure", structure[i]));                   
     
    695693        for(int i = 0; i < structureParams.length; i++) { 
    696694            // check it is a valid structure parameter 
    697             if(browseStructureOptions.indexOf(structureParams[i]) != -1) { 
     695            if(structureOptions.indexOf(structureParams[i]) != -1) { 
    698696                paramList.appendChild(GSXML.createParameter( 
    699697                        this.doc, "structure", structureParams[i])); 
     
    701699        } 
    702700 
    703         if(infoParams != null) { 
     701        if(infoParams != null && !infoParams[0].equals("")) { 
    704702            for(int i = 0; i < infoParams.length; i++) { 
    705703            if(structureInfoOptions.indexOf(infoParams[i]) != -1) { 
    706704                paramList.appendChild(GSXML.createParameter( 
    707                                     this.doc, "info", info[i])); 
     705                        this.doc, "info", info[i])); 
    708706            } 
    709707            }