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

Timestamp:

2018-10-24T20:11:33+13:00 (6 years ago)

Author:

ak19

Message:

First commit to do with reading back in from the SQL DB. This commit introduces the new GreenstoneSQLPlugin for this purpose, which should ideally only be used during buildcol (but its init(), deinit() and read() methods are also called on import.pl). The new plugin works with GreenstoneSQLPlugout which wrote meta and txt to the SQL DB. Lots of TODOs and questions still here, some debug statements too. Also have to run some decisions by Dr Bainbridge. There are many hardcoded values which still have to be parameterised (not always completely sure how) and still have to test the 2 cases of sending just meta and just fulltxt to db. Next commit will tidy some things up.

File:

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

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

@@ -94 +94 @@
         $outhandler = $self->{'group_outhandler'};
     } else {
-        $output_file = $self->get_output_file($doc_dir); #&FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
+        $output_file = &FileUtils::filenameConcatenate(
+        $self->{'output_dir'}, $doc_dir, $self->get_doc_xml_filename($doc_obj));
         # open the new handle
         $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
@@ -134 +135 @@
     }
     }
-    $self->{'short_doc_file'} = $self->get_short_doc_file($doc_dir); #&FileUtils::filenameConcatenate($doc_dir, "doc.xml");  
+    $self->{'short_doc_file'} = &FileUtils::filenameConcatenate(
+    $doc_dir, $self->get_doc_xml_filename($doc_obj));  
     
     $self->store_output_info_reference($doc_obj);
@@ -142 +144 @@
 # can be overridden in subclasses, for instance by GreenstoneSQLPlugout, to produce a different filename
 # like docsql.xml
-sub get_short_doc_file {
-    my $self = shift (@_);
-    my ($doc_dir) = @_;
-    return &FileUtils::filenameConcatenate($doc_dir, "doc.xml");
-}
-
-# can be overridden in subclasses, for instance by GreenstoneSQLPlugout, to produce a different filename
-# like docsql.xml
-sub get_output_file {
-    my $self = shift (@_);
-    my ($doc_dir) = @_;
-    return &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
+sub get_doc_xml_filename {
+    my $self = shift (@_);
+    my ($doc_obj) = @_;
+    return "doc.xml";
 }
 
@@ -175 +169 @@
         $outhandler = $self->{'group_outhandler'};
     } else {
-        $output_file = $self->get_output_file($doc_dir); #&FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
+        $output_file = $output_file = &FileUtils::filenameConcatenate(
+        $self->{'output_dir'}, $doc_dir, $self->get_doc_xml_filename($doc_obj));
         # open the new handle
         $self->open_xslt_pipe($output_file, $self->{'xslt_file'});
@@ -235 +230 @@
     }
     }
-    $self->{'short_doc_file'} = $self->get_short_doc_file($doc_dir); #&FileUtils::filenameConcatenate($doc_dir, "doc.xml");  
+    $self->{'short_doc_file'} = &FileUtils::filenameConcatenate(
+    $doc_dir, $self->get_doc_xml_filename($doc_obj));
     
     $self->store_output_info_reference($doc_obj);