Changeset 32559 for main/trunk/greenstone2/perllib/gssql.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/gssql.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/gssql.pm

@@ -67 +67 @@
     my $self = {
     'collection_name' => $params_map->{'collection_name'},
-    'db_encoding' => $params_map->{'db_encoding'}
     };
 
@@ -75 +74 @@
     $self->{'tablename_prefix'} = $coll_name;
 
+    # The db_encoding option is presently not passed in to this constructor as parameter.
+    # Placed here to indicate it's sort of optional.
+    # Since docxml are all in utf8, the contents of the GS SQL database should be too,
+    # So making utf8 the hidden default at present.
+    $self->{'db_encoding'} = $params_map->{'db_encoding'} || "utf8";
+    
     return bless($self, $class);
 }
@@ -110 +115 @@
     my $self= shift (@_);
     my ($params_map) = @_;
-    #my $db_enc = $self->{'db_encoding'} || "utf8";
-    my $db_enc = "utf8mb4";
+    # For proper utf8 support in MySQL, encoding should be 'utf8mb4' as 'utf8' is insufficient
+    my $db_enc = "utf8mb4" if $self->{'db_encoding'} eq "utf8";
 
     # these are the params for connecting to MySQL
@@ -130 +135 @@
     print STDERR " - hostname $db_host; username: $db_user";
     print STDERR "; and the password provided" if $db_pwd;
-    print STDERR "Assuming the mysql server has been started with --character_set_server=utf8mb4" if $db_driver eq "mysql";
+    print STDERR "\nAssuming the mysql server has been started with: --character_set_server=utf8mb4\n" if $db_driver eq "mysql";
     
     my $dbh = DBI->connect("$connect_str", $db_user, $db_pwd,