Changeset 18136
- Timestamp:
- 2008-12-08T13:36:13+13:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java
r13792 r18136 139 139 140 140 // Configure the server for immediate entry 141 gsdlsite_cfg_file.set();141 //gsdlsite_cfg_file.set(); 142 142 143 143 // Spawn local library server process … … 286 286 public GSDLSiteConfig(File server_exe) { 287 287 debug("New GSDLSiteConfig for: " + server_exe.getAbsolutePath()); 288 288 289 gsdlsite_cfg = new File(server_exe.getParentFile(), GSDLSITE_CFG); 289 290 glisite_cfg = new File(server_exe.getParentFile(), GLISITE_CFG); 291 292 File configFile = null; 293 if(glisite_cfg.exists()) { 294 configFile = glisite_cfg; 295 } else if(gsdlsite_cfg.exists()) { 296 configFile = gsdlsite_cfg; 297 } else { 298 debug("Neither the file glisite.cfg nor GSDLsite.cfg can be found!"); 299 } 300 290 301 autoenter_initial = null; 291 302 start_browser_initial = null; 292 if( gsdlsite_cfg.exists()) {293 debug("Load: " + gsdlsite_cfg.getAbsolutePath());303 if(configFile != null) { 304 debug("Load: " + configFile.getAbsolutePath()); 294 305 clear(); 295 306 try { 296 BufferedReader in = new BufferedReader(new FileReader( gsdlsite_cfg));307 BufferedReader in = new BufferedReader(new FileReader(configFile)); 297 308 String line = null; 298 309 while((line = in.readLine()) != null) { … … 315 326 } 316 327 } 317 else { 318 debug("No GSDLsite.cfg file can be found!"); 319 } 320 } 321 328 } 329 322 330 public boolean exists() { 323 331 return gsdlsite_cfg.exists(); … … 402 410 } 403 411 else { 404 debug("No GSDLsite.cfg file can be found!");412 debug("No glisite.cfg file can be found!"); 405 413 } 406 414 }
Note:
See TracChangeset
for help on using the changeset viewer.