Changeset 28661 for other-projects/nightly-tasks/diffcol/trunk/diffcol

Timestamp:

2013-11-20T17:34:45+13:00 (10 years ago)

Author:

ak19

Message:

Committing the next installment of code to handle diffcol for GS3. Now it successfully compiles up GS3, while diffcol still works for GS2.

Location:

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

Files:

• diffcol.pl (modified) (1 diff)
• gdbdiff.pm (modified) (3 diffs)

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

@@ -50 +50 @@
 my ($gv_test_os, $gv_model_os); # still just file globals
 
-$gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
-$gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
+if($ENV{'GSDL3SRCHOME'}) {
+    $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite","/model-collect");
+    $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDL3SRCHOME'},"web","sites","localsite","/collect");
+} else {
+    $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
+    $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
+}
 
 $gv_blnErrorStop = "false";

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

@@ -34 +34 @@
 }
 
+sub read_db 
+{
+    # need to sort text output of both test and model col database files, to normalise them for the comparison
+    # the -sort option to db2txt was added specifically to support diffcol
+    my($db_file) = @_;
+    my $db_cmd = "db2txt -sort $db_file 2>&1";
+    if($db_file =~ m/\.jdb$/) {
+    print STDERR "NOT YET IMPLEMENTED\n";
+    #$db_cmd = "jdb2txt -sort $db_file 2>&1";
+    }
+
+    my $db_text = readin_gdb($db_cmd);
+    return $db_text;
+}
+
+sub text_to_db_to_text
+{
+    my($db_text, $db_filename) = @_;
+
+    # http://stackoverflow.com/questions/1909262/how-can-i-pipe-input-into-a-java-command-from-perl
+    open PIPE, "| txt2db $db_filename";
+    print PIPE "$db_text";
+    close(PIPE);
+    
+    return &read_db("$db_filename");
+}
+
 # for debugging. Prints txt contents of db to file
 sub print_string_to_file 
 {
-    my ($text, $outfile) = @_;
-    
-    open(FOUT, ">$outfile") or die "ERROR failed to write to $outfile: $!\n";
+    my ($text, $outfile) = @_;
+    
+    open(FOUT, ">$outfile") or die "ERROR failed to write to $outfile: $!\n";
     print FOUT $text;
     close(FOUT);
@@ -51 +78 @@
     my ($dbname, $dirname, $suffix)= &File::Basename::fileparse($full_testdb, "\\.[^\\.]+\$");
    
-    # need to sort text output of both test and model col database files, to normalise them for the comparison
-    # the -sort option to db2txt was added specifically to support diffcol
-    my $model_cmd = "db2txt -sort $full_modeldb 2>&1";
-    my $test_cmd  = "db2txt -sort $full_testdb 2>&1";
-
-    my $model_text = readin_gdb($model_cmd);
-    my $test_text = readin_gdb($test_cmd);
+    my $model_text = read_db($full_modeldb);
+    my $test_text = read_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
@@ -244 +266 @@
         # so that we get the tmp files in the same order in both model and test collections
         
-        # http://stackoverflow.com/questions/1909262/how-can-i-pipe-input-into-a-java-command-from-perl
-        open PIPE, "| txt2db model.gdb";
-        print PIPE "$model_text";
-        close(PIPE);
-        open PIPE, "| txt2db test.gdb";
-        print PIPE "$test_text";
-        close(PIPE);
-        
-        $model_cmd = " db2txt -sort model.gdb 2>&1";
-        $test_cmd  = "db2txt -sort test.gdb 2>&1";
-        $model_text = readin_gdb($model_cmd);
-        $test_text = readin_gdb($test_cmd);
+        $model_text = text_to_db_to_text($model_text, "model.gdb");
+        $test_text = text_to_db_to_text($test_text, "test.gdb");
     }