Changeset 22608

Show
Ignore:
Timestamp:
12.08.2010 14:17:05 (9 years ago)
Author:
sjm84
Message:

Added a change to local library server to work with the gs2-server.bat rename to gs2-web-server.bat

Files:
1 modified

Legend:

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

    r21998 r22608  
    172172        if(local_library_server_file.getName().equals("server.exe")) { 
    173173        isPersistentServer = true; 
    174         } // else it may be gs2-server.bat 
     174        } // else it may be gs2-web-server.bat 
    175175    } 
    176176    else { // local_library_server_file does not exist 
    177177        DebugStream.println("No local library at given file path."); 
    178178 
    179         if(Utility.isWindows()) { // test for server.exe and gs2-server.bat 
     179        if(Utility.isWindows()) { // test for server.exe and gs2-web-server.bat 
    180180        local_library_server_file = new File(gsdl_path + "server.exe"); 
    181181        if (local_library_server_file.exists()) { 
    182182            isPersistentServer = true; 
    183183        } else { 
    184             local_library_server_file = new File(gsdl_path + "gs2-server.bat"); 
     184            local_library_server_file = new File(gsdl_path + "gs2-web-server.bat"); 
    185185            if (!local_library_server_file.exists()) { 
    186186            DebugStream.println("No local library at all."); 
     
    233233    final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux) 
    234234    String local_library_server_command = QUOTES+local_library_server_file.getAbsolutePath()+QUOTES + getExtraLaunchArguments(llssite_cfg_file); 
    235     if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start 
     235    if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start 
    236236        local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command; 
    237237    } 
     
    490490        final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux) 
    491491        String local_library_server_command = QUOTES+local_library_server_file.getAbsolutePath()+QUOTES + getExtraLaunchArguments(llssite_cfg_file); 
    492         if(Utility.isWindows() && !isPersistentServer) { // launching gs2-server.bat (Windows) needs cmd start 
     492        if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start 
    493493            local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command; 
    494494        }