diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php index 5a3f2db..8f7ee35 100644 --- a/classes/expressions/LimeExpressionManager.php +++ b/classes/expressions/LimeExpressionManager.php @@ -3260,26 +3260,31 @@ if (!is_null($questionNum)) { $jsVars = $this->em->GetJSVarsUsed(); - $relevanceVars = implode('|',$this->em->GetJSVarsUsed()); - $relevanceJS = $this->em->GetJavaScriptEquivalentOfExpression(); - - if (!isset($this->subQrelInfo[$questionNum])) { - $this->subQrelInfo[$questionNum] = array(); + if(count ($jsVars)){ + $relevanceVars = implode('|',$this->em->GetJSVarsUsed()); + $relevanceJS = $this->em->GetJavaScriptEquivalentOfExpression(); + if (!isset($this->subQrelInfo[$questionNum])) { + $this->subQrelInfo[$questionNum] = array(); + } + $this->subQrelInfo[$questionNum][$rowdivid] = array( + 'qid' => $questionNum, + 'eqn' => $eqn, + 'prettyPrintEqn' => $prettyPrint, + 'result' => $result, + 'numJsVars' => count($jsVars), + 'relevancejs' => $relevanceJS, + 'relevanceVars' => $relevanceVars, + 'rowdivid' => $rowdivid, + 'type'=>$type, + 'qtype'=>$qtype, + 'sgqa'=>$sgqa, + 'hasErrors'=>$hasErrors, + ); + } + else + { + $this->subQrelInfo[$questionNum][$rowdivid] = false; } - $this->subQrelInfo[$questionNum][$rowdivid] = array( - 'qid' => $questionNum, - 'eqn' => $eqn, - 'prettyPrintEqn' => $prettyPrint, - 'result' => $result, - 'numJsVars' => count($jsVars), - 'relevancejs' => $relevanceJS, - 'relevanceVars' => $relevanceVars, - 'rowdivid' => $rowdivid, - 'type'=>$type, - 'qtype'=>$qtype, - 'sgqa'=>$sgqa, - 'hasErrors'=>$hasErrors, - ); } return $result; } @@ -5494,10 +5499,11 @@ { foreach ($LEM->subQrelInfo[$arg['qid']] as $subq) { - $subqParts[$subq['rowdivid']] = $subq; + if($subq){ + $subqParts[$subq['rowdivid']] = $subq; + } } } - $qidList[$arg['qid']] = $arg['qid']; if (!isset($gseq_qidList[$arg['gseq']])) {