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

Timestamp:

2018-10-23T15:33:31+13:00 (6 years ago)

Author:

ak19

Message:

1. bugfix to GS SQLPlugout: recursive call didn't go through self variable, noticed only when processing a doc with structure (subsections). 2. Being more explicit about the params passed to gssql.pm constructor. 3. MySQL didn't let me create a table with hyphens in the tablename. So collection names that contain hyphens need to first be adjusted for use in table names.

File:

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

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

@@ -245 +245 @@
     my $self = shift (@_);
     my ($doc_obj) = @_;
+    my $doc_oid = $doc_obj->get_OID(); # this method processes a single doc at a time, so it uses the same OID throughout
     my $root_section = $doc_obj->get_top_section();
-    my $doc_oid = $doc_obj->get_OID(); # we're processing a single doc at a time, so single OID
 
     # load the prepared INSERT statement handles for both tables (can be undef for any table depending on whether meta_only or txt_only are set)
@@ -269 +269 @@
 
     my $debug_out = $self->{'debug_outhandle'};
-    print STDERR "#### Meta stmt: " . $metadata_table_sth->{'Statement'} . "\n";
-    print STDERR "#### Full stmt: " . $fulltxt_table_sth->{'Statement'} . "\n";
+#    print STDERR "#### Meta stmt: " . $metadata_table_sth->{'Statement'} . "\n";
+#    print STDERR "#### Full stmt: " . $fulltxt_table_sth->{'Statement'} . "\n";
     
     #my $proc_mode = $self->{'process_mode'};
@@ -318 +318 @@
     # output all subsections: RECURSIVE CALL
     foreach my $subsection (@{$section_ptr->{'subsection_order'}}) {
-    &recursive_write_meta_and_text($doc_obj, $doc_oid, "$section.$subsection", $metadata_table_sth, $fulltxt_table_sth);
+    $self->recursive_write_meta_and_text($doc_obj, $doc_oid, "$section.$subsection", $metadata_table_sth, $fulltxt_table_sth);
     }
 }