Changeset 22295

Show
Ignore:
Timestamp:
23.06.2010 14:49:07 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/resources/java/QBRSOAPServer.java.in

    r22224 r22295  
    4141import org.w3c.dom.Node; 
    4242 
     43import org.greenstone.util.GlobalProperties; 
    4344import org.greenstone.gsdl3.core.MessageRouter; 
    44 import org.greenstone.gsdl3.util.GlobalProperties; 
    4545import org.greenstone.gsdl3.util.GSFile; 
    4646import org.greenstone.gsdl3.util.GSXML; 
     
    135135    protected static final String serviceSubsetOptions = // services 
    136136        "paramList displayItemList"; 
    137     protected static final String docStructureOptions = 
     137    protected static final String structureOptions = 
    138138        "entire ancestors parent siblings children descendants"; // note the spelling 
    139139    protected static final String structureInfoOptions = 
    140140        "numSiblings siblingPosition numChildren"; 
    141     protected static final String browseStructureOptions =  
    142         "ancestors parent siblings children descendants"; // note the spelling 
    143141     
    144142         
     
    487485        // Create the <paramlist></paramlist> element of param elements, 
    488486        // 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): 
    490488        // <param name="structure" value = "structure[i]"> 
    491489        // <param name="info" value = "info[i]"> 
     
    495493        if(structure != null) { 
    496494            for(int i = 0; i < structure.length; i++) { 
    497                 if(docStructureOptions.indexOf(structure[i]) != -1) { 
     495                if(structureOptions.indexOf(structure[i]) != -1) { 
    498496                    paramList.appendChild(GSXML.createParameter( 
    499497                            this.doc, "structure", structure[i]));                   
     
    701699        for(int i = 0; i < structureParams.length; i++) { 
    702700            // check it is a valid structure parameter 
    703             if(browseStructureOptions.indexOf(structureParams[i]) != -1) { 
     701            if(structureOptions.indexOf(structureParams[i]) != -1) { 
    704702                paramList.appendChild(GSXML.createParameter( 
    705703                        this.doc, "structure", structureParams[i])); 
     
    707705        } 
    708706 
    709         if(infoParams != null) { 
     707        if(infoParams != null && !infoParams[0].equals("")) { 
    710708            for(int i = 0; i < infoParams.length; i++) { 
    711709            if(structureInfoOptions.indexOf(infoParams[i]) != -1) { 
    712710                paramList.appendChild(GSXML.createParameter( 
    713                                     this.doc, "info", infoParams[i])); 
     711                        this.doc, "info", infoParams[i])); 
    714712            } 
    715713            } 
  • main/trunk/greenstone3/resources/java/SOAPServer.java.in

    r16783 r22295  
    2020package org.greenstone.gsdl3; 
    2121 
     22import org.greenstone.util.GlobalProperties; 
    2223import org.greenstone.gsdl3.core.MessageRouter; 
    23 import org.greenstone.gsdl3.util.GlobalProperties; 
    2424import org.greenstone.gsdl3.util.GSFile; 
    2525import org.greenstone.gsdl3.util.GSXML;