Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

Timestamp:

2004-10-08T09:46:12+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all Gatherer.print* with DebugStream.print*.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java (modified) (12 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

@@ -43 +43 @@
 import javax.swing.tree.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -254 +255 @@
         }
         else {
-        Gatherer.println("Unknown user/pass");
+        DebugStream.println("Unknown user/pass");
         }
     }
@@ -284 +285 @@
     // Run it
     try {
-        //Gatherer.println("Cmd: " + command); // don't print it out cos it may have the password in it
+        //DebugStream.println("Cmd: " + command); // don't print it out cos it may have the password in it
         Runtime rt = Runtime.getRuntime();
         String [] env = null;
@@ -300 +301 @@
         while ((line = br.readLine()) != null && state != STOPPED) {
         
-        Gatherer.println(line);
+        DebugStream.println(line);
         download_log.appendLine(line);
         // The first magic special test is to see if we've just
@@ -306 +307 @@
         // the next add and then the next complete/error.
         if(line.lastIndexOf("robots.txt;") != -1) {
-            Gatherer.println("***** Requesting robot.txt");
+            DebugStream.println("***** Requesting robot.txt");
             ignore_for_robots = true;
         }
@@ -323 +324 @@
             String current_file_downloading = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
             if(!ignore_for_robots) {
-            Gatherer.println("Not ignore for robots");
+            DebugStream.println("Not ignore for robots");
             // Download complete
             downloadComplete(current_file_downloading);
             }
             else {
-            Gatherer.println("Ignore for robots");
+            DebugStream.println("Ignore for robots");
             ignore_for_robots = false;
             }
@@ -340 +341 @@
         else if(line.lastIndexOf(" `") != -1) {
             // Not Overwriting
-            Gatherer.println("Already there.");
+            DebugStream.println("Already there.");
             String new_url = 
             line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
@@ -350 +351 @@
             if(line.charAt(2) == ':' && line.charAt(5) == ':') {
             if(!ignore_for_robots) {
-                Gatherer.println("Error.");
+                DebugStream.println("Error.");
                 downloadFailed();
             }
@@ -370 +371 @@
     catch (Exception ioe) {
         //message(Utility.ERROR, ioe.toString());
-        Gatherer.printStackTrace(ioe);
+        DebugStream.printStackTrace(ioe);
     }
     // If we've got to here and the state isn't STOPPED then the
@@ -462 +463 @@
     args.add(initial.toString());
 
-    Gatherer.println("Calling wget ");
+    DebugStream.println("Calling wget ");
     for(Enumeration e = args.elements(); e.hasMoreElements();) {
-        Gatherer.println(e.nextElement() + " ");
-    }
-    Gatherer.println("");
+        DebugStream.println(e.nextElement() + " ");
+    }
+    DebugStream.println("");
 
     // Run home to mummy.
@@ -490 +491 @@
     public void downloadComplete(String current_file_downloading) {
     progress.downloadComplete();
-    Gatherer.println("Current File: " + current_file_downloading);
+    DebugStream.println("Current File: " + current_file_downloading);
     // !! TEMPORARILY DISABLED !!
     //WorkspaceTreeModel.refreshWebCacheMappings();
@@ -518 +519 @@
 //          // It suddenly occurs to me that by retrieving the destination path, we are causing the potential destination node to map its children which includes the file which I am about to add. Hence I was ending up with two copies.
 //          ///atherer.println("Ready to insert new FileNode.");
-//          Gatherer.println("Model:            " + tree_model);
-//          Gatherer.println("Destination path: " + destination_path);
+//          DebugStream.println("Model:            " + tree_model);
+//          DebugStream.println("Destination path: " + destination_path);
 //          destination_node.unmap();
 //          ///atherer.println("Destination node: " + destination_node);