Changeset 32534 for main/trunk/greenstone2/perllib

Timestamp:

2018-10-23T18:51:35+13:00 (6 years ago)

Author:

ak19

Message:

Related to previous commit: had previously made one of the changes to defunct version of a method instead of its newer active version. Previous commit message: GS SQL Plugout now writes its docobj contents (if any) and structure into docsql.xml instead of doc.xml

File:

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

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

@@ -94 +94 @@
         $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'});
@@ -235 +235 @@
     }
     }
-    $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);