Changeset 22608 for main/trunk/gli/src
- Timestamp:
- 2010-08-12T14:17:05+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java
r21998 r22608 172 172 if(local_library_server_file.getName().equals("server.exe")) { 173 173 isPersistentServer = true; 174 } // else it may be gs2- server.bat174 } // else it may be gs2-web-server.bat 175 175 } 176 176 else { // local_library_server_file does not exist 177 177 DebugStream.println("No local library at given file path."); 178 178 179 if(Utility.isWindows()) { // test for server.exe and gs2- server.bat179 if(Utility.isWindows()) { // test for server.exe and gs2-web-server.bat 180 180 local_library_server_file = new File(gsdl_path + "server.exe"); 181 181 if (local_library_server_file.exists()) { 182 182 isPersistentServer = true; 183 183 } 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"); 185 185 if (!local_library_server_file.exists()) { 186 186 DebugStream.println("No local library at all."); … … 233 233 final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux) 234 234 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 start235 if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start 236 236 local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command; 237 237 } … … 490 490 final String QUOTES = Utility.isWindows() ? "\"" : ""; // need to embed path in quotes on Windows for spaces (interferes on Linux) 491 491 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 start492 if(Utility.isWindows() && !isPersistentServer) { // launching gs2-web-server.bat (Windows) needs cmd start 493 493 local_library_server_command = "cmd.exe /c start \"GSI\" " + local_library_server_command; 494 494 }
Note:
See TracChangeset
for help on using the changeset viewer.