Changeset 27536

Show
Ignore:
Timestamp:
04.06.2013 16:29:10 (6 years ago)
Author:
ak19
Message:

FileUtils? functions instead of util.pm

Location:
other-projects/nightly-tasks/diffcol/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

    r21711 r27536  
    3939use parsargv; 
    4040use util; 
     41use FileUtils; 
    4142use logdiff; 
    4243use cfgdiff; 
     
    4647 
    4748#--Global Variables Declaration----------- 
    48 $gv_strModelColRoot = &util::filename_cat($ENV{'GSDLHOME'},"/model-collect"); 
    49 $gv_strTestColRoot = &util::filename_cat($ENV{'GSDLHOME'},"/collect"); 
     49$gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect"); 
     50$gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect"); 
    5051 
    5152$gv_blnErrorStop = "false"; 
     
    122123             
    123124            VobPrint("Start Comparing \"$strEachFolder\"\n",0); 
    124             my $strModelFolder = &util::filename_cat($strModelCol,$strEachFolder); 
    125             my $strTestFolder = &util::filename_cat($strTestCol,$strEachFolder); 
     125            my $strModelFolder = &FileUtils::filenameConcatenate($strModelCol,$strEachFolder); 
     126            my $strTestFolder = &FileUtils::filenameConcatenate($strTestCol,$strEachFolder); 
    126127            $intNumberOfErrors = scalar(@Errors); 
    127128            push(@Errors,TestEach($strModelFolder,$strTestFolder,0)); 
     
    143144     
    144145    # Testing Log files 
    145 #   my $strModelLog = &util::filename_cat($strModelCol,"log"); 
    146 #   my $strTestLog = &util::filename_cat($strTestCol,"log"); 
     146#   my $strModelLog = &FileUtils::filenameConcatenate($strModelCol,"log"); 
     147#   my $strTestLog = &FileUtils::filenameConcatenate($strTestCol,"log"); 
    147148#    
    148149#   if(-e $strModelLog && -e $strTestLog) 
     
    181182     
    182183    # Testing the build.cfg 
    183     my $strModelBcfg =  &util::filename_cat($strModelCol,"index","build.cfg"); 
    184     my $strTestBcfg =  &util::filename_cat($strTestCol,"index","build.cfg"); 
     184    my $strModelBcfg =  &FileUtils::filenameConcatenate($strModelCol,"index","build.cfg"); 
     185    my $strTestBcfg =  &FileUtils::filenameConcatenate($strTestCol,"index","build.cfg"); 
    185186 
    186187    if(-e $strModelBcfg && -e $strTestBcfg) 
     
    232233    # Testing the collect.cfg 
    233234 
    234     my $strModelCcfg =  &util::filename_cat($strModelCol,"etc","collect.cfg"); 
    235     my $strTestCcfg =  &util::filename_cat($strTestCol,"etc","collect.cfg"); 
     235    my $strModelCcfg =  &FileUtils::filenameConcatenate($strModelCol,"etc","collect.cfg"); 
     236    my $strTestCcfg =  &FileUtils::filenameConcatenate($strTestCol,"etc","collect.cfg"); 
    236237     
    237238    if(-e $strModelCcfg && -e $strTestCcfg) 
     
    285286    # Testing database 
    286287 
    287     my $strModelGdb =  &util::filename_cat($strModelCol,"index","text","$strColName.ldb"); 
    288     my $strTestGdb =  &util::filename_cat($strTestCol,"index","text","$strColName.ldb"); 
     288    my $strModelGdb =  &FileUtils::filenameConcatenate($strModelCol,"index","text","$strColName.ldb"); 
     289    my $strTestGdb =  &FileUtils::filenameConcatenate($strTestCol,"index","text","$strColName.ldb"); 
    289290     
    290291    if(-e $strModelGdb && -e $strTestGdb) 
     
    523524            foreach my $strEachFile (@aryInModel) 
    524525            { 
    525                 my $strNewModel = &util::filename_cat($strModel,$strEachFile); 
    526                 my $strNewTest = &util::filename_cat($strTest,$strEachFile); 
     526                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 
     527                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    527528                if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g)) 
    528529                { 
     
    543544            foreach my $strEachFile (@aryCorrectFiles) 
    544545            { 
    545                 my $strNewModel = &util::filename_cat($strModel,$strEachFile); 
    546                 my $strNewTest = &util::filename_cat($strTest,$strEachFile); 
     546                my $strNewModel = &FileUtils::filenameConcatenate($strModel,$strEachFile); 
     547                my $strNewTest = &FileUtils::filenameConcatenate($strTest,$strEachFile); 
    547548                if(!($strEachFile eq "log" || $strEachFile =~ m/\.cfg$/g || $strEachFile =~ m/\.(l|b)db$/g)) 
    548549                { 
     
    749750    { 
    750751        my @ErrorsInEachCol; 
    751         my $strModelCol = &util::filename_cat($gv_strModelColRoot,$strColName); 
    752         my $strTestCol = &util::filename_cat($gv_strTestColRoot,$strColName); 
     752        my $strModelCol = &FileUtils::filenameConcatenate($gv_strModelColRoot,$strColName); 
     753        my $strTestCol = &FileUtils::filenameConcatenate($gv_strTestColRoot,$strColName); 
    753754 
    754755        #--Output(Start) 
  • other-projects/nightly-tasks/diffcol/trunk/task

    r27524 r27536  
    11#!/bin/bash 
     2 
     3if [ "x$TASK_HOME" == "x" ]; then 
     4    TASK_HOME=`pwd`; 
     5fi 
    26 
    37export DATA_DIR=$TASK_HOME/diffcol-data