Changeset 9592 for trunk/MagicSoft

Timestamp:

06/22/10 14:42:47 (14 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/sourcefile (modified) (4 diffs)
• datacenter/scripts/writemcsequencefile (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/06/22 Daniela Dorner
+
+   * datacenter/scripts/writemcsequencefile:
+     - improved logging
+
+   * datacenter/scripts/sourcefile:
+     - adapted greps in rc-files to grep only lines which are no 
+       comments
+
+
+
  2010/06/17 Daniela Dorner
 

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -238 +238 @@
 {
    getdbsetup
-   needs=`grep "$step[.]Needs:" $steps | sed -e "s/$step[.]Needs://"`
-   noderestricted=`grep "$step[.]NodeRestricted:" $steps | sed -e "s/$step[.]NodeRestricted://" -e 's/ //g'`
-   prims=( `grep "$step[.]Primaries:" $steps | sed -e "s/$step[.]Primaries://"` )
+   needs=`grep "$step[.]Needs:" $steps | grep -v '#' | sed -e "s/$step[.]Needs://"`
+   noderestricted=`grep "$step[.]NodeRestricted:" $steps | grep -v '#' | sed -e "s/$step[.]NodeRestricted://" -e 's/ //g'`
+   prims=( `grep "$step[.]Primaries:" $steps | grep -v '#' | sed -e "s/$step[.]Primaries://"` )
 #   echo " needs: $needs"
 #   echo " noderestricted: $noderestricted"
@@ -250 +250 @@
 {
    getdbsetup
-   grep $@"[.]Primaries:" $steps | sed -e "s/$@[.]Primaries://"
+   grep $@"[.]Primaries:" $steps | grep -v '#' | sed -e "s/$@[.]Primaries://"
 }
 
@@ -259 +259 @@
 {
    getdbsetup
-   grep $@"[.]Join:" $steps | sed -e "s/$@[.]Join://"
+   grep $@"[.]Join:" $steps | grep -v '#' | sed -e "s/$@[.]Join://"
 }
 
@@ -268 +268 @@
 {
    getdbsetup
-   grep $@"[.]SpecialJoin:" $steps | sed -e "s/$@[.]SpecialJoin://"
+   grep $@"[.]SpecialJoin:" $steps | grep -v '#' | sed -e "s/$@[.]SpecialJoin://"
 }
 

trunk/MagicSoft/Mars/datacenter/scripts/writemcsequencefile

@@ -46 +46 @@
 checklock 
 
-echo "hallo"
-
 # get todo list
 gettodo 
 
-echo "hallo2 "
-
 cd $mars
 
-echo "$num steps to do"
+printprocesslog "INFO writing sequence files for $num mc sequences"
 # write sequence file for all sequences which don't have one yet
 for (( s=0 ; s < $num ; s++ ))
@@ -67 +63 @@
    sequencepath=$mcsequpath/$no
    makedir $sequencepath 
-   sequencefile=$sequpath/sequence$no2.txt
+   sequencefile=$sequencepath/sequence$no2.txt
    
    query="SELECT CONCAT(fRunNumber, '.', RIGHT(fFileNumber, 3)) FROM CeresInfo WHERE fRunTypeKEY=2 AND fSequenceNumber="$sequence
@@ -76 +72 @@
    calruns=`sendquery`
    
+   printprocesslog "INFO writing sequencefile $sequencefile"
    echo "Sequence: "$sequence >| $sequencefile
    echo ""                    >> $sequencefile