Changeset 23758 for main/trunk/greenstone2/perllib

Timestamp:

2011-03-02T16:13:39+13:00 (13 years ago)

Author:

davidb

Message:

Changed to using 'txt2db' to set a single entry so it is not effected by length of data that needs to be pushed through the command line of 'gdbmset' or is effected by the issue of quotes in the data that need to be escaped

File:

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

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

@@ -158 +158 @@
 
 
-sub set_infodb_entry
+sub set_infodb_entry_OLD
 {
     my $infodb_file_path = shift(@_);
@@ -164 +164 @@
     my $infodb_map = shift(@_);
   
-    # Protect metadtaa values that go inside quotes for gdbmset
+    # Protect metadata values that go inside quotes for gdbmset
     foreach my $k (keys %$infodb_map) {
       my @escaped_v = ();
@@ -184 +184 @@
     # Generate the record string
     my $serialized_infodb_map = &dbutil::convert_infodb_hash_to_string($infodb_map);
-    ## print STDERR "**** ser dr\n$serialized_infodb_map\n\n\n";
+##    print STDERR "**** ser dr\n$serialized_infodb_map\n\n\n";
 
     # Store it into GDBM
     my $cmd = "gdbmset \"$infodb_file_path\" \"$infodb_key\" \"$serialized_infodb_map\"";
     my $status = system($cmd);
+
+    return $status;
   
-    return $status;
+}
+
+
+
+sub set_infodb_entry
+{
+    my $infodb_file_path = shift(@_);
+    my $infodb_key = shift(@_);
+    my $infodb_map = shift(@_);
   
+    # HTML escape anything that is not part of the "contains" metadata value
+    foreach my $k (keys %$infodb_map) {
+      my @escaped_v = ();
+      foreach my $v (@{$infodb_map->{$k}}) {
+        if ($k eq "contains") {
+          push(@escaped_v, $v);
+        }
+        else {
+          my $ev = &ghtml::unescape_html($v);
+          push(@escaped_v, $ev);
+        }
+      }
+      $infodb_map->{$k} = \@escaped_v;
+    }
+    
+    # Generate the record string
+    my $serialized_infodb_map = &dbutil::convert_infodb_hash_to_string($infodb_map);
+###    print STDERR "**** ser dr\n$serialized_infodb_map\n\n\n";
+
+    # Store it into GDBM using 'txt2db -append' which despite its name
+    # actually replaces the record if it already exists
+
+    my $cmd = "txt2db -append \"$infodb_file_path\"";
+
+    my $status = undef;
+    if(!open(GOUT, "| $cmd"))
+    {
+    print STDERR "Error: gdbm::set_infodb_entry() failed to open pipe to: $cmd\n";
+    print STDERR "       $!\n";
+    $status = -1;
+    }
+    else {
+    binmode(GOUT,":utf8");
+    
+    print GOUT "[$infodb_key]\n";
+    print GOUT "$serialized_infodb_map\n";
+
+    close(GOUT);
+    $status = 0; # as in exit status of cmd OK
+    }
+
+    return $status;  
 }