Changeset 32536 for main/trunk/greenstone2/perllib/gssql.pm

Timestamp:

2018-10-24T20:11:33+13:00 (6 years ago)

Author:

ak19

Message:

First commit to do with reading back in from the SQL DB. This commit introduces the new GreenstoneSQLPlugin for this purpose, which should ideally only be used during buildcol (but its init(), deinit() and read() methods are also called on import.pl). The new plugin works with GreenstoneSQLPlugout which wrote meta and txt to the SQL DB. Lots of TODOs and questions still here, some debug statements too. Also have to run some decisions by Dr Bainbridge. There are many hardcoded values which still have to be parameterised (not always completely sure how) and still have to test the 2 cases of sending just meta and just fulltxt to db. Next commit will tidy some things up.

File:

• main/trunk/greenstone2/perllib/gssql.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/gssql.pm

@@ -31 +31 @@
 no strict 'subs';
 
-use GreenstoneXMLPlugout;
-use docprint;
-
-use DBI; # the central package for this plugout
+use DBI; # the central package for this module used by GreenstoneSQL Plugout and Plugin
 
 # Need params_map keys:
@@ -151 +148 @@
 }
 
+# will attempt to load the specified db and the <coll>_metadata and <coll>_fulltxt for this
+# collection, or create any of these (db, tables) that don't yet exist. At the end
+# it will have loaded the requested database (in MySQL: "use <db>;")
 sub load_db_and_tables {
     my $self= shift (@_);
@@ -205 +205 @@
 }
 
-# this will terminate if the db does not exist
-# it will not attempt to create the requested db (nor its tables)
-# The upcoming GreenstoneSQLPlugin can use this.
+# GreenstoneSQLPlugin calls this method to load an existing db.
+# This will terminate if the db does not exist. Unlike load_db_and_tables() above, used by
+# GreenstoneSQLPlugout, this method will not attempt to create the requested db (nor its tables)
 sub use_db {
     my $self= shift (@_);
@@ -370 +370 @@
 }
 
+# returns database handle, dbh
+sub get_db_handle {
+    my $self= shift (@_);
+    return $self->{'db_handle'};
+}
+
 
 # I can get my version of table_exists to work, but it's not so ideal