Changeset 32531 for main/trunk/greenstone2/perllib

Timestamp:

2018-10-23T15:33:31+13:00 (5 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.

Location:

main/trunk/greenstone2/perllib

Files:

• gssql.pm (modified) (3 diffs)
• plugouts/GreenstoneSQLPlugout.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/gssql.pm

@@ -63 +63 @@
     # the GSDL_LIBRARY_URL env var is useful when running cmdline buildcol.pl in the linux package manager versions of GS3
     
-    # https://stackoverflow.com/questions/7083453/copying-a-hashref-in-perl
-    #my $self = {'db_driver' => $params_map{'db_driver'},
-    #...
-    #};
-    # Making a shallow copy    
-    my $self = $params_map;
+    # https://stackoverflow.com/questions/7083453/copying-a-hashref-in-perl 
+    # Making a shallow copy works, and can handle unknown params:
+    #my $self = $params_map;
+
+    # but being explicit for class params needed for MySQL:
+    my $self = {
+    'collection_name' => $params_map->{'collection_name'},
+    'db_encoding' => $params_map->{'db_encoding'}
+    };
+
+    # (My)SQL doesn't like tables with - (hyphens) in their names
+    my $coll_name = $params_map->{'collection_name'};
+    $coll_name =~ s/-/_/g;
+    $self->{'tablename_prefix'} = $coll_name;
 
     return bless($self, $class);
@@ -350 +358 @@
 sub get_metadata_table_name {
     my $self= shift (@_);
-    my $table_name = $self->{'collection_name'} . "_metadata";
+    my $table_name = $self->{'tablename_prefix'} . "_metadata";
     return $table_name;
 }
@@ -358 +366 @@
 sub get_fulltext_table_name {
     my $self= shift (@_);
-    my $table_name = $self->{'collection_name'} . "_fulltxt";
+    my $table_name = $self->{'tablename_prefix'} . "_fulltxt";
     return $table_name;
 }
+
 
 # I can get my version of table_exists to work, but it's not so ideal

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);
     }
 }