Changeset 31188 for main/trunk/greenstone2/perllib/dbutil/jdbm.pm

Timestamp:

2016-12-09T21:24:55+13:00 (7 years ago)

Author:

ak19

Message:

This commit is related to but not specific to the upcoming commit to do with the new oaiinfo db and its directly affected files. This commit: New remove and rename (move) methods in DB package to clean up main db file and any additional db files created by any specific infodbtype. The new methods in dbutil/jdbm.pm are not called, for some reason. Requires more investigation, but committing for now.

File:

• main/trunk/greenstone2/perllib/dbutil/jdbm.pm (modified) (2 diffs)

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

@@ -306 +306 @@
 
 
-
 sub delete_infodb_entry
 {
@@ -320 +319 @@
 
 
-
-
+# jdb also creates .lg log files, that don't get removed on delete or move operations
+# Make sure to rename them to when performing a rename operation on the main db file.
+# dbutil::renameTo(src,dest) already took care of renaming the main db file.
+sub rename_db_file_to {
+    my $infodb_handle = shift(@_);
+    my ($srcpath, $destpath) = @_;
+
+    my ($srctailname, $srcdirname, $srcsuffix)
+    = &File::Basename::fileparse($srcpath, "\\.[^\\.]+\$");
+    my ($desttailname, $destdirname, $destsuffix)
+    = &File::Basename::fileparse($destpath, "\\.[^\\.]+\$");
+
+    # add in the lg extension
+    my $src_log_file = &FileUtils::filenameConcatenate($srcdirname, $srctailname.".lg");
+    my $dest_log_file = &FileUtils::filenameConcatenate($destdirname, $desttailname.".lg");
+
+    # finally, move/rename any log file belonging to the src db file
+    if(&FileUtils::fileExists($src_log_file)) {
+    &FileUtils::moveFiles($src_log_file, $dest_log_file);
+    }
+}
+
+sub remove_db_file {
+    my $infodb_handle = shift(@_);
+    my ($db_filepath) = @_;
+
+    # add in the lg extension to get the log file name
+    my ($tailname, $dirname, $suffix) = &File::Basename::fileparse($db_filepath, "\\.[^\\.]+\$");
+    my $assoc_log_file = &FileUtils::filenameConcatenate($dirname, $tailname.".lg");
+
+    # remove any log file associated with the db file
+    if(&FileUtils::fileExists($assoc_log_file)) {
+    &FileUtils::removeFiles($assoc_log_file);
+    }
+
+}
 
 1;