Changeset 6132 for trunk

Timestamp:

2003-12-05T14:01:40+13:00 (20 years ago)

Author:

kjdon

Message:

importfrom now puts src docs into srcdocs instead of .orig

Location:

trunk/gsdl

Files:

• bin/script/importfrom.pl (modified) (2 diffs)
• perllib/plugins/OAIPlug.pm (modified) (1 diff)

trunk/gsdl/bin/script/importfrom.pl

@@ -139 +139 @@
     print $out "Getting document $doc_url\n";
 
-    `mkdir $output_dir/.orig` if (!-e "$output_dir/.orig");
+    `mkdir $output_dir/srcdocs` if (!-e "$output_dir/srcdocs");
     
-    my $wget_cmd = "wget -q -O $output_dir/.orig/$id_fname \"$doc_url\"";
+    my $wget_cmd = "wget -q -O $output_dir/srcdocs/$id_fname \"$doc_url\"";
 
     (system($wget_cmd)==0)
@@ -199 +199 @@
             my ($id_dir,$id_fname) = dir_file_split($doc_url);
 
-            $i_record =~ s/<metadata>(.*?)<(dc:)?identifier>$doc_url<\/(dc:)?identifier>(.*?)<\/metadata>/<metadata>$1<OrigURL>$doc_url<\/OrigURL>\n   <identifier>.orig\/$id_fname<\/identifier>$4<\/metadata>/s;
+            $i_record =~ s/<metadata>(.*?)<(dc:)?identifier>$doc_url<\/(dc:)?identifier>(.*?)<\/metadata>/<metadata>$1<OrigURL>$doc_url<\/OrigURL>\n   <identifier>srcdocs\/$id_fname<\/identifier>$4<\/metadata>/s;
         }
         }

trunk/gsdl/perllib/plugins/OAIPlug.pm

@@ -81 +81 @@
     $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
 
-    return 0 if ((-d $filename) && ($filename =~ m/.orig$/));
+    return 0 if ((-d $filename) && ($filename =~ m/srcdocs$/));
     
     if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {