Changeset 9231

Timestamp:

2005-03-01T15:28:10+13:00 (19 years ago)

Author:

davidb

Message:

Revision to associated files for handling METS saveas case.

File:

• trunk/gsdl/perllib/docsave.pm (modified) (3 diffs)

trunk/gsdl/perllib/docsave.pm

@@ -50 +50 @@
     
     $groupsize=1 unless defined $groupsize;
+    $service="import" unless defined $service;
+
     $self->{'collection'} = $collection;
     if ($service eq "import"){
@@ -418 +420 @@
     # same one.
     $doc_dir = $doc_info->[0];
-    $doc_dir =~ s/\/?doc\.xml(\.gz)?$//;
+    $doc_dir =~ s/\/?doc(mets)?\.xml(\.gz)?$//;
     } elsif ($self->{'keepimportstructure'}) {
     $source_filename = &File::Basename::dirname($source_filename);
@@ -468 +470 @@
     return;
     }
-    $doc_obj->get_source_filename()=~ /\/[^\/\\]$/;
 
     if ($save_as eq "DSpace") {
-    print $handle "$1\n";
-    $filename = &util::filename_cat($working_dir, $doc_dir, $1);
+
+    my ($tail_filename) = ($doc_obj->get_source_filename() =~ m/\/([^\/\\]*)$/);
+
+    print $handle "$tail_filename\n";
+
+    $filename = &util::filename_cat($working_dir, $doc_dir, $tail_filename);
     &util::hard_link ($doc_obj->get_source_filename(), $filename);
     }