From: trobb <trobb>
Date: Wed, 26 Nov 2003 22:21:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e8a5be28530bca8f791a4357243f83a8e7914c78;p=moodle.git

*** empty log message ***
---

diff --git a/mod/quiz/report/fullstat/report.php b/mod/quiz/report/fullstat/report.php
index c1b50f40de..2f816f7516 100755
--- a/mod/quiz/report/fullstat/report.php
+++ b/mod/quiz/report/fullstat/report.php
@@ -1,8 +1,8 @@
 <?PHP  // $Id: report.php,
 //  created from the above 2003/11/20 by Tom Robb tom@robb.net
-// Version 2.2  Modified 2003/11/25 pm
-//  $showtext added to toggle display of full text of M/C questions
-//  Discrimination Index figures added
+// Version 2.3  Modified 2003/11/27
+//  bug causing errors with null data in qr_answser_lookup() fixed
+//  
 
 /// This report shows the specific responses made by each student for each question.
 
@@ -916,20 +916,22 @@ function qr_answer_lookup($qid,$thisanswer){
     $qtally[$qid]['qtype'] = $thistype;
     switch ($thistype) {
         case 1:  //SHORTANSWER
-            $returndata['data'] = $thisanswer;
-            $qtally[$qid]['response'][$thisanswer]++;
-            //convert all to lowercase to allow for mismatching cases to be correct
-            if (strpos(strtolower($quests[$qid]['correct']),trim(strtolower($thisanswer))) >-1){
-                $qtally[$qid]['correct']++;
-                $returndata['score'] = 1;
+            if($returndata['data'] = $thisanswer) {;
+                $qtally[$qid]['response'][$thisanswer]++;
+                //convert all to lowercase to allow for mismatching cases to be correct
+                if (strpos(strtolower($quests[$qid]['correct']),trim(strtolower($thisanswer))) >-1){
+                    $qtally[$qid]['correct']++;
+                    $returndata['score'] = 1;
+                }
             }
             break;
         case 2:  //TRUEFALSE
-            $returndata['data'] = $quests[$qid]['choice'][$thisanswer]['answer'];
-            $qtally[$qid][$quests[$qid]['choice'][$thisanswer]['answer']]++;
-            if ($quests[$qid]['correct']==$quests[$qid]['choice'][$thisanswer]['answer']){
-                $returndata['score'] = 1;
-                $qtally[$qid]['correct']++;
+            if ($returndata['data'] = $quests[$qid]['choice'][$thisanswer]['answer']) {
+                $qtally[$qid][$quests[$qid]['choice'][$thisanswer]['answer']]++;
+                if ($quests[$qid]['correct']==$quests[$qid]['choice'][$thisanswer]['answer']){
+                    $returndata['score'] = 1;
+                    $qtally[$qid]['correct']++;
+                }
             }
             break;
         case 3:  //MULTICHOICE
@@ -948,12 +950,13 @@ function qr_answer_lookup($qid,$thisanswer){
             }
             break;
         case 8:  //NUMERICAL
-            $returndata['data'] = $thisanswer;
+            if ($returndata['data'] = $thisanswer) {
 //            $returndata['data'] = $thismin . "<" . $thisanswer . ">" . $thismax;
-            $qtally[$qid]['response'][$thisanswer]++;
-            if ($thisanswer >= $thismin[$qid] and $thisanswer <= $thismax[$qid]){
-                $qtally[$qid]['correct']++;
-                $returndata['score'] = 1;
+                $qtally[$qid]['response'][$thisanswer]++;
+                if ($thisanswer >= $thismin[$qid] and $thisanswer <= $thismax[$qid]){
+                    $qtally[$qid]['correct']++;
+                    $returndata['score'] = 1;
+                }
             }
             break;
     }