Changeset 13172 for trunk/gsdl/perllib/plugouts/GAPlugout.pm

Timestamp:

2006-10-27T13:41:01+13:00 (18 years ago)

Author:

kjdon

Message:

Moved all printing stuff out of doc.pm.
docprint now prints a GA representation of a doc obj - use &docprint::get_section_xml instead of $doc_obj->buffer_section_xml or $doc_obj->output_section.
Most of the code has been moved into plugouts, except for the bit thats gone to docprint.pm.

File:

• trunk/gsdl/perllib/plugouts/GAPlugout.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugouts/GAPlugout.pm

@@ -28 +28 @@
 use strict;
 no strict 'refs';
+no strict 'subs';
 
 eval {require bytes};
 use util;
 use BasPlugout;
+use docprint;
 
 sub BEGIN {
@@ -61 +63 @@
     my ($doc_obj,$doc_dir) = @_;
 
-    my $output_dir = $self->get_output_dir();
-    &util::mk_all_dir ($output_dir) unless -e $output_dir;
-
-    my $working_dir = &util::filename_cat ($output_dir, $doc_dir);    
-    &util::mk_all_dir ($working_dir) unless -e $working_dir;
-
-    $self->process_assoc_files ($doc_obj, $doc_dir, '');
-   
-    my $output_file = util::filename_cat ($working_dir, "doc.xml");
-
-    $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
-
-    my $outhandler; 
-
-    if (defined $self->{'xslt_writer'}){
-       $outhandler = $self->{'xslt_writer'};
+    my $outhandler;
+    if ($self->{'debug'}) {
+    $outhandler = STDOUT;
+    # can we do the xslt and still do debug mode?
+    } 
+    else {
+    my $output_dir = $self->get_output_dir();
+    &util::mk_all_dir ($output_dir) unless -e $output_dir;
+    
+    my $working_dir = &util::filename_cat ($output_dir, $doc_dir);    
+    &util::mk_all_dir ($working_dir) unless -e $working_dir;
+    
+    $self->process_assoc_files ($doc_obj, $doc_dir, '');
+    
+    my $output_file = util::filename_cat ($working_dir, "doc.xml");
+    
+    $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
+    
+    
+    if (defined $self->{'xslt_writer'}){
+        $outhandler = $self->{'xslt_writer'};
+    }
+    else{
+        $outhandler = $self->get_output_handler($output_file);
+    }
     }
-    else{
-       $outhandler = $self->get_output_handler($output_file);
-     }
-   
+    
     $self->output_xml_header($outhandler,"Archive");
-    $doc_obj->output_section($outhandler,$doc_obj->get_top_section());
+    my $section_output = &docprint::get_section_xml($doc_obj, $doc_obj->get_top_section());
+    print $outhandler $section_output;
     $self->output_xml_footer($outhandler,"Archive");
 
-    if (defined $self->{'xslt_writer'}){     
-    $self->close_xslt_pipe(); 
+    if (!$self->{'debug'}) {
+    if (defined $self->{'xslt_writer'}){     
+        $self->close_xslt_pipe(); 
+    }
+    else {
+        close($outhandler);
+    }
+    
+    $self->{'short_doc_file'} = util::filename_cat ($doc_dir, "doc.xml");  
+    
+    $self->store_output_info_reference($doc_obj);
     }
-    else{
-    close($outhandler);
-    }
+}
 
-  $self->{'short_doc_file'} = util::filename_cat ($doc_dir, "doc.xml");  
-     
-  $self->store_output_info_reference($doc_obj);
-}
+
 
 1;