Changeset 23166

Timestamp:

2010-10-19T12:05:12+13:00 (14 years ago)

Author:

kjdon

Message:

copying code from gdbm.pm: Attached :utf8 encoding to db pipes to prevent double encoding problem with incremental buildcol.pl

Location:

main/trunk/greenstone2/perllib/dbutil

Files:

• jdbm.pm (modified) (3 diffs)
• sqlite.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/dbutil/jdbm.pm

@@ -68 +68 @@
       return undef;
   }
-
+  
+  binmode($infodb_file_handle,":utf8");
   return $infodb_file_handle;
 }
@@ -106 +107 @@
 
   open (PIPEIN, "$jdb2txt_cmd \"$infodb_file_path\" |") || die "couldn't open pipe from db2txt \$infodb_file_path\"\n";
+  binmode(PIPEIN,":utf8");
   my $infodb_line = "";
   my $infodb_key = "";
@@ -143 +145 @@
 
   open (PIPEIN, "$jdbkeys_cmd \"$infodb_file_path\" |") || die "couldn't open pipe from jdbmkeys \$infodb_file_path\"\n";
+  binmode(PIPEIN,":utf8");
   my $infodb_line = "";
   my $infodb_key = "";

main/trunk/greenstone2/perllib/dbutil/sqlite.pm

@@ -54 +54 @@
   }
 
+  binmode($infodb_handle,":utf8");
+
   print $infodb_handle "CREATE TABLE IF NOT EXISTS data (key TEXT PRIMARY KEY, value TEXT);\n";
   print $infodb_handle "CREATE TABLE IF NOT EXISTS document_metadata (id INTEGER PRIMARY KEY, docOID TEXT, element TEXT, value TEXT);\n";
@@ -99 +101 @@
   else {
 
+      binmode($infodb_handle, ":utf8");
       my $line;
       while (defined($line=<$infodb_handle>)) {