Changeset 36876

Timestamp:

2022-11-02T14:45:47+13:00 (18 months 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:

• diffcol.pl (modified) (8 diffs)
• flatdbdiff.pm (moved) (moved from other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm )

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -42 +42 @@
 use logdiff;
 use cfgdiff;
-use gdbdiff;
+use flatdbdiff;
 use diffutil;
 use Text::Diff;
@@ -314 +314 @@
     
     my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName$flat_db_ext");    
-    my $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error
+    my $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol); # returns 0 if no error
     if($strGdbError) {
         push(@Errors,$strGdbError);
@@ -322 +322 @@
     $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-doc$flat_db_ext");
     $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-doc$flat_db_ext");    
-    $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
+    $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
     if($strGdbError) {
         push(@Errors,$strGdbError);
@@ -329 +329 @@
     $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"archives","archiveinf-src$flat_db_ext");
         $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"archives","archiveinf-src$flat_db_ext");
-        $strGdbError = &GdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
+        $strGdbError = &FlatdbDiff($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol);
         if($strGdbError) {
             push(@Errors,$strGdbError);
@@ -340 +340 @@
 
 
-# At present handles gdbm - need to expand to allow for jdbm and other db types
-sub GdbDiff
+# At present handles gdbm and jdbm - may need to expand to allow for other db types
+sub FlatdbDiff
 {
     my ($strModelGdb,$strTestGdb,$strOutputFormat,$intLevel,$strColName,$strTestCol,$strModelCol) = @_;
@@ -349 +349 @@
     if(-e $strModelGdb && -e $strTestGdb)
     {
-    #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
-    
-    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
+    #my $strGdbError = flatdbdiff::test_flat_db($strModelGdb, $strTestGdb);
+    
+    $strGdbError = flatdbdiff::test_flat_db($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
     
     if($strGdbError ne "")
@@ -569 +569 @@
 
 # this function is only called on DocXMLFiles. 
-# so far, only doc.xml files need special Windows processing (db files' OS-sensitivity are handled in gdbdiff.pm)
+# so far, only doc.xml files need special Windows processing (db files' OS-sensitivity are handled in flatdbdiff.pm)
 # Returns true if the doc.xml contains windows style slashes in the gsdlsourcefilename meta field
 sub isDocOrMETSXMLFileWindows
@@ -780 +780 @@
         if($gv_blnDebugging) {# && $gv_intVerbosity > 0) {
             my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory       
-            &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
-            &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
+            &flatdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
+            &flatdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
 #           if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
-#           &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
-#           &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
+#           &flatdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
+#           &flatdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
 #           }
         }