Changeset 24904

Show
Ignore:
Timestamp:
15.12.2011 20:21:40 (8 years ago)
Author:
ak19
Message:

Need quotes around collecthome in gsdlsite.cfg to handle spaces and brackets in any non-standard collecthome path.

Location:
main/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

    r24875 r24904  
    902902            } else { 
    903903                gsdlsite_collecthome = Utility.updatePropertyConfigFile( 
    904                 gsdlsitecfg, "collecthome", coldir); // no file separator 
     904                gsdlsitecfg, "collecthome", "\""+coldir+"\""); // no file separator 
    905905                // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return 
    906906            } 
     
    977977            //collectDir = "\"" + collectDir.substring(0, collectDir.length()-1) + "\""; // remove file separator at end     
    978978            collectDir = collectDir.substring(0, collectDir.length()-1); // remove file separator at end     
    979             Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", collectDir); 
     979            Utility.updatePropertyConfigFile(getGsdlSiteConfigFile(), "collecthome", "\""+collectDir+"\""); 
    980980            // if gsdlsite.cfg does not exist (if using server.exe for instance), the above method will just return 
    981981             
  • main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

    r23433 r24904  
    677677                                 
    678678                Gatherer.gsdlsite_collecthome = Utility.updatePropertyConfigFile( 
    679                     Gatherer.getGsdlSiteConfigFile(), "collecthome", serverColDir);  
     679                    Gatherer.getGsdlSiteConfigFile(), "collecthome", "\""+serverColDir+"\"");    
    680680                 
    681681                colHomeDialog.dispose(); 
  • main/trunk/greenstone2/gsicontrol.bat

    r24902 r24904  
    234234:: first remove any quotes around this part of the filepath 
    235235set suffix=%~1 
    236 if not "%suffix%" == "gsdlhome" set gshome=%gshome%%suffix% 
     236if not "%suffix%" == "gsdlhome" if not "%suffix%" == "collecthome" set gshome=%gshome%%suffix% 
    237237shift 
    238238if not "%~1"=="" goto concat