Changeset 37691

Timestamp:

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

Author:

anupama

Message:

Second part of Dr Bainbridge's request for dealing with any existing archives_keepold folder on pressing build button in GLI: user should be presented with dialog. Have tested by creating a manual copy of archives name as archives_keepold to trigger new functionality on pressing build button. But, since the rename of keepold to archives is very fast, I still need to test if it is indeed the keepold that's been renamed to archives after deleting existing archives.

Location:

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

Files:

• CreatePane.java (modified) (3 diffs)
• WarnIncrBuildDialog.java (added)

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

@@ -633 +633 @@
         if(event.getType() == GShell.IMPORT &&
            (event.getStatus() == GShell.CANCELLED || event.getStatus() == GShell.ERROR)) {
-        //System.err.println("********* in processComplete CANCELLED IMPORT");
         moveAnyKeepOldToArchives();
         }
@@ -663 +662 @@
         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);
+        // no special behaviour for remote GS or fedora. The minimal (incr) rebuild
+        // button is already disabled for remote GS.
+        
+        // First locally delete archives dir if any exists
+        if(archives_dir.exists() && !Utility.delete(archives_dir)) {            
+            statusMsg = "Failed to delete " + archives_dir
+            + "  in attempt to rename archives_keepold to archives";
+            System.err.println(statusMsg);
+            this.shell.fireMessage(statusMsg);
+        }     
+
+        if(!archives_dir.exists()) {
+            // Rename archives_keepold folder to archives
+            if(!archives_keepold_dir.renameTo(archives_dir)) {
+            statusMsg = "Failed to rename " + archives_keepold_dir
+                + "\n  to " + archives_dir;
             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());
+            }
+        }       
         }
     }
@@ -760 +755 @@
         Collection collection = Gatherer.c_man.getCollection();
         String collection_name = collection.getName();
+
+    // Take care of the case if we have a stray archives_keepold folder
+    File archives_keepold_dir = new File(CollectionManager.getLoadedCollectionArchivesKeepOldDirectoryPath());
+    if(archives_keepold_dir.exists()) {
+        WarnIncrBuildDialog dialog = new WarnIncrBuildDialog();
+        int result = dialog.display();
+        dialog.dispose();
+        dialog = null;
+        if(result == WarnIncrBuildDialog.CANCEL) { // user chose not to build after all
+        return;
+        }
+    }
 
         //if button is labelled for Building