- Timestamp:
- 2010-07-15T22:10:59+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/file/FileManager.java
r19239 r22410 171 171 file_queue.addJob(id, source, source_nodes, target, target_node, type); 172 172 if (Gatherer.isGsdlRemote) { 173 String collection_name = CollectionManager.getLoaded GroupQualifiedCollectionName(true);173 String collection_name = CollectionManager.getLoadedCollectionName(); 174 174 175 175 // Perform the appropriate action based on the job type (RemoteGreenstoneServer will queue) … … 274 274 if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) { 275 275 if (Gatherer.remoteGreenstoneServer.downloadCollectionFile( 276 CollectionManager.getLoaded GroupQualifiedCollectionName(true), file).equals("")) {276 CollectionManager.getLoadedCollectionName(), file).equals("")) { 277 277 // Something has gone wrong downloading the file 278 278 return; … … 350 350 if (Gatherer.isGsdlRemote) { 351 351 Gatherer.remoteGreenstoneServer.uploadCollectionFile( 352 CollectionManager.getLoaded GroupQualifiedCollectionName(true), folder_file);352 CollectionManager.getLoadedCollectionName(), folder_file); 353 353 } 354 354 } … … 357 357 if (Gatherer.isGsdlRemote) { 358 358 Gatherer.remoteGreenstoneServer.newCollectionDirectory( 359 CollectionManager.getLoaded GroupQualifiedCollectionName(true), folder_file);359 CollectionManager.getLoadedCollectionName(), folder_file); 360 360 } 361 361 } … … 418 418 if (Gatherer.isGsdlRemote) { 419 419 Gatherer.remoteGreenstoneServer.moveCollectionFile( 420 CollectionManager.getLoaded GroupQualifiedCollectionName(true), collection_file, new_collection_file);420 CollectionManager.getLoadedCollectionName(), collection_file, new_collection_file); 421 421 } 422 422 } … … 467 467 file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, (FileNode)collection_tree_node.getParent(), FileJob.COPY_FILE_ONLY); 468 468 if (Gatherer.isGsdlRemote) { 469 String collection_name = CollectionManager.getLoaded GroupQualifiedCollectionName(true);469 String collection_name = CollectionManager.getLoadedCollectionName(); 470 470 Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection_name, collection_tree_node.getFile()); 471 471 Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(collection_name, new File[] { new_file }, target_directory);
Note:
See TracChangeset
for help on using the changeset viewer.