Changeset 37690 for main

Timestamp:

2023-04-20T20:30:20+12:00 (12 months ago)

Author:

anupama

Message:

One part of what Dr Bainbridge wanted done: on Cancel press (though perl propagates it as an error), *after* the SafeProcess has been terminated a processComplete() is fired: then we check if it the type was an import process and a cancel/error occurred, and if so, we check if archives_keepold exists. If it exists, we make this the archivse folder after getting rid of any archives of the prematurely terminated import process.

Location:

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

Files:

• collection/CollectionManager.java (modified) (1 diff)
• gui/CreatePane.java (modified) (5 diffs)
• shell/GShell.java (modified) (1 diff)

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

@@ -1017 +1017 @@
     return getLoadedCollectionDirectoryPath() + "archives" + File.separator;
     }
+
+    /** Returns the absolute filename of the loaded collection's archives_keepold directory.
+     * Part of the file-level document-version (fldv) history mechanism.
+     */
+    static public String getLoadedCollectionArchivesKeepOldDirectoryPath()
+    {
+    return getLoadedCollectionDirectoryPath() + "archives_keepold" + File.separator;
+    }
+    
 
     /** Returns the absolute filename of the loaded collection's export directory.

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

@@ -342 +342 @@
 
 
+    // No archives_keepold/fldv file-level document-version history in remoteGS situations
+    // Disable choice between incremental and full building buttons,
+    // and ensure full build buttons are selected (already done above)
+    if(Gatherer.isGsdlRemote) {     
+        full_build_radio_button.setEnabled(false);
+        incremental_build_radio_button.setEnabled(false);
+        sfull_build_radio_button.setEnabled(false);
+        sincremental_build_radio_button.setEnabled(false);
+    }
+
         // Build control_pane
         JPanel left = new JPanel();
@@ -487 +497 @@
 
     /** All implementation of GShellListener must include this method so the listener can be informed of messages from the GShell.
-     * @param event A <strong>GShellEvent</strong> that contains, amoung other things, the message.
+     * @param event A <strong>GShellEvent</strong> that contains, among other things, the message.
      */
     public synchronized void message(GShellEvent event) {
@@ -619 +629 @@
         document.setSpecialCharacter(OptionsPane.UNSUCCESSFUL);
         }
+
+        // If import was cancelled OR an error occurred, move any archives_keepold to archives
+        if(event.getType() == GShell.IMPORT &&
+           (event.getStatus() == GShell.CANCELLED || event.getStatus() == GShell.ERROR)) {
+        //System.err.println("********* in processComplete CANCELLED IMPORT");
+        moveAnyKeepOldToArchives();
+        }
+        
         options_pane.resetFileEntry();
         if(Configuration.getMode() >= THRESHOLD) {
@@ -627 +645 @@
     }
 
+    /** Related to file-level document-version (fldv) history mechanism. Dr Bainbridge explained:
+     * "When cancel is pressed, if there is an 'archives_keepold' then the incomplete 'archives'
+     * should be removed, and 'archives_keepold' restored back to the 'archives' name."
+     */
+    private void moveAnyKeepOldToArchives() {
+
+        String archives_keepold = CollectionManager.getLoadedCollectionArchivesKeepOldDirectoryPath();
+        File archives_keepold_dir = new File(archives_keepold);
+        if(archives_keepold_dir.exists()) {
+        String statusMsg = "archives_keepold folder detected. Attempting to restore it as archives...";
+        //log_textarea.setCaretPosition(document.getLengthToNearestLine());
+        //document.appendLine(statusMsg);
+        System.err.println(statusMsg);
+        this.shell.fireMessage(statusMsg);
+        
+        String archives = CollectionManager.getLoadedCollectionArchivesDirectoryPath();
+        File archives_dir = new File(archives);
+        
+        if(archives_dir.exists()) {         
+            // no special behaviour for remote GS or fedora. The minimal (incr) rebuild
+            // button is already disabled for remote GS.
+            
+            // Locally delete archives dir, and if that worked, rename keepold
+            if(Utility.delete(archives_dir)) {
+            // move "archives_keepold" to "archives"
+            if(!archives_keepold_dir.renameTo(archives_dir)) {
+                statusMsg = "Failed to rename " + archives_keepold_dir
+                + "\n  to " + archives_dir;
+                //document.appendLine(statusMsg);
+                System.err.println(statusMsg);
+                this.shell.fireMessage(statusMsg);
+            }
+            } else {
+            statusMsg = "Failed to delete " + archives_dir
+                + "  in attempt to rename archives_keepold to archives";
+            //document.appendLine(statusMsg);
+            System.err.println(statusMsg);
+            this.shell.fireMessage(statusMsg);
+            }       
+        }
+        // do what the message() method does after appending to document (build log)
+        //log_textarea.setCaretPosition(document.getLengthToNearestLine());
+        }
+    }
 
     /** This method is invoked at any time there has been a significant change in the collection, such as saving, loading or creating.
@@ -903 +965 @@
         //Gatherer.g_man.lockCollection(false, false);
 
-        // Cancelling building:
-    // For now, for a GS3 solr collection, we need to stop the GS3 server before building
-    // and restart it after building is complete. If a cancel is pressed during build
-    // then we also restart the GS3 server
-    if(CollectionManager.isSolrCollection()) {
-        /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
-          thread.start();*/
-    }
-
-
+        // Cancelling building:
+        // For now, for a GS3 solr collection, we need to stop the GS3 server before building
+        // and restart it after building is complete. If a cancel is pressed during build
+        // then we also restart the GS3 server
+        if(CollectionManager.isSolrCollection()) {
+        /*GS3ServerThread thread = new GS3ServerThread(Configuration.gsdl3_src_path, "restart");
+          thread.start();*/
+        }
+        
     }
     }

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

@@ -713 +713 @@
     // instance of this class for each stream. However, since multiple instances of this LineByLineHandler
     // are firing off events to the same outputstream object (bos) in their own threads, several objects,
-    // not just bost, needed to be made threadsafe. So gotLine needs to be synchronized, and created a
+    // not just bos, needed to be made threadsafe. So gotLine needs to be synchronized, and created a
     // synchronized setStatus() method above too.
     // This class also handles exceptions that may occur when reading from the perl process' stderr or stout.