Changeset 9592


Ignore:
Timestamp:
Jun 22, 2010, 2:42:47 PM (10 years ago)
Author:
dorner
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r9591 r9592  
    1919                                                 -*-*- END OF LINE -*-*-
    2020
     21 2010/06/22 Daniela Dorner
     22
     23   * datacenter/scripts/writemcsequencefile:
     24     - improved logging
     25
     26   * datacenter/scripts/sourcefile:
     27     - adapted greps in rc-files to grep only lines which are no
     28       comments
     29
     30
     31
    2132 2010/06/17 Daniela Dorner
    2233
  • trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

    r9591 r9592  
    238238{
    239239   getdbsetup
    240    needs=`grep "$step[.]Needs:" $steps | sed -e "s/$step[.]Needs://"`
    241    noderestricted=`grep "$step[.]NodeRestricted:" $steps | sed -e "s/$step[.]NodeRestricted://" -e 's/ //g'`
    242    prims=( `grep "$step[.]Primaries:" $steps | sed -e "s/$step[.]Primaries://"` )
     240   needs=`grep "$step[.]Needs:" $steps | grep -v '#' | sed -e "s/$step[.]Needs://"`
     241   noderestricted=`grep "$step[.]NodeRestricted:" $steps | grep -v '#' | sed -e "s/$step[.]NodeRestricted://" -e 's/ //g'`
     242   prims=( `grep "$step[.]Primaries:" $steps | grep -v '#' | sed -e "s/$step[.]Primaries://"` )
    243243#   echo " needs: $needs"
    244244#   echo " noderestricted: $noderestricted"
     
    250250{
    251251   getdbsetup
    252    grep $@"[.]Primaries:" $steps | sed -e "s/$@[.]Primaries://"
     252   grep $@"[.]Primaries:" $steps | grep -v '#' | sed -e "s/$@[.]Primaries://"
    253253}
    254254
     
    259259{
    260260   getdbsetup
    261    grep $@"[.]Join:" $steps | sed -e "s/$@[.]Join://"
     261   grep $@"[.]Join:" $steps | grep -v '#' | sed -e "s/$@[.]Join://"
    262262}
    263263
     
    268268{
    269269   getdbsetup
    270    grep $@"[.]SpecialJoin:" $steps | sed -e "s/$@[.]SpecialJoin://"
     270   grep $@"[.]SpecialJoin:" $steps | grep -v '#' | sed -e "s/$@[.]SpecialJoin://"
    271271}
    272272
  • trunk/MagicSoft/Mars/datacenter/scripts/writemcsequencefile

    r9590 r9592  
    4646checklock
    4747
    48 echo "hallo"
    49 
    5048# get todo list
    5149gettodo
    5250
    53 echo "hallo2 "
    54 
    5551cd $mars
    5652
    57 echo "$num steps to do"
     53printprocesslog "INFO writing sequence files for $num mc sequences"
    5854# write sequence file for all sequences which don't have one yet
    5955for (( s=0 ; s < $num ; s++ ))
     
    6763   sequencepath=$mcsequpath/$no
    6864   makedir $sequencepath
    69    sequencefile=$sequpath/sequence$no2.txt
     65   sequencefile=$sequencepath/sequence$no2.txt
    7066   
    7167   query="SELECT CONCAT(fRunNumber, '.', RIGHT(fFileNumber, 3)) FROM CeresInfo WHERE fRunTypeKEY=2 AND fSequenceNumber="$sequence
     
    7672   calruns=`sendquery`
    7773   
     74   printprocesslog "INFO writing sequencefile $sequencefile"
    7875   echo "Sequence: "$sequence >| $sequencefile
    7976   echo ""                    >> $sequencefile
Note: See TracChangeset for help on using the changeset viewer.