Merge branch 'master' into 192_dev

LimeSurvey · Jun 19, 2012 · b11ceea · b11ceea
2 parents 3556984 + 958dce0
commit b11ceea
Showing 1 changed file with 46 additions and 4 deletions.
diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
@@ -1106,12 +1106,33 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                                                 continue;
                                             }
                                             $fqid = $fqid[2];
+                                            if ($this->q2subqInfo[$fqid]['type'] == 'R')
+                                            {
+                                                $rankables = array();
+                                                foreach ($this->qans[$fqid] as $k=>$v)
+                                                {
+                                                    $rankable = explode('~',$k);
+                                                    $rankables[] = '_' . $rankable[1];
+                                                }
+                                                if (array_search($sq['sqsuffix'],$rankables) === false)
+                                                {
+                                                    continue;
+                                                }
+                                            }
                                             $fsqs = array();
                                             foreach ($this->q2subqInfo[$fqid]['subqs'] as $fsq)
                                             {
-                                                if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+                                                if ($this->q2subqInfo[$fqid]['type'] == 'R')
+                                                {
+                                                    // we know the suffix exists
+                                                    $fsqs[] = '(' . $sgq . $fsq['csuffix'] . ".NAOK == '" . substr($sq['sqsuffix'],1) . "')";
+                                                }
+                                                else
                                                 {
-                                                    $fsqs[] = '!is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+                                                    if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+                                                    {
+                                                        $fsqs[] = '!is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+                                                    }
                                                 }
                                             }
                                             if (count($fsqs) > 0)
@@ -1128,12 +1149,33 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                                                 continue;
                                             }
                                             $fqid = $fqid[2];
+                                            if ($this->q2subqInfo[$fqid]['type'] == 'R')
+                                            {
+                                                $rankables = array();
+                                                foreach ($this->qans[$fqid] as $k=>$v)
+                                                {
+                                                    $rankable = explode('~',$k);
+                                                    $rankables[] = '_' . $rankable[1];
+                                                }
+                                                if (array_search($sq['sqsuffix'],$rankables) === false)
+                                                {
+                                                    continue;
+                                                }
+                                            }
                                             $fsqs = array();
                                             foreach ($this->q2subqInfo[$fqid]['subqs'] as $fsq)
                                             {
-                                                if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+                                                if ($this->q2subqInfo[$fqid]['type'] == 'R')
+                                                {
+                                                    // we know the suffix exists
+                                                    $fsqs[] = '(' . $sgq . $fsq['csuffix'] . ".NAOK != '" . substr($sq['sqsuffix'],1) . "')";
+                                                }
+                                                else
                                                 {
-                                                    $fsqs[] = 'is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+                                                    if ($fsq['sqsuffix'] == $sq['sqsuffix'])
+                                                    {
+                                                        $fsqs[] = 'is_empty(' . $sgq . $fsq['csuffix'] . '.NAOK)';
+                                                    }
                                                 }
                                             }
                                             if (count($fsqs) > 0)