Changeset 36877

Timestamp:

2022-11-02T14:49:33+13:00 (18 months ago)

Author:

anupama

Message:

Previous commit renamed gdbdiff.pm to flatdbdiff.pm *and* also committed the updates to diffcol.pl to use the renamed flatdbdiff file/package and its subrouties. This commit contains the updated contents of flatdbdiff.pm (formerly called gdbdiff.pm). The updates consist of slightly renamed subroutines and updtes to where they get internally called.

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/flatdbdiff.pm (modified) (7 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/flatdbdiff.pm

@@ -1 @@
-package gdbdiff;
+package flatdbdiff;
 
 BEGIN {
@@ -17 +17 @@
 }
 
-sub readin_gdb
+sub readin_flat_db
 {
     my ($cmd) = @_;
@@ -34 +34 @@
 }
 
-sub read_db 
+sub read_flat_db 
 {
     # need to sort text output of both test and model col database files, to normalise them for the comparison
@@ -45 +45 @@
     }
 
-    my $db_text = readin_gdb($db_cmd);
+    my $db_text = readin_flat_db($db_cmd);
     return $db_text;
 }
@@ -65 +65 @@
     close(PIPE);
     }
-    return &read_db("$db_filename");
+    return &read_flat_db("$db_filename");
 }
 
@@ -78 +78 @@
 }
 
-sub test_gdb
+sub test_flat_db
 {
     my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os, $strTestCol, $strModelCol, $debugging) = @_;
@@ -85 +85 @@
     my ($dbname, $dirname, $suffix)= &File::Basename::fileparse($full_testdb, "\\.[^\\.]+\$");
    
-    my $model_text = read_db($full_modeldb);
-    my $test_text = read_db($full_testdb);
+    my $model_text = read_flat_db($full_modeldb);
+    my $test_text = read_flat_db($full_testdb);
 
     my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory