Changeset 6590 for trunk/gli/src/org/greenstone/gatherer/WGet.java

Timestamp:

2004-01-22T16:19:34+13:00 (20 years ago)

Author:

jmt12

Message:

Started effecting the changes requested by Ian and David. So far I've removed the complex arguments, and have ensured that the path is correct for downloads without page requisites. I've also tried to get the workspace tree to update properly, and it is much closer than before but it is now temporarily displaying the same node twice.

File:

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

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -257 +257 @@
     // Create the job and fill in the details from gatherer.config.
     Gatherer.println("About to create a new job");
-    // If it was decided not to download page requisites, then create the destination by basing it on the given destination, but appending the url host. If page requisites is used then WGet will do this for us
+    // If it was decided not to download page requisites, then create the destination by basing it on the given destination, but appending the url host and paths. If page requisites is used then WGet will do this for us
     if(!page_requisites) {
-        destination = destination + url.getHost();
+        System.err.println("Initially destination: " + destination);
+        String almost_the_entire_path = url.getPath();
+        int index = -1;
+        if((index = almost_the_entire_path.lastIndexOf("/")) != -1) {
+        almost_the_entire_path = almost_the_entire_path.substring(0, index);
+        }
+        destination = destination + url.getHost() + almost_the_entire_path + "/";
+        System.err.println("Finale destination:    " + destination);
     }
     Job new_job = new Job(Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);