Changeset 32542 for main/trunk/greenstone2/perllib/plugouts

Timestamp:

2018-10-25T21:17:02+13:00 (6 years ago)

Author:

ak19

Message:

Instead of the docoid being stored in the docsql-<OID>.xml filename, all filenames produced are back to being docsql.xml, but the root element Archive now contains the doc oid as attribute: <Archive docoid="oid">

Location:

main/trunk/greenstone2/perllib/plugouts

Files:

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

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

@@ -52 +52 @@
 # It's fine: the die() stmts all take place before setting up the super class' begin
 
+# TODO Q: about build_mode: how to detect removeold
 # TODO: deal with -removeold and everything? Or type out instructions for user
 
 # TODO Q: what is "group" in GreenstoneXMLPlugout?
 # TODO Q: site_name only exists for GS3. What about GS2?
+
 
 my $process_mode_list =
@@ -216 +218 @@
 }
 
-# produce files called docsql-<OID>.xml instead of doc.xml
+# Produce files called docsql.xml instead of doc.xml
 sub get_doc_xml_filename {
     my $self = shift (@_);
     my ($doc_obj) = @_;
     
-    my $doc_id = $doc_obj->get_OID();
-    my $filename = $doc_id ? "docsql-".$doc_id.".xml" : "docsql.xml";
-    return $filename;
-}
-   
+    return "docsql.xml";
+}
+
+# overriding to store doc OID as attribute of top level element: <Archive docoid="oid">
+sub output_xml_header {
+    my $self = shift (@_);
+    my ($outhandle, $doc_oid) = @_;
+
+    print $outhandle '<?xml version="1.0" encoding="utf-8" standalone="no"?>' . "\n";
+    print $outhandle "<!DOCTYPE Archive SYSTEM \"http://greenstone.org/dtd/Archive/1.0/Archive.dtd\">\n";
+    print $outhandle "<Archive docoid=\"$doc_oid\">\n";
+}
+ 
 # TODO: check arc-inf.db for whether each entry is to be deleted/indexed/reindexed/been indexed
 sub saveas {

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

@@ -190 +190 @@
     # only output the header if we have started a new doc
     if (!$self->is_group() || $self->{'new_doc_dir'}) {
-    $self->output_xml_header($outhandler);
+    $self->output_xml_header($outhandler, $doc_obj->get_OID());
     }
  
@@ -238 +238 @@
 sub output_xml_header {
     my $self = shift (@_);
-    my ($outhandle) = @_;
+    my ($outhandle, $doc_oid) = @_;
 
     print $outhandle '<?xml version="1.0" encoding="utf-8" standalone="no"?>' . "\n";