Changeset 31188

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.

Location:

main/trunk/greenstone2/perllib

Files:

• DBDrivers/BaseDBDriver.pm (modified) (1 diff)
• DBDrivers/GDBM.pm (modified) (1 diff)
• DBDrivers/JDBM.pm (modified) (2 diffs)
• dbutil.pm (modified) (1 diff)
• dbutil/jdbm.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/DBDrivers/BaseDBDriver.pm

@@ -344 +344 @@
 
 
+## @function rename_db_file_to(string, string) => void
+#
+sub rename_db_file_to {
+    my $self = shift(@_);
+    my ($srcpath, $destpath) = @_;
+
+    # rename basic db file
+    &FileUtils::moveFiles($srcpath, $destpath);
+
+    # subclass should rename any additional files that the specific dbtype creates
+}
+## rename_db_file_to(string, string) => void ##
+
+## @function remove_db_file(string) => void
+#
+sub remove_db_file {
+    my $self = shift(@_);
+    my ($db_filepath) = @_;
+    
+    # remove basic db file
+    &FileUtils::removeFiles($db_filepath);
+
+    # subclass must rename any additional files that the specific dbtype creates (e.g. transaction log files)
+}
+## remove_db_file(string, string) => void ##
+
+
 ## @function supportsDatestamp(void) => integer
 #

main/trunk/greenstone2/perllib/DBDrivers/GDBM.pm

@@ -70 +70 @@
 # Handled by BaseDBDriver
 # sub get_infodb_file_path(string, string) => string
+# sub rename_db_file_to(string, string) => void
+# sub remove_db_file(string) => void
 
 # Handled by 70HyphenFormat

main/trunk/greenstone2/perllib/DBDrivers/JDBM.pm

@@ -83 +83 @@
 # -----------------------------------------------------------------------------
 
-# When DBUtil::* is properly structured with inheritence, then
+# When DBUtil::* is properly structured with inheritance, then
 # much of this code (along with GDBM and GDBM-TXT-GZ) can be grouped into
 # a shared base class.  Really it is only the the command that needs to
@@ -91 +91 @@
 # sub get_infodb_file_path {}
 
-# Handles by 70HyphenFormat
+# Handled by 70HyphenFormat
 # sub open_infodb_write_handle(string, string?) => filehandle
 # sub close_infodb_write_handle(filehandle) => void

main/trunk/greenstone2/perllib/dbutil.pm

@@ -564 +564 @@
 ## write_infodb_rawentry(string, *) => void ##
 
+## @function rename_db_file_to(string, string) => void
+#
+sub rename_db_file_to {
+    my $infodb_type = shift(@_);
+    my $driver = _loadDBDriver($infodb_type);
+    $driver->rename_db_file_to(@_);    
+}
+## rename_db_file_to(string, string) => void ##
+
+## @function remove_db_file(string) => void
+#
+sub remove_db_file {
+    my $infodb_type = shift(@_);
+    my $driver = _loadDBDriver($infodb_type);
+    $driver->remove_db_file(@_);    
+}
+## remove_db_file(string, string) => void ##
+
 1;

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;