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

Timestamp:

2018-10-31T19:48:18+13:00 (5 years ago)

Author:

ak19

Message:

Removing db_encoding as parameters to GreenstoneSQLPlugout and GreenstoneSQLPlugin: as doc.xml is always in utf8, the same contents stored in the MySQL db should be too.

File:

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

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

@@ -146 +146 @@
     'deft' => "127.0.0.1",
     'reqd' => "yes"},
-      { 'name' => "db_encoding", 
-    'desc' => "{GreenstoneSQLPlug.db_encoding}",
-    'type' => "string",
-    'deft' => "utf8",
-    'reqd' => "yes"}
     ];
 
@@ -373 +368 @@
 #    print STDERR "@@@@ user: " . $self->{'db_client_user'} . "\n";
 #    print STDERR "@@@@ db_host: " . $self->{'db_host'} . "\n";
-#    print STDERR "@@@@ db_enc: " . $self->{'db_encoding'} . "\n";
 #    print STDERR "@@@@ db_driver: " . $self->{'db_driver'} . "\n";
     ####################
-    
+
+    # create gssql object.
+    # collection name will be used for naming tables (site name will be used for naming database)
     my $gs_sql = new gssql({
-    'collection_name' => $ENV{'GSDLCOLLECTION'},    
-    'db_encoding' => $self->{'db_encoding'}
-               }
-    );
+    'collection_name' => $ENV{'GSDLCOLLECTION'}
+               });
 
     # try connecting to the mysql db, if that fails it will die