Changeset 9895

Timestamp:

2005-05-17T13:16:16+12:00 (19 years ago)

Author:

davidb

Message:

Modifications so information collated in WriteCDImagePrompt is transmitted
correctly to "launch" script.

File:

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

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

@@ -326 +326 @@
         }
         
-        launch += "&";
         
         if(arg.startsWith(StaticStrings.MINUS_CHARACTER)) {
             String name = arg.substring(1);
-            launch = launch + name + "=";
+            launch = launch + "&" + name + "=";
             if (i+1<args.length-1) {
             if (!args[i+1].startsWith(StaticStrings.MINUS_CHARACTER)) {
@@ -350 +349 @@
 
         if (cols_concat!=null) {
-        launch = launch + "c=" + cols_concat;
+        launch = launch + "&c=" + cols_concat;
         }
 
@@ -635 +634 @@
 
             // export directory named stored as -cdname argument
-            String cd_name = "exported_collections";
+            String cd_dir = "exported_collections";
             for (int i=0; i<args.length-1; i++) {
-            if (args[i] == "-cdname") {
-                cd_name = "exported_" + args[i+1];
+            if (args[i] == "-cddir") {
+                cd_dir = args[i+1];
                 break;
             }
             }
 
-            String full_cd_dir = tmp_dir + cd_name;
-
-            Utility.delete(full_cd_dir); // remove current cd-rom dir, if it exists
-            GathererApplet.download_url_zip("/tmp",cd_name,this,"","");
-
-            Utility.unzip(Configuration.gsdl_path, "tmp");
+            // String user_cd_dir = cd_dir;
+            String user_tmp_dir = "/tmp";
+            String username = System.getProperty("user.name");
+            if ((username != null) && (username != "")) {
+            // user_cd_dir = username + File.separator + cd_dir;
+            user_tmp_dir = user_tmp_dir + File.separator + username;
+            }
+
+            String full_local_cd_dir = tmp_dir + cd_dir;
+
+            Utility.delete(full_local_cd_dir); // remove current cd-rom dir, if it exists
+            GathererApplet.download_url_zip(user_tmp_dir,cd_dir,this,"","");
+
+            Utility.unzip(Configuration.gsdl_path, user_tmp_dir.substring(1));
 
             if (progress!=null) {