Changeset 32575 for main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

Timestamp:

2018-11-05T20:51:24+13:00 (5 years ago)

Author:

ak19

Message:

1. gssql now does fetching all rows internally upon select. With this the statement and database handles have been hidden away in the gssql.pm class. Hopefully this makes the GreenstoneSQLPlugin and GreenstoneSQLPlugout code easier to read and follow. 2. new method docprint::unescape_textref() takes a textref and returns a ref to the modified text. This method is now used internally by the older docprint::unescape_text() variant of the method. unescape_textref(), like the recently added escape_textref(), should hopefully do what I think it does. Then it can be used to pass large strings, like fulltext in particular, by ref instead of value.

File:

• main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/GreenstoneSQLPlugin.pm

@@ -308 +308 @@
     # read in meta for the collection (i.e. select * from <col>_metadata table
     
-    my $sth = $gs_sql->select_from_metatable_matching_docid($oid);
-    print $outhandle "### SQL select stmt: ".$sth->{'Statement'}."\n"
-        if $self->{'verbosity'} > 2;
+    my $records = $gs_sql->select_from_metatable_matching_docid($oid, $outhandle);
     
     print $outhandle "----------SQL DB contains meta-----------\n" if $self->{'verbosity'} > 2;
     # https://www.effectiveperlprogramming.com/2010/07/set-custom-dbi-error-handlers/
-    while( my @row = $sth->fetchrow_array() ) {     
-        #print $outhandle "row: @row\n";
-        my ($primary_key, $did, $sid, $metaname, $metaval) = @row;
+
+    foreach my $row (@$records) {
+        #print $outhandle "row: @$row\n";
+        my ($primary_key, $did, $sid, $metaname, $metaval) = @$row;
         
         # get rid of the artificial "root" introduced in section id when saving to sql db
@@ -337 +336 @@
     
     
-    my $sth = $gs_sql->select_from_texttable_matching_docid($oid);
-    print $outhandle "### stmt: ".$sth->{'Statement'}."\n" if $self->{'verbosity'} > 2;
+    my $records = $gs_sql->select_from_texttable_matching_docid($oid, $outhandle);
+    
     
     print $outhandle "----------\nSQL DB contains txt entries for-----------\n"
         if $self->{'verbosity'} > 2;
-    while( my ($primary_key, $did, $sid, $text) = $sth->fetchrow_array() ) {       
+
+    foreach my $row (@$records) {
+        my ($primary_key, $did, $sid, $text) = @$row;
         
         # get rid of the artificial "root" introduced in section id when saving to sql db
@@ -352 +353 @@
         # TODO - pass by ref?
         # TODO: we accessed the db in utf8 mode, so, we can call doc_obj->add_utf8_text directly:
-        $doc_obj->add_utf8_text($sid, &docprint::unescape_text($text));
+        my $textref = &docprint::unescape_textref(\$text);
+        $doc_obj->add_utf8_text($sid, $$textref);
     }   
     print $outhandle "----------FIN READING DOC's TXT FROM SQL DB------------\n"