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

Timestamp:

2013-04-15T18:49:36+12:00 (11 years ago)

Author:

ak19

Message:

A couple of the index_meta functions used gdbm methods instead of calling the more generic db operations via dbutil. Fixed to go through dbutil instead and tested.

File:

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

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

@@ -167 +167 @@
     my $gsdlhome  = $self->{'gsdlhome'};
     my $infodbtype = $self->{'infodbtype'};
-    
+    
     # live metadata gets/saves value scoped (prefixed) by the current usename 
     # so (for now) let's not bother to enforce authentication
@@ -2817 +2817 @@
     $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);
-
+    #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);
+    #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);
+
     if ($status != 0) {
     my $mess = "Failed to set metadata key: $docid\n";
     
     $mess .= "PATH: $ENV{'PATH'}\n";
-    $mess .= "cmd = $cmd\n";
+    #$mess .= "cmd = $cmd\n";
     $mess .= "Exit status: $status\n";
     $mess .= "System Error Message: $!\n";
@@ -3019 +3023 @@
     }
 
+    ## The following code assumes gdbm
     # Generate the record string
-    my $serialized_doc_rec = &dbutil::convert_infodb_hash_to_string($doc_rec);
-
+    #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);
+    #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);
+
     if ($status != 0) {
         # Catch error if gdbmget failed
@@ -3030 +3038 @@
     
     $mess .= "PATH: $ENV{'PATH'}\n";
-    $mess .= "cmd = $cmd\n";
+    #$mess .= "cmd = $cmd\n";
     $mess .= "Exit status: $status\n";
     $mess .= "System Error Message: $!\n";