Changeset 22010

Timestamp:

2010-05-03T12:06:46+12:00 (14 years ago)

Author:

davidb

Message:

GDBM reader/writer conflict resulted from swithcing from the (now deleted) GDBMUtils.pm to the more generic dbutil.pm class. Not able to keep write filehandle open through 'for-each' statement whilst (inside this loop) also reading entries from the same database. Solution for now has been to more tightly wrap the open and close write-handles around the pionts where they are needed. In GDBMUtil the write operation was done by calling the command-line utility 'gdbmset', hence no write file-handle had to be left open. Something to consider for later is whether or not the dbmutil.pm API should be extended to support this form of setting (or deleting, or editing).

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -295 +295 @@
     my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir);
     my $arcinfo_src_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $archivedir);
-    my $doc_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_doc_filename, "append");
-    my $src_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_src_filename, "append");
+
 
     # record files marked for deletion in arcinfo
@@ -309 +308 @@
 
     # delete the src record
+    my $src_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_src_filename, "append");
     &dbutil::delete_infodb_entry($infodbtype, $src_infodb_file_handle, $file);
-    
+    &dbutil::close_infodb_write_handle($infodbtype, $src_infodb_file_handle);
+
+
     foreach my $oid (@$oids) {
 
@@ -339 +341 @@
 
         my $val_rec = &dbutil::convert_infodb_string_to_hash($val);
+        my $doc_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_doc_filename, "append");
+
         &dbutil::write_infodb_entry($infodbtype, $doc_infodb_file_handle, $oid, $val_rec);
-        }
-    }
-    }
-
-    &dbutil::close_infodb_write_handle($infodbtype, $doc_infodb_file_handle);
-    &dbutil::close_infodb_write_handle($infodbtype, $src_infodb_file_handle);
+        &dbutil::close_infodb_write_handle($infodbtype, $doc_infodb_file_handle);
+        }
+    }
+    }
+
+
 }