Changeset 32591 for main/trunk/greenstone2/perllib/plugouts/GreenstoneSQLPlugout.pm

Timestamp:

2018-11-09T19:01:04+13:00 (5 years ago)

Author:

ak19

Message:

1. gssql destructor DESTROY doesn't really do anything now, as DBI's destructor will ensure disconnection if not already disconnected. So we don't disconnect in gssql DESTROY, which we used to do but which would only happen on Cancel specifically as other gssql code would already disconnect on natural termination. 2. gssql no longer sets connection parameter fallbacks for those that have fallbacks, since the defaults for these parameters are set by the GS SQL Plugs' configuration options. 3. No need to (html) escape meta/full text when storing in DB or unescape when reading it out of DB, since DB is like a regular text file: can just put text in there. It's only html/xml files where text needs to be stored escaped. 4. Having committed doc.pm::add_utf8_textREF() method in previous commit, GreenstoneSQLPlugin can now pass the fulltxt by reference using this method when constructing the doc_obj from what's read in from the DB.

File:

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

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

@@ -41 +41 @@
 # + TODO: SIGTERM rollback and disconnect?
 # + TODO Q: what about verbosity for debugging, instead of current situation of printing out upon debug set at the expense of writing to db
-#X TODO Q: introduced site param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes". No longer a param
-# Did I do the pass by ref in docprint's escape and unescape textref functions correctly, and how they're called here?
+#+ TODO Q: introduced site param to plugins and plugouts. Did I do it right? And should they have hiddengli = "yes". No longer a param
+# !!!! Did I do the pass by ref in docprint's escape and unescape textref functions correctly, and how they're called here?
 #   Any more optimisation I can do around this?
 
@@ -88 +88 @@
       'type' => "enum",
       'list' => $rollback_on_cancel_list,
-      'deft' => "false", # TODO Q: what's the better default? If "true", any memory concerns?
+      'deft' => "false", # better default than true
       'reqd' => "no",
       'hiddengli' => "no"},
@@ -105 +105 @@
       'type' => "string",
       'deft' => "",
-      'reqd' => "no"}, # pwd required? NO.
+      'reqd' => "no"}, # pwd not required: can create mysql accounts without pwd
     { 'name' => "db_host", 
       'desc' => "{GreenstoneSQLPlug.db_host}",
       'type' => "string",
-      'deft' => "127.0.0.1",
+      'deft' => "127.0.0.1", # localhost doesn't work for us, but 127.0.0.1 works. See gsmysql.pm
       'reqd' => "yes"},
     { 'name' => "db_port", 
@@ -347 +347 @@
         # TODO: does it need to be stored escaped, as it requires unescaping when read back in
         # from db (unlike for reading back in from doc.xml)
-        my $escaped_meta_value = &docprint::escape_text($data->[1]);
+
+        # Treat db like a text file instead of an html/xml file: don't need to escape text
+        # going into it
+        #my $escaped_meta_value = &docprint::escape_text($data->[1]);
+        my $meta_value = $data->[1];
         
         # Write out the current section's meta to collection db's METADATA table        
@@ -356 +360 @@
         # OR if debugging, then it will print the SQL insert statement but not execute it
         
-        $gs_sql->insert_row_into_metadata_table($doc_oid, $section_name, $meta_name, $escaped_meta_value, $self->{'debug'});
+        $gs_sql->insert_row_into_metadata_table($doc_oid, $section_name, $meta_name, $meta_value, $self->{'debug'});
     }
     }
@@ -362 +366 @@
     
     if($proc_mode eq "all" || $proc_mode eq "text_only" ) {
-    
-    my $section_textref = &docprint::escape_textref(\$section_ptr->{'text'});
+
+    # See above, no need to html-escape for db
+    my $section_text = $section_ptr->{'text'}; #&docprint::escape_textref(\$section_ptr->{'text'});
     
     # fulltxt column can be SQL NULL. undef value gets written out as NULL:
@@ -369 +374 @@
     # The following will do the SQL insertion
     # or if debug, the following will print the SQL insert stmt without executing it
-    $gs_sql->insert_row_into_fulltxt_table($doc_oid, $section_name, $section_textref, $self->{'debug'});
+    $gs_sql->insert_row_into_fulltxt_table($doc_oid, $section_name, \$section_text, $self->{'debug'});
     
     }