Changeset 27222 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2013-04-18T16:05:33+12:00 (11 years ago)

Author:

ak19

Message:

Found a bug in a recent change to remove_index_meta where the doublequotes in the 'contains' field of the gdb index was being escaped with a backslash. Backslashes were accumulating in this field each time remove_index_meta was run. Dr Bainbridge fixed this after identifying that there was a for loop specifically escaping the double quotes for the gdbmset operation that was previously used to perform the remove index meta action. The escaping is not necessary for the dbutil::set_infodb_entry method that's now being called instead.

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (6 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -2769 +2769 @@
     my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $infodb_file_path, $docid);
 
-    # Basically loop through and unescape_html the values
-    foreach my $k (keys %$doc_rec) {
-    my @escaped_v = ();
-    foreach my $v (@{$doc_rec->{$k}}) {
-        if ($k eq "contains") {
-        # protect quotes in ".2;".3 etc
-        $v =~ s/\"/\\\"/g;
-        push(@escaped_v, $v);
-        }
-        else {
-        my $ev = &ghtml::unescape_html($v);
-        $ev =~ s/\"/\\\"/g;
-        push(@escaped_v, $ev);
-        }
-    }
-    $doc_rec->{$k} = \@escaped_v;
-    }
-
     # Check to make sure the key does exist
     if (!defined ($doc_rec->{$metaname})) {
@@ -2817 +2799 @@
     $doc_rec->{$metaname} = $filtered_metadata;
 
-    ## The following code assumes gdbm
-    # Turn the record back to string
-    #my $serialized_doc_rec = &dbutil::convert_infodb_hash_to_string($doc_rec);
-    # Store it back to the database
-    #my $cmd = "gdbmset \"$infodb_file_path\" \"$docid\" \"$serialized_doc_rec\"";
-    #my $status = system($cmd);
-
     ## Use the dbutil set_entry method instead of assuming the database is gdbm
     my $status = &dbutil::set_infodb_entry($infodbtype, $infodb_file_path, $docid, $doc_rec);
@@ -2831 +2806 @@
     
     $mess .= "PATH: $ENV{'PATH'}\n";
-    #$mess .= "cmd = $cmd\n";
     $mess .= "Exit status: $status\n";
     $mess .= "System Error Message: $!\n";
@@ -2990 +2964 @@
     # Read the docid entry
     my $doc_rec = &dbutil::read_infodb_entry($infodbtype, $infodb_file_path, $docid);
-   
-    foreach my $k (keys %$doc_rec) {
-    my @escaped_v = ();
-    foreach my $v (@{$doc_rec->{$k}}) {
-        if ($k eq "contains") {
-        # protect quotes in ".2;".3 etc
-        $v =~ s/\"/\\\"/g;
-        push(@escaped_v, $v);
-        }
-        else {
-        my $ev = &ghtml::unescape_html($v);
-        $ev =~ s/\"/\\\"/g;
-        push(@escaped_v, $ev);
-        }
-    }
-    $doc_rec->{$k} = \@escaped_v;
-    }
 
     # Protect the quotes
@@ -3023 +2980 @@
     }
 
-    ## The following code assumes gdbm
-    # Generate the record string
-    #my $serialized_doc_rec = &dbutil::convert_infodb_hash_to_string($doc_rec);
-    # Store it into GDBM
-    #my $cmd = "gdbmset \"$infodb_file_path\" \"$docid\" \"$serialized_doc_rec\"";
-    #my $status = system($cmd);
-
     ## Use the dbutil set_entry method instead of assuming the database is gdbm
     my $status = &dbutil::set_infodb_entry($infodbtype, $infodb_file_path, $docid, $doc_rec);
@@ -3038 +2988 @@
     
     $mess .= "PATH: $ENV{'PATH'}\n";
-    #$mess .= "cmd = $cmd\n";
     $mess .= "Exit status: $status\n";
     $mess .= "System Error Message: $!\n";