Changeset 16252

Timestamp:

2008-06-30T16:13:08+12:00 (15 years ago)

Author:

mdewsnip

Message:

Fixes to get_doc_dir() and get_new_doc_dir() so if you are importing the same document multiple times it doesn't generate a new archives directory with another ".dir" at the end every time.

File:

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

gsdl/trunk/perllib/plugouts/BasPlugout.pm

@@ -517 +517 @@
     my $doc_dir = '';
 
-    if (defined $doc_info && scalar(@$doc_info) >= 1) {
-    # this OID already has an assigned directory, use the
-    # same one.
+    if (defined $doc_info && scalar(@$doc_info) >= 1)
+    {
+    # This OID already has an archives directory, so use it again
     $doc_dir = $doc_info->[0];
     $doc_dir =~ s/\/?((doc(mets)?)|(dublin_core))\.xml(\.gz)?$//;
-    } elsif ($self->{'keep_import_structure'}) {
+    }
+    elsif ($self->{'keep_import_structure'})
+    {
     $source_filename = &File::Basename::dirname($source_filename);
     $source_filename =~ s/[\\\/]+/\//g;
@@ -528 +530 @@
 
         $doc_dir = substr($source_filename, length($ENV{'GSDLIMPORTDIR'}) + 1);
-
-    }
-
-    # have to get a new document directory
-    $doc_dir = $self->get_new_doc_dir($working_info,$working_dir,$OID) unless $doc_dir ne "";
-
-    $doc_dir .= ".dir";
+    }
+
+    # We have to use a new archives directory for this document
+    if ($doc_dir eq "")
+    {
+    $doc_dir = $self->get_new_doc_dir ($working_info, $working_dir, $OID);
+    }
+
     if (!defined $self->{'group'} || !$self->{'group'}){
     &util::mk_all_dir (&util::filename_cat ($working_dir, $doc_dir));
     }
+
     return $doc_dir;
 }
@@ -559 +563 @@
          ($working_info->size() >= 1024 && $doc_dir_num < 2)));
    
-   
-   return $doc_dir;
+   return "$doc_dir.dir";
 }