Changeset 23102

Timestamp:

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

Author:

davidb

Message:

Attached :utf8 encoding to GDBM pipes to prevent double encoding problem with incremental buildcol.pl

File:

• main/trunk/greenstone2/perllib/dbutil/gdbm.pm (modified) (3 diffs)

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

@@ -56 +56 @@
   if(!open($infodb_file_handle, "| $cmd"))
   {
+
       print STDERR "Error: Failed to open pipe to $cmd\n";
       print STDERR "       $!\n";
       return undef;
   }
+
+  binmode($infodb_file_handle,":utf8");
 
   return $infodb_file_handle;
@@ -90 +93 @@
   my $infodb_map = shift(@_);
 
-  open (PIPEIN, "db2txt \"$infodb_file_path\" |") || die "couldn't open pipe from db2txt \$infodb_file_path\"\n";
+  open (PIPEIN, "db2txt \"$infodb_file_path\" |") 
+      || die "couldn't open pipe from db2txt \$infodb_file_path\"\n";
+
+  binmode(PIPEIN,":utf8");
+
   my $infodb_line = "";
   my $infodb_key = "";
@@ -120 +127 @@
   my $infodb_map = shift(@_);
 
-  open (PIPEIN, "gdbmkeys \"$infodb_file_path\" |") || die "couldn't open pipe from gdbmkeys \$infodb_file_path\"\n";
+  open (PIPEIN, "gdbmkeys \"$infodb_file_path\" |") 
+      || die "couldn't open pipe from gdbmkeys \$infodb_file_path\"\n";
+
+  binmode(PIPEIN,":utf8");
+
   my $infodb_line = "";
   my $infodb_key = "";