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

Timestamp:

2005-07-28T15:50:17+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up a lot of path variables. These were all over the place, and were often duplicated. Now all GLI related paths are accessed via static methods in the Gatherer class.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (1 diff)

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

@@ -627 +627 @@
             progress.messageOnProgressBar("Downloading CD-ROM data from server");
             }
+
+            // !! TO DO
             
-            //Export directory derrived from -cdname argument
-            //This needs to be exactly the same as derrived by exportcol.pl - perhaps it should be passed in as an argument?
-            String cd_dir = "exported_collections";
-            for(int i=0; i<args.length-1; i++) {
-            if(args[i] == "-cdname") {
-                //Remove all spaces
-                String cdName = args[i+1];
-                Pattern pattern = Pattern.compile("\\s");
-                Matcher matcher = pattern.matcher(cdName);
-                cd_dir = "exported_" + matcher.replaceAll("");
-            }
-            }
-            //DebugStream.println("cd_dir is: " + cd_dir);
-
-            String tmp_dir = Utility.TMP_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; //Need to tell user this!
-
-            Utility.delete(full_local_cd_dir); // remove current cd-rom dir, if it exists
-            RemoteGreenstoneServer.download_url_zip(user_tmp_dir,cd_dir,this,"","");
-
-            ZipTools.unzip(Configuration.gsdl_path, user_tmp_dir.substring(1));
-
-            if (progress!=null) {
-            System.err.println("Asking progress bar to be empty string");
-            progress.messageOnProgressBar("");
-            }
-            
-            //The string needs to start with exportcol.pl> otherwise it won't be displayed in the final dialog
-            String message = "exportcol.pl>\nThese files have been copied from the server to " + full_local_cd_dir + " and are ready to written to CD-ROM";
-            fireMessage(type, message, status, bos); //Hopefully this works
-            System.err.println("Finished download of /tmp ...");
-        }
-        
+            if (progress!=null) {
+            progress.messageOnProgressBar("");
+            }
+        }
         }
     }