Changeset 9610 for trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

Timestamp:

07/05/10 18:36:42 (14 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/datacenter/scripts/sourcefile (modified) (6 diffs)

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -274 +274 @@
 function subquerypart()
 {
-   query=$query" SELECT COUNT(*) FROM "$need"Status "
-   query=$query" "`getjoin $need "SpecialInfluence"`" "
-   query=$query" WHERE "$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`
+   query=$query" SELECT COUNT(*) FROM "$need"Status "`getjoin $need "SpecialInfluence"`
+   needinfluences=`grep $need $steps | grep "Needs" | grep -v "$need[.]Needs" | cut -d'.' -f1`
+   for needinfl in $needinfluences
+   do
+      needinfljoin=`getjoin $needinfl "Influence"`
+      if ! [ "$needinfljoin" = "" ]
+      then
+         query=$query" LEFT JOIN "$needinfl"Status USING ("$needinfljoin") "
+      fi
+      query=$query" "`getjoin $needinfl "SpecialInfluence"`" "
+   done
+   query=$query" WHERE "`echo ${prims[0]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`
    for (( j=1 ; j < ${#prims[@]} ; j++ ))
    do
-      query=$query" AND "$step"Status."`echo ${prims[$j]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[$j]} | sed -e 's/,//g'`
+      query=$query" AND "`echo ${prims[$j]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[$j]} | sed -e 's/,//g'`
    done
 }
@@ -309 +318 @@
    counter=0
    specialneedjoin=
+   specialinfljoin=
    for need in $needs
    do
@@ -316 +326 @@
       fi
       specialneedjoin=$specialneedjoin" "`getjoin $need "SpecialNeed"`
+      specialinfljoin=$specialinfljoin" "`getjoin $need "SpecialInfluence"`
       if [ "$specialneedjoin" = " " ]
       then 
@@ -323 +334 @@
          query=$query" ISNULL("$need"Status.fReturnCode) "
          specialneedjoin=
+         specialinfljoin=
       else 
          # special query to check steps which 
@@ -334 +346 @@
          query=$query" ) = ( "
          subquerypart
-         query=$query" AND NOT ISNULL(fStartTime) "
-         query=$query" AND NOT ISNULL(fStopTime) "
-         query=$query" AND ISNULL(fReturnCode)) "
+         query=$query" AND NOT ISNULL("$need"Status.fStartTime) "
+         query=$query" AND NOT ISNULL("$need"Status.fStopTime) "
+         query=$query" AND ISNULL("$need"Status.fReturnCode)) "
       fi
       counter=`echo $counter + 1 | bc -l`
@@ -504 +516 @@
          query=$query" LEFT JOIN "$influence"Status USING (${inflprims[@]}) "
       else 
-         query=$query" "$infljoin
+         query=$query" LEFT JOIN "$influence"Status USING ("$infljoin") "
+      fi
+      specialinfljoin2=`getjoin $influence "SpecialInfluence"`
+      if ! [ "$specialinfljoin2" = "" ]
+      then
+         query=$query" "$specialinfljoin2
       fi
    done