Changeset 12459

Timestamp:

2006-08-17T16:47:20+12:00 (18 years ago)

Author:

kjdon

Message:

fixed up groupsize handling, so it should work now

File:

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

trunk/gsdl/perllib/plugouts/BasPlugout.pm

@@ -30 +30 @@
 use strict;
 no strict 'subs';
+no strict 'refs';
 
 use gsprintf 'gsprintf';
@@ -85 +86 @@
 
     my ($plugoutlist,$args,$hashArgOptLists) = @_;
-
     push(@$plugoutlist, $class);
 
@@ -129 +129 @@
     $self->{'gs_count'} = 0;    
 
-     $self->{'keep_import_structure'} = 0; 
+    $self->{'keep_import_structure'} = 0; 
 
     return bless $self, $class;
@@ -362 +362 @@
     my $self = shift (@_);
     my ($doc_obj) = @_;
-
+    
     $doc_obj->set_lastmodified();
 
      if ($self->{'group_size'} > 1) {
-    $self->group_process ($doc_obj);
+     $self->group_process ($doc_obj);
     return;
     }
@@ -433 +433 @@
 
     # opening a new file, or document has assoicated files => directory needed
-    if (($open_new_file) || (scalar(@{$doc_obj->get_assoc_files()})>0))
-      {
+    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
@@ -444 +444 @@
             # only if opening new file
         my $output_dir = $self->get_output_dir();
-             &util::mk_all_dir ($output_dir) unless -e $output_dir;
-
+        &util::mk_all_dir ($output_dir) unless -e $output_dir;
         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)
         {
@@ -458 +457 @@
 
         $self->{'gs_filename'} = $doc_file;
-        $self->{'gs_short_filename'} = $short_doc_file;
+        $self->{'short_doc_file'} = $short_doc_file;
         $self->{'gs_OID'} = $OID;
             $self->{'gs_doc_dir'} = $doc_dir;
 
-        $self->output_xml_header(GROUPPROCESS,'Archive');
+        $self->output_xml_header('BasPlugout::GROUPPROCESS','Archive');
     }
         # Otherwise load the same archive document directory used last time
@@ -477 +476 @@
 
     # save this document
-    $doc_obj->output_section(GROUPPROCESS, $doc_obj->get_top_section());
+    $doc_obj->output_section('BasPlugout::GROUPPROCESS', $doc_obj->get_top_section());
 
     $self->{'gs_count'}++;
@@ -518 +517 @@
 
     $doc_dir .= ".dir";
-
+    &util::mk_all_dir (&util::filename_cat ($working_dir, $doc_dir));
     return $doc_dir;
 }