Changeset 10368

Show
Ignore:
Timestamp:
01.08.2005 12:25:44 (15 years ago)
Author:
mdewsnip
Message:

Removed some occurrences of "gsdl_path", and added some checks so it is only used when a local Greenstone exists.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
4 modified

Legend:

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

    r10345 r10368  
    685685    } 
    686686 
     687    static public String getTmpDirectoryPath() 
     688    { 
     689    return gsdl_path + "tmp" + File.separator; 
     690    } 
    687691 
    688692    static public String getWGetPath() { 
  • trunk/gli/src/org/greenstone/gatherer/Gatherer.java

    r10367 r10368  
    253253 
    254254        // Start up the local library server, if that's what we want 
    255         if (Utility.isWindows() && local_library_path != null && !GS3) { 
     255        if (Utility.isWindows() && local_library_path != null && !isGsdlRemote && !GS3) { 
    256256        LocalLibraryServer.start(gsdl_path, local_library_path); 
    257257        } 
  • trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

    r9755 r10368  
    296296    command_parts_list.add(export_type); 
    297297    command_parts_list.add("-exportdir"); 
    298     command_parts_list.add(Configuration.gsdl_path + "tmp" + File.separator); 
     298    command_parts_list.add(Configuration.getTmpDirectoryPath()); 
    299299 
    300300    if (cd_title.equals("")) { 
     
    344344    args[0] = coll_names.toString(); 
    345345 
    346     args[1] = Configuration.gsdl_path+"tmp"+File.separator; 
     346    args[1] = Configuration.getTmpDirectoryPath(); 
    347347    if(cd_title.equals("")) { 
    348348        String export_type = (String)saveas_combobox.getSelectedItem(); 
  • trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java

    r9897 r10368  
    318318     
    319319    args[0] = coll_names.toString(); 
    320     args[1] = Configuration.gsdl_path+"tmp"+File.separator; 
     320    args[1] = Configuration.getTmpDirectoryPath(); 
    321321    if(cd_title.equals("")) { 
    322322        args[1] += "exported_collections";