Changeset 23031
- Timestamp:
- 2010-10-04T15:49:27+13:00 (13 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java
r23015 r23031 315 315 if (fedora_info.isActive()) { 316 316 popupFedoraInfo(); 317 } 317 } 318 318 319 319 320 open_collection_file_path = open_collection; … … 322 323 "general.open_collection"+Configuration.gliPropertyNameSuffix(), true); 323 324 } 324 if (no_load ) {325 if (no_load || (isGsdlRemote && open_collection_file_path.equals(""))) { 325 326 open_collection_file_path = null; 326 327 // collectDirectoryHasChanged(); // make sure gsdlsite.cfg's collecthome defaults to GS' collect … … 329 330 // If opening a collection outside the standard GS collect folder, need 330 331 // to open the non-standard collect folder that the collection resides in 331 if (open_collection_file_path != null && 332 !open_collection_file_path.startsWith(getDefaultGSCollectDirectoryPath(true))) { 332 if (!isGsdlRemote 333 && open_collection_file_path != null 334 && !open_collection_file_path.startsWith(getDefaultGSCollectDirectoryPath(true))) 335 { 333 336 File collectFolder = null; 334 337 … … 349 352 collectFolder = collectFolder.getParentFile(); 350 353 } 351 } 354 } 352 355 353 if( !isGsdlRemote && (collectFolder == null || !collectFolder.exists())) {356 if(collectFolder == null || !collectFolder.exists()) { 354 357 // if GLI config file specified no collectDir (open_collection_file_path is "") 355 358 // OR if dealing with a local server but the collectdir no longer exists, … … 366 369 if(Gatherer.GS3) { // GS2's gsdlsite.cfg was taken care of when LocalLibraryServer was started up 367 370 // (LocalLibraryServer would also already have set glisite.cfg to the correct collecthome) 368 371 String gsdlsitecfg = Configuration.gsdl3_path + File.separator 369 372 + "WEB-INF" + File.separator + "cgi" + File.separator + "gsdl3site.cfg"; 370 373 Utility.updatePropertyConfigFile(gsdlsitecfg, "collecthome", defaultColDir); // no file separator … … 376 379 } else { 377 380 setCollectDirectoryPath(collectFolder.getAbsolutePath()); // now set this as the current collect folder 378 } 379 380 } 381 } 382 381 } 382 } 383 } 384 383 385 // Finally, we're ready to find out the version of the remote Greenstone server 384 386 if(isGsdlRemote) { … … 557 559 } 558 560 561 559 562 } catch (Exception exception) { 560 563 DebugStream.printStackTrace(exception); -
main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java
r23016 r23031 507 507 // in applets when other users on a machine want to use an applet and GLI wants to load 508 508 // a collection left open from a previous session and *requires* the old user to authenticate 509 if(!Gatherer.isGsdlRemote) { 509 if(Gatherer.isGsdlRemote) { 510 Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 511 true, ""); 512 } else { 510 513 Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 511 514 true, CollectionManager.getLoadedCollectionColFilePath()); … … 515 518 else { 516 519 // if there was no open collection, then write out the collect dir path for next time 517 // IF this is not the default collect directory 518 if(Gatherer. getCollectDirectoryPath().equals(520 // IF this is not the default collect directory and not a remote GLI/applet 521 if(Gatherer.isGsdlRemote || Gatherer.getCollectDirectoryPath().equals( 519 522 Gatherer.getDefaultGSCollectDirectoryPath(true))) { 520 523 Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(),
Note:
See TracChangeset
for help on using the changeset viewer.