Changeset 9570

Timestamp:

2005-04-07T11:54:37+12:00 (19 years ago)

Author:

davidb

Message:

Mods made as a result of testing importfrom.pl under Windows.

File:

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

trunk/gsdl/bin/script/importfrom.pl

@@ -32 +32 @@
 # Currently only designed for OAI exporting
 
-
 BEGIN {
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
@@ -44 +43 @@
 use FileHandle;
 
+my $wgetopt = "";
 
 sub print_usage {
@@ -82 +82 @@
     print $out "Requesting list of identifiers ...\n";
 
-    open (OAIIN,"wget -q -O - \"$base_url?verb=ListIdentifiers&metadataPrefix=oai_dc\" |")
+    open (OAIIN,"wget $wgetopt -q -O - \"$base_url?verb=ListIdentifiers&metadataPrefix=oai_dc\" |")
     || die "wget request failed: $!\n";
  
@@ -144 +144 @@
     my $full_id_fname = &util::filename_cat($srcdocs_dir,$id_fname);
 
-    my $wget_cmd = "wget -q -O $full_id_fname \"$doc_url\"";
+    my $wget_cmd = "wget $wgetopt -q -O $full_id_fname \"$doc_url\"";
 
     (system($wget_cmd)==0)
@@ -165 +165 @@
     print $out "Downloading metadata record for $i\n";
 
-    my $file_i_url = "$output_dir/$i.oai";
-    $file_i_url =~ s/:/\//g;
+        my $i_url = $i; #convert OAI set separators (:) to directory sep
+        $i_url =~ s/:/\//g;
+    my $file_i_url = "$output_dir/$i_url.oai";
 
     my $ds = &util::get_dirsep();
-    my $file_i = &util::filename_cat($output_dir,"$i.oai");
-    $file_i =~ s/:/$ds/g;
+    my $i_os = $i; #convert OAI set separators (:) to OS dir sep
+    $i_os =~ s/:/$ds/g;
+    my $file_i = &util::filename_cat($output_dir,"$i_os.oai");
 
     # obtain record
-    my $wget_cmd = "wget -q -O - \"$url\"";
+    my $wget_cmd = "wget $wgetopt -q -O - \"$url\"";
 
     open (OAIIN,"$wget_cmd|")
@@ -189 +191 @@
     # prepare subdirectory for record (if needed)
     my ($i_dir,$unused) = dir_file_split($file_i_url);
+
     &util::mk_all_dir($i_dir);