Changeset 32537 for main

Timestamp:

2018-10-24T20:13:22+13:00 (5 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.

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/GreenstoneSQLPlugin.pm (modified) (2 diffs)
• plugouts/GreenstoneSQLPlugout.pm (modified) (1 diff)
• strings.properties (modified) (1 diff)

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

@@ -71 +71 @@
 my $process_mode_list =
     [ { 'name' => "meta_only",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.meta_only}" },      
+        'desc' => "{GreenstoneSQLPlug.process_mode.meta_only}" },      
       { 'name' => "text_only",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.text_only}" },
+        'desc' => "{GreenstoneSQLPlug.process_mode.text_only}" },
       { 'name' => "all",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.all}" } ];
+        'desc' => "{GreenstoneSQLPlug.process_mode.all}" } ];
 
 my $arguments =
@@ -84 +84 @@
     'reqd' => "no" },
        { 'name' => "process_mode", 
-     'desc' => "{GreenstoneSQLPlugout.process_mode}",
+     'desc' => "{GreenstoneSQLPlug.process_mode}",
      'type' => "enum",
      'list' => $process_mode_list,

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

@@ -58 +58 @@
 my $process_mode_list =
     [ { 'name' => "meta_only",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.meta_only}" },      
+        'desc' => "{GreenstoneSQLPlug.process_mode.meta_only}" },      
       { 'name' => "text_only",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.text_only}" },
+        'desc' => "{GreenstoneSQLPlug.process_mode.text_only}" },
       { 'name' => "all",
-        'desc' => "{GreenstoneSQLPlugout.process_mode.all}" } ];
+        'desc' => "{GreenstoneSQLPlug.process_mode.all}" } ];
 
 my $arguments = [ 
        { 'name' => "process_mode", 
-     'desc' => "{GreenstoneSQLPlugout.process_mode}",
+     'desc' => "{GreenstoneSQLPlug.process_mode}",
      'type' => "enum",
      'list' => $process_mode_list,

main/trunk/greenstone2/perllib/strings.properties

@@ -1446 +1446 @@
 
 GreenstoneSQLPlugout.desc:Output metadata and/or full text to a MySQL database instead of doc.xml.
-GreenstoneSQLPlugout.process_mode:Setting determines whether full text and/or metadata will be output to a MySQL database instead of to doc.xml during import.
-GreenstoneSQLPlugout.process_mode.all:Import stage outputs the full text and metadata to a MySQL database instead of to doc.xml.
-GreenstoneSQLPlugout.process_mode.meta_only:Import stage outputs the metadata to a MySQL database and any text to doc.xml.
-GreenstoneSQLPlugout.process_mode.text_only:Import stage outputs the full text to a MySQL database and any metadata to doc.xml.
+
+# 
+# GreenstoneSQLPlug strings are shared by both GreenstoneSQLPlugout and GreenstoneSQLPlugin
+#
+GreenstoneSQLPlug.process_mode:Setting determines whether full text and/or metadata will be output to a MySQL database instead of to doc.xml during import.
+GreenstoneSQLPlug.process_mode.all:Import stage outputs the full text and metadata to a MySQL database instead of to doc.xml.
+GreenstoneSQLPlug.process_mode.meta_only:Import stage outputs the metadata to a MySQL database and any text to doc.xml.
+GreenstoneSQLPlug.process_mode.text_only:Import stage outputs the full text to a MySQL database and any metadata to doc.xml.