Changeset 26402 for main/trunk/gli/src

Timestamp:

2012-10-25T17:50:57+13:00 (12 years ago)

Author:

ak19

Message:

Fixed issue with deleting fedora collections from GLI: it would start a process to call the new g2f-deletecol script and then immediately continue by deleting the collection directory. Unfortunately, the collection directory needs to be around until the script has finished purging the docs from fedora: the GS3 collection dir is how the g2f-deletecol.pl script works out what files (which pids) need purging.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• gui/DeleteCollectionPrompt.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -111 +111 @@
     //static private GShellProgressMonitor fedora_coldelete_monitor = null;
 
+    static private String delete_collection_name = null;
+
     /** The name of the standard lock file. */
     static final public String LOCK_FILE = "gli.lck";
@@ -861 +863 @@
         GShell shell = new GShell(command_parts, GShell.DELETE, COLLECT, this, null, GShell.GSHELL_FEDORA_COLDELETE); // fedora_coldelete_monitor set to null
         shell.start();
-    }
-
-    // Delete the collection on the server if we're using a remote Greenstone
-    if (Gatherer.isGsdlRemote) {
-        Gatherer.remoteGreenstoneServer.deleteCollection(collection_name);
-    }
-
-    // if Greenstone3, need to deactivate the collection on the server
-    if (Gatherer.GS3) {
-        Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection_name);
-    }
-    
-    // Now delete the collection directory
-    return Utility.delete(new File(getCollectionDirectoryPath(collection_name)));
+
+        delete_collection_name = collection_name;
+        return true; // we assume it succeeded for now, wait until the process returns
+        // and then proceed to delete the collection directory
+    }
+    else { // not a fedora collection
+
+        // Delete the collection on the server if we're using a remote Greenstone
+        if (Gatherer.isGsdlRemote) {
+        Gatherer.remoteGreenstoneServer.deleteCollection(collection_name);
+        }
+        
+        // if Greenstone3, need to deactivate the collection on the server
+        if (Gatherer.GS3) {
+        Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + collection_name);
+        }       
+        // Now delete the collection directory
+        return Utility.delete(new File(getCollectionDirectoryPath(collection_name)));
+    }
     }
 
@@ -1720 +1727 @@
         }
     }
+
+    else if(event.getType() == GShell.DELETE) {
+
+        // we can only get here if we tried to delete a fedora collection
+
+        if(event.getStatus() == GShell.ERROR) { // error purging the collection from fedora
+        
+        JOptionPane.showMessageDialog(Gatherer.g_man,Dictionary.get("DeleteCollectionPrompt.Failed_Fedora_Delete", new String[]{delete_collection_name}),Dictionary.get("DeleteCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
+        delete_collection_name = null; // re-zero
+        }
+        
+        else if(event.getStatus() == GShell.OK) { // fedora purge was successful
+
+        if(delete_collection_name != null) {
+            if (Gatherer.isGsdlRemote) {
+            Gatherer.remoteGreenstoneServer.deleteCollection(delete_collection_name);
+            }
+            
+            // if Greenstone3, need to deactivate the collection on the server
+            if (Gatherer.GS3) {
+            Gatherer.configGS3Server(Configuration.site_name, ServletConfiguration.DEACTIVATE_COMMAND + delete_collection_name);
+            }
+
+            // Now at last, can delete the collection directory as for a normal collection
+            boolean success = Utility.delete(new File(getCollectionDirectoryPath(delete_collection_name)));
+
+            if (!success) {
+            JOptionPane.showMessageDialog(Gatherer.g_man,Dictionary.get("DeleteCollectionPrompt.Failed_Delete", new String[]{delete_collection_name}),Dictionary.get("DeleteCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
+            }
+            delete_collection_name = null; // re-zero
+        }
+
+        }
+    }
+
     else if (event.getStatus() == GShell.CANCELLED) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Build_Cancelled"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);

main/trunk/gli/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java

@@ -344 +344 @@
         list_model.removeElement(collection);
 
-        resultPrompt(true);
+        if (!Configuration.fedora_info.isActive()) { // for fedora collections, delete in background
+            resultPrompt(true);
+        }
         details.setText(Dictionary.get("DeleteCollectionPrompt.No_Collection"));
         confirmation.setEnabled(false);