Changeset 7925

Timestamp:

2004-08-10T11:27:15+12:00 (20 years ago)

Author:

davidb

Message:

URL arguments to launch now encoded, to ensure spaces etc. are handled correctly.

Added "uploading" and "downloading" messages to progress-bar for when
GLI is run as applet and transferring files between local machine
and server.

File:

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

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

@@ -238 +238 @@
             if (!args[i+1].startsWith(StaticStrings.MINUS_CHARACTER)) {
                 i++;
-                String val = args[i];
+                String val = URLEncoder.encode(args[i],"UTF-8");
                 launch = launch + val;
             }
@@ -249 +249 @@
 
         System.err.println("**** launch url = " + launch);
+        // fireMessage(type, Dictionary.get("GShell.Command") + ": " + launch, status, null); // ****
 
         URL launch_url = new URL(launch);
@@ -425 +426 @@
     if (Gatherer.isGsdlRemote) {
         if (type == IMPORT) {
+        if (progress!=null) {
+            progress.messageOnProgressBar("Uploading data to server");
+        }
+
         // zip up import folder
         Utility.zipup(col_name,"import");
@@ -433 +438 @@
         Utility.zipup(col_name,Utility.CONFIG_FILE);
         Utility.upload_url_zip(col_name,"etc");
+
+        if (progress!=null) {
+            progress.messageOnProgressBar("");
+        }
+
         }
     }
@@ -457 +467 @@
         // download the archives directory (if gsdl server is remote)           
         if (Gatherer.isGsdlRemote) {
+
+            if (progress!=null) {
+            progress.messageOnProgressBar("Downloading archive data from server");
+            }
+
+
             Utility.delete(Gatherer.c_man.getCollectionArchive()); // remove current archives
             Utility.download_url_zip(col_name,"archives");
             Utility.unzip(col_name);
+
+            if (progress!=null) {
+            progress.messageOnProgressBar("");
+            }
         }
 
@@ -472 +492 @@
         // download the building directory (if gsdl server is remote)           
         if (Gatherer.isGsdlRemote) {
+            if (progress!=null) {
+            progress.messageOnProgressBar("Downloading index data from server");
+            }
+
             Utility.delete(Gatherer.c_man.getCollectionBuild()); // remove current build dir
             Utility.download_url_zip(col_name,"building");
             Utility.unzip(col_name);
+
+            if (progress!=null) {
+            progress.messageOnProgressBar("");
+            }
+
         }