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

Timestamp:

2013-06-04T16:29:10+12:00 (11 years ago)

Author:

ak19

Message:

FileUtils functions instead of util.pm

File:

• other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl (modified) (10 diffs)

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

@@ -39 +39 @@
 use parsargv;
 use util;
+use FileUtils;
 use logdiff;
 use cfgdiff;
@@ -46 +47 @@
 
 #--Global Variables Declaration-----------
-$gv_strModelColRoot = &util::filename_cat($ENV{'GSDLHOME'},"/model-collect");
-$gv_strTestColRoot = &util::filename_cat($ENV{'GSDLHOME'},"/collect");
+$gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
+$gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
 
 $gv_blnErrorStop = "false";
@@ -122 +123 @@
             
             VobPrint("Start Comparing \"$strEachFolder\"\n",0);
-            my $strModelFolder = &util::filename_cat($strModelCol,$strEachFolder);
-            my $strTestFolder = &util::filename_cat($strTestCol,$strEachFolder);
+            my $strModelFolder = &FileUtils::filenameConcatenate($strModelCol,$strEachFolder);
+            my $strTestFolder = &FileUtils::filenameConcatenate($strTestCol,$strEachFolder);
             $intNumberOfErrors = scalar(@Errors);
             push(@Errors,TestEach($strModelFolder,$strTestFolder,0));
@@ -143 +144 @@
     
     # Testing Log files
-#   my $strModelLog = &util::filename_cat($strModelCol,"log");
-#   my $strTestLog = &util::filename_cat($strTestCol,"log");
+#   my $strModelLog = &FileUtils::filenameConcatenate($strModelCol,"log");
+#   my $strTestLog = &FileUtils::filenameConcatenate($strTestCol,"log");
 #   
 #   if(-e $strModelLog && -e $strTestLog)
@@ -181 +182 @@
     
     # Testing the build.cfg
-    my $strModelBcfg =  &util::filename_cat($strModelCol,"index","build.cfg");
-    my $strTestBcfg =  &util::filename_cat($strTestCol,"index","build.cfg");
+    my $strModelBcfg =  &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg");
+    my $strTestBcfg =  &FileUtils::filenameConcatenate($strTestCol,"index","build.cfg");
 
     if(-e $strModelBcfg && -e $strTestBcfg)
@@ -232 +233 @@
     # Testing the collect.cfg
 
-    my $strModelCcfg =  &util::filename_cat($strModelCol,"etc","collect.cfg");
-    my $strTestCcfg =  &util::filename_cat($strTestCol,"etc","collect.cfg");
+    my $strModelCcfg =  &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg");
+    my $strTestCcfg =  &FileUtils::filenameConcatenate($strTestCol,"etc","collect.cfg");
     
     if(-e $strModelCcfg && -e $strTestCcfg)
@@ -285 +286 @@
     # Testing database
 
-    my $strModelGdb =  &util::filename_cat($strModelCol,"index","text","$strColName.ldb");
-    my $strTestGdb =  &util::filename_cat($strTestCol,"index","text","$strColName.ldb");
+    my $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"index","text","$strColName.ldb");
+    my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName.ldb");
     
     if(-e $strModelGdb && -e $strTestGdb)
@@ -523 +524 @@
             foreach my $strEachFile (@aryInModel)
             {
-                my $strNewModel = &util::filename_cat($strModel,$strEachFile);
-                my $strNewTest = &util::filename_cat($strTest,$strEachFile);
+                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile);
+                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile);
                 if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g))
                 {
@@ -543 +544 @@
             foreach my $strEachFile (@aryCorrectFiles)
             {
-                my $strNewModel = &util::filename_cat($strModel,$strEachFile);
-                my $strNewTest = &util::filename_cat($strTest,$strEachFile);
+                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile);
+                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile);
                 if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g))
                 {
@@ -749 +750 @@
     {
         my @ErrorsInEachCol;
-        my $strModelCol = &util::filename_cat($gv_strModelColRoot,$strColName);
-        my $strTestCol = &util::filename_cat($gv_strTestColRoot,$strColName);
+        my $strModelCol = &FileUtils::filenameConcatenate($gv_strModelColRoot,$strColName);
+        my $strTestCol = &FileUtils::filenameConcatenate($gv_strTestColRoot,$strColName);
 
         #--Output(Start)