Ignore:
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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/dbutil/jdbm.pm

    r31188 r31208  
    319319
    320320
    321 # jdb also creates .lg log files, that don't get removed on delete or move operations
    322 # Make sure to rename them to when performing a rename operation on the main db file.
    323 # dbutil::renameTo(src,dest) already took care of renaming the main db file.
    324 sub rename_db_file_to {
    325     my $infodb_handle = shift(@_);
    326     my ($srcpath, $destpath) = @_;
    327 
    328     my ($srctailname, $srcdirname, $srcsuffix)
    329     = &File::Basename::fileparse($srcpath, "\\.[^\\.]+\$");
    330     my ($desttailname, $destdirname, $destsuffix)
    331     = &File::Basename::fileparse($destpath, "\\.[^\\.]+\$");
    332 
    333     # add in the lg extension
    334     my $src_log_file = &FileUtils::filenameConcatenate($srcdirname, $srctailname.".lg");
    335     my $dest_log_file = &FileUtils::filenameConcatenate($destdirname, $desttailname.".lg");
    336 
    337     # finally, move/rename any log file belonging to the src db file
    338     if(&FileUtils::fileExists($src_log_file)) {
    339     &FileUtils::moveFiles($src_log_file, $dest_log_file);
    340     }
    341 }
    342 
    343 sub remove_db_file {
    344     my $infodb_handle = shift(@_);
    345     my ($db_filepath) = @_;
    346 
    347     # add in the lg extension to get the log file name
    348     my ($tailname, $dirname, $suffix) = &File::Basename::fileparse($db_filepath, "\\.[^\\.]+\$");
    349     my $assoc_log_file = &FileUtils::filenameConcatenate($dirname, $tailname.".lg");
    350 
    351     # remove any log file associated with the db file
    352     if(&FileUtils::fileExists($assoc_log_file)) {
    353     &FileUtils::removeFiles($assoc_log_file);
    354     }
    355 
    356 }
    357 
    3583211;
Note: See TracChangeset for help on using the changeset viewer.