Changeset 9543

Timestamp:

2005-04-04T14:47:36+12:00 (19 years ago)

Author:

davidb

Message:

Eliminatin of Unix specific code. Still needs to be tested under Windows
though.

File:

• trunk/gsdl/bin/script/importfrom.pl (modified) (3 diffs)

trunk/gsdl/bin/script/importfrom.pl

@@ -139 +139 @@
     print $out "Getting document $doc_url\n";
 
-    `mkdir $output_dir/srcdocs` if (!-e "$output_dir/srcdocs");
-    
-    my $wget_cmd = "wget -q -O $output_dir/srcdocs/$id_fname \"$doc_url\"";
+    my $srcdocs_dir = &util::filename_cat($output_dir,"srcdocs");
+    &util::mk_dir($srcdocs_dir)  if (!-e "$srcdocs_dir");
+
+    my $full_id_fname = &util::filename_cat($srcdocs_dir,$id_fname);
+
+    my $wget_cmd = "wget -q -O $full_id_fname \"$doc_url\"";
 
     (system($wget_cmd)==0)
@@ -162 +165 @@
     print $out "Downloading metadata record for $i\n";
 
-    my $file_i = "$output_dir/$i.oai";
-    $file_i =~ s/:/\//g;
+    my $file_i_url = "$output_dir/$i.oai";
+    $file_i_url =~ s/:/\//g;
+
+    my $ds = &util::get_dirsep();
+    my $file_i = &util::filename_cat($output_dir,"$i.oai");
+    $file_i =~ s/:/$ds/g;
 
     # obtain record
@@ -181 +188 @@
     
     # prepare subdirectory for record (if needed)
-    my ($i_dir,$unused) = dir_file_split($file_i);
-    `mkdir -p $i_dir`;
+    my ($i_dir,$unused) = dir_file_split($file_i_url);
+    &util::mk_all_dir($i_dir);
 
     # look out for identifier tag in metadata section