Changeset 9183 for trunk

Timestamp:

12/01/08 10:48:20 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/12/01 Daniela Dorner
+
+   * datacenter/scripts/runcorsika:
+     - removed not needed query
+
+   * datacenter/scripts/sourcefile:
+     - added check if script is executed with the full path
+     - added check if rc-files are existing
+
+
+
  2008/11/28 Thomas Bretz
 

trunk/MagicSoft/Mars/datacenter/scripts/runcorsika

@@ -40 +40 @@
    echo "RUNNR "$corsikarunno
    echo "PRMPAR "$primparticle
-   query="SELECT fEnergyMin, fEnergyMax FROM MCCorsikaRunData where fCorsikaRunNumber="$corsikarunno
    echo "ERANGE "$erange
    echo "EVTNR 1"

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -31 +31 @@
 #
 
+# check if script has been started with absolute path
+if ! dirname $0 | grep -E '^/' >/dev/null 2>&1
+then 
+   echo "Please start your script with an absolute path."
+   exit
+fi
+
 source `dirname $0`/setup 
 
@@ -67 +74 @@
 
 makedir $lockpath
+
+
+# function to provide proper logging in a single logfile ($processlog)
+function printprocesslog
+{
+   makedir $processlogpath
+   echo `date +%F\ %T`" "`whoami`"@"$HOSTNAME" "`basename $0`"["$$"] "$@ >> $processlog
+}
+
+# function to exit a script properly
+function finish()
+{
+   if ! [ "$lockfile" = "" ] && ls $lockfile >/dev/null 2>&1
+   then 
+      rm -v $lockfile
+   fi
+   date
+   printprocesslog "INFO finished $0"
+   exit
+}
+
 
 # set checkvalue to ok at the beginning of the scripts
@@ -112 +140 @@
 jmscriptlog=$runlogpath/jobmanager`date +%F`.log
 steps=$mars/resources/steps.rc
+if ! ls $steps >/dev/null
+then
+   echo "Can't find steps.rc ($steps)"
+   finish
+fi
 sqlrc=$mars/sql.rc
+if ! ls $sqlrc >/dev/null
+then
+   echo "Can't find sql.rc ($sqlrc)"
+   finish
+fi
 # resetting values
 pno=0
@@ -129 +167 @@
 # in the following the functions, which are needed by several scripts, are 
 # defined
-
-function printprocesslog
-{
-   makedir $processlogpath
-   echo `date +%F\ %T`" "`whoami`"@"$HOSTNAME" "`basename $0`"["$$"] "$@ >> $processlog
-}
-
-# function to exit a script properly
-function finish()
-{
-   if ! [ "$lockfile" = "" ] && ls $lockfile >/dev/null 2>&1
-   then 
-      rm -v $lockfile
-   fi
-   date
-   printprocesslog "INFO finished $0"
-   exit
-}
 
 # function to do continue in a loop and produce according logging