Changeset 32512 for main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm

Timestamp:

2018-10-11T19:31:44+13:00 (6 years ago)

Author:

ak19

Message:

Refactoring some existing perl code as per Dr Bainbridge's ideas on this, so that MySQLPlugout, which inherits from GreenstoneXMLPlugout, can be structured better for reading.

File:

• main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugouts/GreenstoneXMLPlugout.pm

@@ -76 +76 @@
 }
 
-sub saveas {
+sub old_unused_saveas {
     my $self = shift (@_);
     my ($doc_obj, $doc_dir) = @_;
@@ -117 +117 @@
     }
 
-    my $section_text = &docprint::get_section_xml($doc_obj,$doc_obj->get_top_section());
+    my $section_text = &docprint::get_section_xml($doc_obj);
     print $outhandler $section_text;
  
@@ -138 +138 @@
     $self->store_output_info_reference($doc_obj);
     
+}
+
+sub pre_saveas {
+    my $self = shift (@_);
+    my ($doc_obj, $doc_dir) = @_;
+    my $outhandler;
+    my $output_file;
+    if ($self->{'debug'}) {
+    $outhandler = STDOUT;
+    }
+    else {
+       
+    $self->process_assoc_files($doc_obj, $doc_dir, '');
+    $self->process_metafiles_metadata ($doc_obj);
+    
+    # open up the outhandler    
+    if ($self->is_group() && !$self->{'new_doc_dir'}) { 
+        # we already have a handle open ??
+        $outhandler = $self->{'group_outhandler'};
+    } else {
+        $output_file = &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
+        # open the new handle
+        $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);
+        }
+        
+        if ($self->is_group()) {
+        $self->{'group_outhandler'} = $outhandler;
+        }
+    }
+    } # else not debug
+    binmode($outhandler,":utf8");
+
+    # only output the header if we have started a new doc
+    if (!$self->is_group() || $self->{'new_doc_dir'}) {
+    $self->output_xml_header($outhandler);
+    }
+ 
+    return ($outhandler, $output_file);
+}
+
+sub saveas {
+    my $self = shift (@_);
+    my ($doc_obj, $doc_dir) = @_;
+
+    # pre
+    my ($outhandler, $output_file) = $self->pre_saveas(@_);
+    push(@_, $outhandler, $output_file);
+
+    # write out the doc xml file for the current document
+    my $section_text = &docprint::get_section_xml($doc_obj);
+    print $outhandler $section_text;
+
+    # post
+    $self->post_saveas(@_);
+}
+
+sub post_saveas {
+    my $self = shift (@_);    
+    my ($doc_obj, $doc_dir, $outhandler, $output_file) = @_;
+    
+    # only output the footer if we are not doing group stuff. The group file will be finished in close_group_output
+    if (!$self->is_group()) {
+    $self->output_xml_footer($outhandler);
+    }
+
+    # close off the output - in a group process situation, this will be done by close_group_output
+    if (!$self->is_group() && !$self->{'debug'}) {
+    if (defined $self->{'xslt_writer'}){     
+        $self->close_xslt_pipe(); 
+    }
+    else {
+        &FileUtils::closeFileHandle($output_file, \$outhandler) if defined $output_file;
+    }
+    }
+    $self->{'short_doc_file'} = &FileUtils::filenameConcatenate($doc_dir, "doc.xml");  
+    
+    $self->store_output_info_reference($doc_obj);    
 }