Changeset 18701 for trunk

Timestamp:

12/21/16 12:37:49 (8 years ago)

Author:

Daniela Dorner

Message:

fixed bug (variable pwfile occured twice -> renamed)

Location:

trunk/DataCheck

Files:

• DataCheck/InfoForMWL.sh (modified) (1 diff)
• QuickLook/SendData.sh (modified) (1 diff)
• QuickLook/SendData_Internal.sh (modified) (1 diff)
• Sourcefile.sh (modified) (3 diffs)
• Transfer/RsyncRawToISDC.sh (modified) (3 diffs)

trunk/DataCheck/DataCheck/InfoForMWL.sh

@@ -36 +36 @@
    printprocesslog "DEBUG sendquery QUERY: "$query
    # sendquery can't be used as it writes everything into a variable
-   mysql $pwfile -s -u $us $pw --host=$ho $db -s -e " $query " > $file
+   mysql $sqlpwfile -s -u $us $pw --host=$ho $db -s -e " $query " > $file
 }
 

trunk/DataCheck/QuickLook/SendData.sh

@@ -65 +65 @@
    getdbsetup
    printprocesslog "DEBUG sendquery QUERY: "$query
-   mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query "
+   mysql $sqlpwfile -s -u $us $pw --host=$ho $db -e " $query "
 }
 

trunk/DataCheck/QuickLook/SendData_Internal.sh

@@ -83 +83 @@
    printprocesslog "DEBUG sendquery QUERY: "$query
    echo "DEBUG sendquery QUERY: "$query
-   mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query "
+   mysql $sqlpwfile -s -u $us $pw --host=$ho $db -e " $query "
    if [ "$table" == "AnalysisResultsRunLP" ]
    then 
       query2=`echo $query | sed -e 's/AnalysisResultsRunLP/AnalysisResultsRunISDC/g'`
       echo "# QUERY: "$query2
-      mysql $pwfile -s -u $us $pw --host=$ho factdata_cp20150811 -e " $query2 "
+      mysql $sqlpwfile -s -u $us $pw --host=$ho factdata_cp20150811 -e " $query2 "
       fi
 }

trunk/DataCheck/Sourcefile.sh

@@ -173 +173 @@
    if [ "$sqlpw" != "" ]
    then 
-      pwfile="--defaults-file=$sqlpw"
+      sqlpwfile="--defaults-file=$sqlpw"
       pw=""
    fi
@@ -188 +188 @@
    getdbsetup
    printprocesslog "DEBUG sendquery QUERY: "$query
-   if ! val=`mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query "`
+   if ! val=`mysql $sqlpwfile -s -u $us $pw --host=$ho $db -e " $query "`
    then
       printprocesslog "ERROR could not query DB "$db" on host "$ho" with user "$us
@@ -346 +346 @@
    # execute query
    #numproc=`sendquery `#cannot be done with sendquery, because of row counting
-   if ! numproc=`mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query " | wc -l`
+   if ! numproc=`mysql $sqlpwfile -s -u $us $pw --host=$ho $db -e " $query " | wc -l`
    then
       printprocesslog "ERROR could not query number of processes from db (program: $program, function getstatus)"

trunk/DataCheck/Transfer/RsyncRawToISDC.sh

@@ -6 +6 @@
 program=RsyncRawToISDC
 step=RawFileRsyncedISDC
-pwfile=/home_nfs/isdc/fact_opr/rsync.pwd
+rsyncpwfile=/home_nfs/isdc/fact_opr/rsync.pwd
 
 set -C
@@ -100 +100 @@
    printprocesslog "INFO rsync rawfile "$rawfilelp" to ISDC "$rawdirisdc
    #echo "INFO rsync rawfile "$rawfilelp" to ISDC "$rawdirisdc >> $logfile 2>&1
-   #rsync -rltDvR --partial --stats --password-file=$pwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
+   #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
    #echo "rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$rawfilelp $rawdirisdc >> $logfile 2>&1"
    rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$rawfilelp $rawdirisdc >> $logfile 2>&1
@@ -148 +148 @@
       printprocesslog "INFO rsync drsfile "$drsfilelp" to ISDC "$rawdirisdc
       echo "INFO rsync drsfile "$drsfilelp" to ISDC "$rawdirisdc >> $logfile 2>&1
-      #rsync -rltDvR --partial --stats --password-file=$pwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
+      #rsync -rltDvR --partial --stats --password-file=$rsyncpwfile factdata@161.72.93.131::$rawfilelp $rawdirisdc >> $logfile 2>&1
       rsync -rltDvR -T $rsynctempdir --partial --stats fact@161.72.93.131:$drsfilelp $rawdirisdc >> $logfile 2>&1
       check3=$?