Changeset 36876 for other-projects/nightly-tasks/diffcol
- Timestamp:
- 2022-11-02T14:45:47+13:00 (19 months ago)
- 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 42 42 use logdiff; 43 43 use cfgdiff; 44 use gdbdiff;44 use flatdbdiff; 45 45 use diffutil; 46 46 use Text::Diff; … … 314 314 315 315 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 error316 my $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error 317 317 if($strGdbError) { 318 318 push(@Errors,$strGdbError); … … 322 322 $strModelGdb = &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-doc$flat_db_ext"); 323 323 $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); 325 325 if($strGdbError) { 326 326 push(@Errors,$strGdbError); … … 329 329 $strModelGdb = &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-src$flat_db_ext"); 330 330 $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); 332 332 if($strGdbError) { 333 333 push(@Errors,$strGdbError); … … 340 340 341 341 342 # At present handles gdbm - need to expand to allow for jdbm andother db types343 sub GdbDiff342 # At present handles gdbm and jdbm - may need to expand to allow for other db types 343 sub FlatdbDiff 344 344 { 345 345 my ($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol) = @_; … … 349 349 if(-e $strModelGdb && -e $strTestGdb) 350 350 { 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); 354 354 355 355 if($strGdbError ne "") … … 569 569 570 570 # 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) 572 572 # Returns true if the doc.xml contains windows style slashes in the gsdlsourcefilename meta field 573 573 sub isDocOrMETSXMLFileWindows … … 780 780 if($gv_blnDebugging) {# && $gv_intVerbosity > 0) { 781 781 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"); 784 784 # 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"); 787 787 # } 788 788 }
Note:
See TracChangeset
for help on using the changeset viewer.