Changeset 31208 for main

Timestamp:

2016-12-12T15:20:40+13:00 (7 years ago)

Author:

ak19

Message:

Kathy found that the lowercased dbutil modules are not used (jdbm.pm, for example) and have been wholly replaced by the uppercased versions in DBDrivers folder. (I thought we had both). So I've moved the recently added code in jdbm.pm to JDBM.pm and fixed it up. Also tiedied up oaiinfo.pm of some unwanted commented out code.

Location:

main/trunk/greenstone2/perllib

Files:

• DBDrivers/JDBM.pm (modified) (1 diff)
• dbutil/jdbm.pm (modified) (1 diff)
• oaiinfo.pm (modified) (1 diff)

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

@@ -79 +79 @@
 
 
+# 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 $self = shift(@_);   
+
+    $self->SUPER::rename_db_file_to(@_);
+    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);
+    }
+    
+    # don't want to keep the log file for any files renamed to bak (backup file) though
+    if($destsuffix =~ m/bak$/) {
+    my $assoc_log_file = &FileUtils::filenameConcatenate($destdirname, $desttailname.".lg");
+    if(&FileUtils::fileExists($assoc_log_file)) {
+        &FileUtils::removeFiles($assoc_log_file);
+    }
+    }
+
+}
+
+sub remove_db_file {
+    my $self = shift(@_);
+
+    print STDERR "###### |".join(",", @_) . "|\n";
+
+    $self->SUPER::remove_db_file(@_);
+    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);
+    }
+
+}
+
+
+
 # -----------------------------------------------------------------------------
 #   JDBM IMPLEMENTATION

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

@@ -319 +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;

main/trunk/greenstone2/perllib/oaiinfo.pm

@@ -509 +509 @@
     foreach my $oid ( keys $self->{'info'} ) {
     my $OID_info = $self->{'info'}->{$oid};
-    #my $val_hash = { 
-    #    "status" => $OID_info->[INFO_STATUS_INDEX],
-    #    "timestamp" => $OID_info->[INFO_TIMESTAMP_INDEX] 
-    #}; 
-    
-    #&dbutil::write_infodb_rawentry($infodbtype,$infodb_handle,$oid,$val_hash);
-
     my $val = "<status>".$OID_info->[INFO_STATUS_INDEX]."\n<timestamp>".$OID_info->[INFO_TIMESTAMP_INDEX]."\n";
     &dbutil::write_infodb_rawentry($infodbtype,$infodb_handle,$oid,$val);