Changeset 9095 for trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

Timestamp:

2005-02-18T12:31:54+13:00 (19 years ago)

Author:

mdewsnip

Message:

GLI applet: collection building is now much happier about being cancelled. By Matthew Whyte.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (11 diffs)

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

@@ -227 +227 @@
     protected void runRemote(String[] args, BufferedOutputStream bos) 
     {
+    if(hasSignalledStop()) { return; }
+    int error_count = 0;
+    StringBuffer error_list = new StringBuffer();
     try {
-
+        if (type == IMPORT) {
+        String col_name = args[args.length-1];
+        if (progress!=null) {
+            progress.messageOnProgressBar("Uploading data to server");
+        }
+
+        String collect_directory_path = Gatherer.getCollectDirectoryPath();
+        
+        // zip up import folder
+        Utility.zipup(collect_directory_path, col_name, "import", this);
+
+        if(hasSignalledStop()) { return; }
+        // upload it to gsdl server
+        GathererApplet.upload_url_zip(col_name, "import", this);
+
+        if(hasSignalledStop()) { return; }
+        // upload etc folder to server (need collect.cfg and any hfiles)
+        Utility.zipup(collect_directory_path, col_name, "etc", this);
+
+        if(hasSignalledStop()) { return; }
+        GathererApplet.upload_url_zip(col_name, "etc", this);
+
+        String collection_directory_path = Gatherer.c_man.getCollectionDirectoryPath(col_name);
+        File img_dir = new File(Gatherer.c_man.getCollectionImagesDirectoryPath());
+        if (img_dir.exists() && img_dir.list().length > 0) {
+            // upload images/ directory to server
+            if(hasSignalledStop()) { return; }
+            Utility.zipup(collect_directory_path, col_name, "images", this);
+
+            if(hasSignalledStop()) { return; }
+            GathererApplet.upload_url_zip(col_name, "images", this);            
+        }
+
+        if(hasSignalledStop()) { return; }
+        // see if collection specific image needs uploading
+        CollectionMetaManager cmm 
+            = CollectionDesignManager.collectionmeta_manager;
+        
+        CollectionMeta icon_collection_collectionmeta 
+            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);
+        CollectionMeta icon_collection_small_collectionmeta 
+            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
+        
+        String ics_text = icon_collection_collectionmeta.getValue(CollectionMeta.TEXT);
+        String icsc_text = icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT);
+        if ((ics_text != null) && (ics_text != "")) {
+            // Stub code for detecting when collectoin image changed
+            // => need to upload images
+            // System.err.println("**** ics_text = " + ics_text);
+        }
+        
+        if (progress!=null) {
+            progress.messageOnProgressBar("");
+        }
+        }
+        
+        if(hasSignalledStop()) { return; }
         String perl_cmd = args[0];
         int perl_cmd_root = perl_cmd.lastIndexOf(File.separator);
-        
+        
         if (perl_cmd_root > 0) {
         String perl_cmd_cut = perl_cmd.substring(perl_cmd_root+1);
         perl_cmd = perl_cmd_cut;
         }
-
+        
         String launch  = Gatherer.cgiBase + "launch";
         launch = launch + "?cmd=" + perl_cmd;
-
+        
         for(int i = 1; i<args.length; i++) {
-            
+        
         String arg = args[i];
-
+        
         if (arg.equals("-collectdir") || arg.equals("-importdir")
             || arg.equals("-builddir")) {
@@ -250 +309 @@
             continue;
         }
-        
+        
         launch += "&";
-        
+        
         if(arg.startsWith(StaticStrings.MINUS_CHARACTER)) {
             String name = arg.substring(1);
@@ -268 +327 @@
         }
         }
-
+        
         System.err.println("**** launch url = " + launch);
         // fireMessage(type, Dictionary.get("GShell.Command") + ": " + launch, status, null); // ****
-
+        
         URL launch_url = new URL(launch);
         URLConnection launch_connection = launch_url.openConnection();
         InputStream stdis = launch_connection.getInputStream();
         InputStreamReader stdisr = new InputStreamReader(stdis, "UTF-8");
-    
+        
         BufferedReader stdbr = new BufferedReader(stdisr);
-    
-        StringBuffer error_list = new StringBuffer();
-        int error_count = 0;
-
+        
         if (type == GShell.NEW) {
         while(true) {
@@ -295 +351 @@
             error_count = check_for_error(line,error_list,error_count);
             fireMessage(type, typeAsString(type) + "> " + line, status, bos);
-        }       
+        }
+        System.err.println("Wants to stop (1)."); 
         }
         stdbr.close();
