Changeset 26333 for main/trunk

Timestamp:

2012-10-17T21:05:20+13:00 (12 years ago)

Author:

ak19

Message:

1. Introduced new perl script for deleting a fedora collection (g2f-deletecol.pl) because, when deleting a collection that's been ingested into fedora, both the fedora collection file and the documents in the collection (METS files) that have been ingested into fedora need to purged. Also these docs need to be removed from the fedoragsearch index if it gsearch is installed. The command line script does not delete the Greenstone collection directory, that has to be done manually at this stage, since GLI already does that part. 2. FLI calls the new perl script g2f-deletecol.pl when the user chooses to have a collection deleted.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (2 diffs)
• gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (2 diffs)
• greenstone2/bin/script/g2f-deletecol.pl (added)

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

@@ -108 +108 @@
     /** The monitor responsible for parsing the scheduler process. */ 
     static private GShellProgressMonitor schedule_monitor = null; 
+    ///** The monitor responsible for parsing the fedora collection delete process. */ 
+    //static private GShellProgressMonitor fedora_coldelete_monitor = null;
 
     /** The name of the standard lock file. */
@@ -814 +816 @@
     if (LocalLibraryServer.isRunning() == true) {
         LocalLibraryServer.releaseCollection(collection_name);
+    }
+
+    // if we're running FLI, it's a fedora collection, and we need to call a special
+    // delete script to delete the collection and all its documents from the fedora
+    // repository and from fedora-gsearch's index.
+    if (Configuration.fedora_info.isActive()) {
+
+        // Generate the buildcol.pl command
+        ArrayList command_parts_list = new ArrayList();
+        if (!Gatherer.isGsdlRemote) {
+        command_parts_list.add(Configuration.perl_path);
+        command_parts_list.add("-S");
+        }
+
+        command_parts_list.add(scriptPath + "g2f-deletecol.pl");
+
+        command_parts_list.add("-hostname");
+        command_parts_list.add(Configuration.fedora_info.getHostname());
+
+        command_parts_list.add("-port");
+        command_parts_list.add(Configuration.fedora_info.getPort());
+
+        command_parts_list.add("-username");
+        command_parts_list.add(Configuration.fedora_info.getUsername());
+
+        command_parts_list.add("-password");
+        command_parts_list.add(Configuration.fedora_info.getPassword());
+
+        command_parts_list.add("-protocol");
+        command_parts_list.add(Configuration.fedora_info.getProtocol());
+
+        command_parts_list.add("-gli");
+        command_parts_list.add("-language");
+        command_parts_list.add(Configuration.getLanguage());
+        if(!Gatherer.isGsdlRemote) {
+        command_parts_list.add("-collectdir");
+        command_parts_list.add(getCollectDirectory()); // <../collect/>
+        }
+        
+        command_parts_list.add(collection_name);
+        
+        // Run the g2f-deletecol.pl to remove the fedora collection
+        String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+        GShell shell = new GShell(command_parts, GShell.DELETE, COLLECT, this, null, GShell.GSHELL_FEDORA_COLDELETE); // fedora_coldelete_monitor set to null
+        shell.start();
     }
 

main/trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -94 +94 @@
     static final public int SRCREPLACE = 7; // for replacing source docs with their html
     static final public int SCHEDULE = 8;
+    static final public int DELETE = 9;
 
     /** Elements in status type enumeration. */
@@ -110 +111 @@
     static public String GSHELL_SRCREPLACE = "gshell_srcreplace"; // for replacing source docs with their html versions
     static public String GSHELL_SCHEDULE = "gshell_schedule"; 
+    static public String GSHELL_FEDORA_COLDELETE = "gshell_fedora_col_delete";
 
     /** Determine if the given process is still executing. It does this by attempting to throw an exception - not the most efficient way, but the only one as far as I know