Changeset 12803
- Timestamp:
- 2006-09-21T14:17:38+12:00 (18 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer/cdm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java
r12800 r12803 35 35 import org.greenstone.gatherer.DebugStream; 36 36 import org.greenstone.gatherer.Gatherer; 37 import org.greenstone.gatherer.LocalLibraryServer; 37 38 import org.greenstone.gatherer.gui.GLIButton; 38 39 import org.greenstone.gatherer.metadata.MetadataElement; … … 427 428 } 428 429 429 public void save() { 430 431 public void save() 432 { 433 // If we're using the Local Library we must release the collection before writing to the collect.cfg file 434 String collection_name = Gatherer.c_man.getCollection().getName(); 435 boolean collection_released = false; 436 if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) { 437 // Release the collection 438 LocalLibraryServer.releaseCollection(collection_name); 439 collection_released = true; 440 } 441 430 442 if(collect_cfg_file.exists()) { 431 443 File original_file = new File(collect_cfg_file.getParentFile(), COLLECT_CFG); … … 477 489 // If we're using a remote Greenstone server, upload the new collect.cfg file 478 490 if (Gatherer.isGsdlRemote) { 479 String collection_name = Gatherer.c_man.getCollection().getName();480 491 RemoteGreenstoneServer.uploadCollectionFile(collection_name, collect_cfg_file); 481 492 } … … 485 496 DebugStream.printStackTrace(exception); 486 497 } 487 488 } 498 499 // Now re-add the collection to the Local Library server 500 if (collection_released) { 501 LocalLibraryServer.addCollection(collection_name); 502 } 503 } 504 489 505 490 506 /** ************************** Private Methods ***************************/ -
trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java
r12620 r12803 190 190 } 191 191 192 193 192 public void save() { 194 193 save(false); 195 194 } 195 196 196 /** Cause the current collection configuration to be written out to disk. 197 197 */ … … 205 205 206 206 DebugStream.println("Saving the collection config file"); 207 // Release collection as necessary208 String collection_name = Gatherer.c_man.getCollection().getName();209 boolean collection_released = false;210 211 if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {212 // Release the collection213 LocalLibraryServer.releaseCollection(collection_name);214 collection_released = true;215 }216 207 217 208 collect_config.save(); 218 219 // Read collection220 if (collection_released) {221 // Now re-add collection to server to force format commands to be processed222 LocalLibraryServer.addCollection(collection_name);223 }224 209 225 210 // Unset formats changed 226 211 update_collect_cfg_required = false; 227 228 212 } 229 213
Note:
See TracChangeset
for help on using the changeset viewer.