-    
+        
         if (error_count>0) {
         status = ERROR;
@@ -305 +362 @@
             fireMessage(type, typeAsString(type) + "> " + error_list, status, null);
         }
+        }
+        else if(hasSignalledStop()) {
+        //User pressed the cancel button.
+        //Status already set in hasSignalledStop method.
         }
         else {
@@ -458 +519 @@
     }
 
-    if (Gatherer.isGsdlRemote) {
-        if (type == IMPORT) {
-        if (progress!=null) {
-            progress.messageOnProgressBar("Uploading data to server");
-        }
-
-        String collect_directory_path = Gatherer.getCollectDirectoryPath();
-
-        // zip up import folder
-        Utility.zipup(collect_directory_path, col_name, "import");
-        // upload it to gsdl server
-        GathererApplet.upload_url_zip(col_name, "import");
-
-        // upload etc folder to server (need collect.cfg and any hfiles)
-        Utility.zipup(collect_directory_path, col_name, "etc");
-        GathererApplet.upload_url_zip(col_name, "etc");
-
-        String collection_directory_path = Gatherer.c_man.getCollectionDirectoryPath(col_name);
-        File img_dir = new File(Gatherer.c_man.getCollectionImagesDirectoryPath());
-        if (img_dir.exists() && img_dir.list().length > 0) {
-            // upload images/ directory to server
-            Utility.zipup(collect_directory_path, col_name, "images");
-            GathererApplet.upload_url_zip(col_name, "images");
-        }
-
-        // see if collection specific image needs uploading
-        CollectionMetaManager cmm 
-            = CollectionDesignManager.collectionmeta_manager;
-
-        CollectionMeta icon_collection_collectionmeta 
-            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTION_STR);
-        CollectionMeta icon_collection_small_collectionmeta 
-            = cmm.getMetadatum(CollectionConfiguration.COLLECTIONMETADATA_ICONCOLLECTIONSMALL_STR);
-
-        String ics_text = icon_collection_collectionmeta.getValue(CollectionMeta.TEXT);
-        String icsc_text = icon_collection_small_collectionmeta.getValue(CollectionMeta.TEXT);
-        if ((ics_text != null) && (ics_text != "")) {
-            // Stub code for detecting when collectoin image changed
-            // => need to upload images
-            // System.err.println("**** ics_text = " + ics_text);
-        }
-
-
-        if (progress!=null) {
-            progress.messageOnProgressBar("");
-        }
-
-        }
-    }
-
-
     // Issue a processBegun event
     fireProcessBegun(type, status);
@@ -521 +531 @@
         if (type == NEW) {
         if (Gatherer.isGsdlRemote) {
-            GathererApplet.download_url_zip(col_name,".");
-            Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
+            GathererApplet.download_url_zip(col_name, ".", this);
+            if (!hasSignalledStop()) {
+            Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
+            }
         }
         }
@@ -535 +547 @@
 
             Utility.delete(Gatherer.c_man.getCollectionArchivesDirectoryPath()); // remove current archives
-            GathererApplet.download_url_zip(col_name,"archives");
-            Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
-
-            if (progress!=null) {
-            progress.messageOnProgressBar("");
-            }
+            GathererApplet.download_url_zip(col_name, "archives", this);
+               if (!hasSignalledStop()) {
+               Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
+               }
+               if (progress!=null) {
+               progress.messageOnProgressBar("");
+               }      
         }
 
@@ -560 +573 @@
             Utility.delete(buildDir); // remove current build dir
             buildDir.mkdir(); //Make a clean dir
-            GathererApplet.download_url_zip(col_name,"building/build.cfg"); //Only need build.cfg
-            Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
-
+            GathererApplet.download_url_zip(col_name, "building/build.cfg", this); //Only need build.cfg
+            if (!hasSignalledStop()) {
+            Utility.unzip(Gatherer.getCollectDirectoryPath(), col_name);
+            }
+            
             if (progress!=null) {
             progress.messageOnProgressBar("");
@@ -570 +585 @@
     }
 
-    if(hasSignalledStop()) {
-        status = CANCELLED;
-    }
     // We're done.
     fireProcessComplete(type, status);
@@ -678 +690 @@
      * @return A <strong>boolean</strong> indicating if the user wanted to stop.
      */
-    private boolean hasSignalledStop() {
+    public boolean hasSignalledStop() {
     boolean has_signalled_stop = false;
     if(progress != null) {
         has_signalled_stop = progress.hasSignalledStop();
+    }
+    if(has_signalled_stop) {
+        status = CANCELLED;
     }
     return has_signalled_stop;