Changeset 13332

Timestamp:

2006-11-24T14:16:19+13:00 (17 years ago)

Author:

kjdon

Message:

chdir doesn't seem to work on windows, so when using wget on windows, we add -Ppath to the command rather than changing directories. wget seems to get the link paths right on windows

File:

• trunk/gsdl/perllib/plugins/LOMPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/LOMPlug.pm

@@ -587 +587 @@
     }
 
-    # if we pass an absolute path as -P arg to wget, then it stuffs up the 
+    # on linux, if we pass an absolute path as -P arg to wget, then it 
+    # stuffs up the 
     # URL rewriting in the file. Need a relative path or none, so now
     # we change working directory first.
+    my $changed_dir = 0;
     my $current_dir = cwd();
-    chdir "$output_dir";
-    my $wget_cmd = "wget -nv  --timestamping -k -p \"$doc_url\"";
+    my $wget_cmd = "";
+    if ($ENV{'GSDLOS'} ne "windows") {
+        $changed_dir = 1;
+        
+        chdir "$output_dir";
+        $wget_cmd = "wget -nv  --timestamping -k -p \"$doc_url\"";
+    } else {
+        $wget_cmd = "wget -nv -P$output_dir --timestamping -k -p \"$doc_url\""; 
+    }
     #my $wget_cmd = "wget -nv -P$output_dir --timestamping -k -p \"$doc_url\""; 
     ### my $full_dir_url = &File::Basename::dirname($full_file_url);
@@ -602 +611 @@
     
     $status = system($wget_cmd);
-    chdir $current_dir;
-
+    if ($changed_dir) {
+        chdir $current_dir;
+    }
     if ($status==0) {
         $self->{'lom_srcdoc'} = $full_file_url;