Changeset 36876


Ignore:
Timestamp:
2022-11-02T14:45:47+13:00 (5 weeks ago)
Author:
anupama
Message:

Renaming gdbdiff.pm to flatdbdiff.pm following Dr Bainbridge's earlier suggestion, as we're no longer just supporting gdb flat database files but also jdbm flat DB files.

Location:
other-projects/nightly-tasks/diffcol/trunk/diffcol
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r36868 r36876  
    4242use logdiff;
    4343use cfgdiff;
    44 use gdbdiff;
     44use flatdbdiff;
    4545use diffutil;
    4646use Text::Diff;
     
    314314   
    315315    my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName$flat_db_ext");   
    316     my $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error
     316    my $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error
    317317    if($strGdbError) {
    318318        push(@Errors,$strGdbError);
     
    322322    $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-doc$flat_db_ext");
    323323    $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-doc$flat_db_ext");   
    324     $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
     324    $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
    325325    if($strGdbError) {
    326326        push(@Errors,$strGdbError);
     
    329329    $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-src$flat_db_ext");
    330330        $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-src$flat_db_ext");
    331         $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
     331        $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
    332332        if($strGdbError) {
    333333            push(@Errors,$strGdbError);
     
    340340
    341341
    342 # At present handles gdbm - need to expand to allow for jdbm and other db types
    343 sub GdbDiff
     342# At present handles gdbm and jdbm - may need to expand to allow for other db types
     343sub FlatdbDiff
    344344{
    345345    my ($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol) = @_;
     
    349349    if(-e $strModelGdb && -e $strTestGdb)
    350350    {
    351     #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
    352    
    353     $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
     351    #my $strGdbError = flatdbdiff::test_flat_db($strModelGdb, $strTestGdb);
     352   
     353    $strGdbError = flatdbdiff::test_flat_db($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
    354354   
    355355    if($strGdbError ne "")
     
    569569
    570570# this function is only called on DocXMLFiles.
    571 # so far, only doc.xml files need special Windows processing (db files' OS-sensitivity are handled in gdbdiff.pm)
     571# so far, only doc.xml files need special Windows processing (db files' OS-sensitivity are handled in flatdbdiff.pm)
    572572# Returns true if the doc.xml contains windows style slashes in the gsdlsourcefilename meta field
    573573sub isDocOrMETSXMLFileWindows
     
    780780        if($gv_blnDebugging) {# && $gv_intVerbosity > 0) {
    781781            my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory       
    782             &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
    783             &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
     782            &flatdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
     783            &flatdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
    784784#           if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
    785 #           &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
    786 #           &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
     785#           &flatdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
     786#           &flatdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
    787787#           }
    788788        }       
Note: See TracChangeset for help on using the changeset viewer.