Changeset 32533 for main/trunk/greenstone2/perllib

Timestamp:

2018-10-23T17:27:36+13:00 (5 years ago)

Author:

ak19

Message:

GS SQL Plugout now writes its docobj contents (if any) and structure into docsql.xml instead of doc.xml

Location:

main/trunk/greenstone2/perllib/plugouts

Files:

• GreenstoneSQLPlugout.pm (modified) (3 diffs)
• GreenstoneXMLPlugout.pm (modified) (2 diffs)

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

@@ -185 +185 @@
 }
  
+# produce files called docsql.xml instead of doc.xml
+sub get_short_doc_file {
+    my $self = shift (@_);
+    my ($doc_dir) = @_;
+    return &FileUtils::filenameConcatenate($doc_dir, "docsql.xml");
+}
+
+# produce files called docsql.xml instead of doc.xml
+sub get_output_file {
+    my $self = shift (@_);
+    my ($doc_dir) = @_;
+    return &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "docsql.xml");
+}
    
 # TODO: check arc-inf.db for whether each entry is to be deleted/indexed/reindexed/been indexed
@@ -290 +303 @@
         }
         else {
-        
-        $metadata_table_sth->execute($doc_oid, $section_name, $meta_name, $escaped_meta_value) || warn ("Unable to write metadata row to db:\n\tOID $doc_oid, section $section_name,\n\tmeta name: $meta_name, val: $escaped_meta_value");
+        
+        $metadata_table_sth->execute($doc_oid, $section_name, $meta_name, $escaped_meta_value)
+            || warn ("Unable to write metadata row to db:\n\tOID $doc_oid, section $section_name,\n\tmeta name: $meta_name, val: $escaped_meta_value");
         # Execution failure will print out info anyway: since db connection sets PrintError
         }
@@ -311 +325 @@
         
         # Write out the current section's text to collection db's FULLTeXT table
-        $fulltxt_table_sth->execute($doc_oid, $section_name, $section_text) || warn ("Unable to write fulltxt row to db for row:\n\tOID $doc_oid, section $section_name");
+        $fulltxt_table_sth->execute($doc_oid, $section_name, $section_text)
+        || warn ("Unable to write fulltxt row to db for row:\n\tOID $doc_oid, section $section_name");
         # Execution failure will print out info anyway: since db connection sets PrintError
     }

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

@@ -134 +134 @@
     }
     }
-    $self->{'short_doc_file'} = &FileUtils::filenameConcatenate($doc_dir, "doc.xml");  
+    $self->{'short_doc_file'} = $self->get_short_doc_file($doc_dir); #&FileUtils::filenameConcatenate($doc_dir, "doc.xml");  
     
     $self->store_output_info_reference($doc_obj);
     
+}
+
+# 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");
 }
 
@@ -159 +175 @@
         $outhandler = $self->{'group_outhandler'};
     } else {
-        $output_file = &FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
+        $output_file = $self->get_output_file($doc_dir); #&FileUtils::filenameConcatenate($self->{'output_dir'}, $doc_dir, "doc.xml");
         # open the new handle
         $self->open_xslt_pipe($output_file, $self->{'xslt_file'});