Changeset 11660

Timestamp:

2006-04-20T11:14:52+12:00 (18 years ago)

Author:

kjdon

Message:

John T's fix for associated files and groupsize:

Heres a minor bug fix to docsave.pm so that it handles associated files
properly (relatively speaking) when groupsize is set. It just ensures
that all associated files end up in the same archive folder as the
doc.xml that refers to them.

Of course, this causes a problem if one or more associated files have
the same name. I suspect the actual bug lies somewhere else in
Greenstone where it assumes that the associated file must be relative to
the archive dir's OID rather than the OID of one of the documents within
a grouped doc.xml. In other words a grouped document HASH0102... will
always have its associated files loaded from the HASH0102... folder even
if the associated file were actually processed into HASH1c2f...,
HASH011e... etc

File:

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

trunk/gsdl/perllib/docsave.pm

@@ -334 +334 @@
 }
 
-      
+# /**
+#  */
 sub group_process {
+
     my $self = shift (@_);
     my ($doc_obj) = @_;
-    
     my $outhandle = $self->{'outhandle'};
 
@@ -349 +350 @@
 
     # opening a new file, or document has assoicated files => directory needed
-    if (($open_new_file) || (scalar(@{$doc_obj->get_assoc_files()})>0)) {
-
-    # get document's directory
-    my $doc_dir = $self->get_doc_dir ($OID, $doc_obj->get_source_filename());
-
-    # copy all the associated files, add this information as metadata
-    # to the document
-    $self->process_assoc_files ($doc_obj, $doc_dir);
-
-
-    if ($open_new_file) {
-        # only if opening new file
+    if (($open_new_file) || (scalar(@{$doc_obj->get_assoc_files()})>0))
+      {
+        # The directory the archive file (doc.xml) and all associated files
+        # should end up in
+        my $doc_dir;
+        # If we've determined its time for a new file, open it now
+        if ($open_new_file || !defined($self->{'gs_doc_dir'}))
+          {
+            $doc_dir = $self->get_doc_dir ($OID, $doc_obj->get_source_filename());
+            # only if opening new file
         my $output_dir = $self->getoutputdir();
-        my $doc_file 
-        = &util::filename_cat ($output_dir, $doc_dir, "doc.xml");
+
+        my $doc_file = &util::filename_cat ($output_dir, $doc_dir, "doc.xml");
         my $short_doc_file = &util::filename_cat ($doc_dir, "doc.xml");
-        
+
         if ($gs_count>0)
         {
         return if (!$self->close_file_output());
         }
-        
+
         if (!open (OUTDOC, ">$doc_file")) {
         print $outhandle "docsave::group_process could not write to file $doc_file\n";
@@ -378 +377 @@
         $self->{'gs_short_filename'} = $short_doc_file;
         $self->{'gs_OID'} = $OID;
+            $self->{'gs_doc_dir'} = $doc_dir;
 
         $self->output_xml_header('docsave::OUTDOC');
     }
+        # Otherwise load the same archive document directory used last time
+        else
+          {
+            $doc_dir = $self->{'gs_doc_dir'};
+          }
+    # copy all the associated files, add this information as metadata
+    # to the document
+        print STDERR "Writing associated files to $doc_dir\n";
+    $self->process_assoc_files ($doc_obj, $doc_dir);
     }