Changeset 9164 for trunk

Timestamp:

11/14/08 12:10:05 (16 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * datacenter/scripts/sourcefile:
      - added variable for sql.rc
+     - simplified code of two for-loops
 
 

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -261 +261 @@
    getstepinfo
    # get query
-   query=" select "
-   for (( i=0 ; i < ${#prims[@]} ; i++ ))
+   query=" select "${prims[0]}
+   for (( i=1 ; i < ${#prims[@]} ; i++ ))
    do
-      if [ $i -lt `expr ${#prims[@]} - 1` ]
-      then 
-         query=$query" ${prims[$i]}, "
-      else
-         query=$query" ${prims[$i]} "
-      fi
+      query=$query", ${prims[$i]}"
    done
    query=$query" from $table where "
@@ -365 +360 @@
    query=$query", fFailedTime=$failedtime, fProgramId=$programid, fReturnCode=$returncode "
    query=$query" where "
-#   query=$query" where $primary='$primvar'"
    if [ "$s" = "" ]
    then
       s=0
    fi
-   for (( i=0 ; i < ${#prims[@]} ; i++ ))
+   query=$query" ${prims[0]}='${primaries[$s*${#prims[@]}]}'"
+   for (( i=1 ; i < ${#prims[@]} ; i++ ))
    do
-      if [ $i -lt `expr ${#prims[@]} - 1` ]
-      then 
-         query=$query" ${prims[$i]}='${primaries[$s*${#prims[@]}+$i]}' and "
-      else
-         query=$query" ${prims[$i]}='${primaries[$s*${#prims[@]}+$i]}' "
-      fi
-   done
+      query=$query" and ${prims[$i]}='${primaries[$s*${#prims[@]}+$i]}' "
+   fi
+   done   
    echo " QUERY: "$query
    if ! mysql -s -u $us --password=$pw --host=$ho $db -e " $query "