Changeset 21554 for main

Timestamp:

2010-01-21T14:26:37+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed calls to GDBMUtils::gdbmRecordToHash() to dbutil::read_infodb_entry() + dbutil::convert_infodb_string_to_hash(). Part of removing GDBMUtils.pm and making the code less GDBM-specific.

Location:

main/trunk/greenstone2/perllib

Files:

• cgiactions/metadataaction.pm (modified) (5 diffs)
• inexport.pm (modified) (2 diffs)
• plugin.pm (modified) (1 diff)

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

@@ -182 +182 @@
     my $gdbm_db = &util::filename_cat($gdbm_directory,"$collect_tail.gdb");
 
-    my $doc_rec = GDBMUtils::gdbmRecordToHash($gdbm_db,$docid);
+    my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
     foreach my $k (keys %$doc_rec) {
     my @escaped_v = ();
@@ -298 +299 @@
     my $gdbm_db = &util::filename_cat($gdbm_directory,"$collect_tail.gdb");
 
-    my $doc_rec = GDBMUtils::gdbmRecordToHash($gdbm_db,$docid);
+    my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
     foreach my $k (keys %$doc_rec) {
     my @escaped_v = ();
@@ -516 +518 @@
     my $arcinfo_doc_filename = &util::filename_cat ($archive_dir, $doc_db);
 
-    my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$docid);
+    my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
 
     my $doc_xml_file = $doc_rec->{'doc-file'}->[0];
@@ -694 +697 @@
     my $arcinfo_doc_filename = &util::filename_cat ($archive_dir, $doc_db);
 
-    my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$docid);
+    my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
 
     # This now stores the full pathname
@@ -810 +814 @@
     my $gdbm_db = &util::filename_cat($gdbm_directory,"$collect_tail.gdb");
 
-    my $doc_rec = GDBMUtils::gdbmRecordToHash($gdbm_db,$docid);
+    my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $gdbm_db, $docid);
+    my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
     foreach my $k (keys %$doc_rec) {
     my @escaped_v = ();

main/trunk/greenstone2/perllib/inexport.pm

@@ -305 +305 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    my $src_rec = GDBMUtils::gdbmRecordToHash($arcinfo_src_filename,$file);
+    my $src_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_src_filename, $file);
+    my $src_rec = &dbutil::convert_infodb_string_to_hash($src_rec_string);
     my $oids = $src_rec->{'oid'};
     my $file_record_deleted = 0;
@@ -315 +316 @@
 
         # find the source doc (the primary file that becomes this oid)
-        my $doc_rec = GDBMUtils::gdbmRecordToHash($arcinfo_doc_filename,$oid);
+        my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $oid);
+        my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
         if (!&util::filename_is_absolute($doc_source_file)) {

main/trunk/greenstone2/perllib/plugin.pm

@@ -231 +231 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    my $src_rec = GDBMUtils::gdbmRecordToHash($arcinfo_src_filename,$file);
+    my $src_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_src_filename, $file);
+    my $src_rec = &dbutil::convert_infodb_string_to_hash($src_rec_string);
     my $oids = $src_rec->{'oid'};
     my $rv;