stack-cvs

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8501/scripts

Modified Files:
	stackQuestion.php 
Log Message:


Index: stackQuestion.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** stackQuestion.php	14 Jul 2005 12:53:41 -0000	1.23
--- stackQuestion.php	14 Jul 2005 16:18:19 -0000	1.24
***************
*** 1255,1260 ****
      } 
      
!     // Now check that something has been returned.
!     
      return($this_attempt);
  }
--- 1255,1268 ----
      } 
      
!     // If no mark has been assigned then
!     if (!array_key_exists('RawMark',$this_attempt)) {
!        $this_attempt['RawMark'] = 0;
!        if (array_key_exists('Result',$this_attempt) ) {   
!            if ($this_attempt['Result']) {
!                $this_attempt['RawMark'] = 1;
!            }
!        }    
!     }
! 
      return($this_attempt);
  }
***************
*** 1461,1471 ****
               $this_PRattempt = stack_apply_answertest($sa,$ta,$answertest[$prn],$answertestopt[$prn],$disp,$errors); 
  
-          //show_array( $this_PRattempt);
- 
               if (array_key_exists('error',  $this_PRattempt['Ans'] )) {
!                $NoErrors = FALSE;
!            $this_attempt['Ans']['error']   = $this_PRattempt['Ans']['error'];
!  
!          }
  
               $this_attempt['AnswerNote'] .= ' '.stack_castext_to_display($this_PRattempt['AnswerNote'],$all_locs_Inst,$options,$errors);
--- 1469,1476 ----
               $this_PRattempt = stack_apply_answertest($sa,$ta,$answertest[$prn],$answertestopt[$prn],$disp,$errors); 
  
               if (array_key_exists('error',  $this_PRattempt['Ans'] )) {
!                  $NoErrors = FALSE;
!                  $this_attempt['Ans']['error']   = $this_PRattempt['Ans']['error'];
!              }
  
               $this_attempt['AnswerNote'] .= ' '.stack_castext_to_display($this_PRattempt['AnswerNote'],$all_locs_Inst,$options,$errors);
***************
*** 1567,1581 ****
         }
      }
! 
!     // If no mark has been assigned then
!     if (!array_key_exists('RawMark',$this_attempt)) {
!        $this_attempt['RawMark'] = 0;
!        if (array_key_exists('Result',$this_attempt) ) {   
!            if ($this_attempt['Result']) {
!                $this_attempt['RawMark'] = 1;
!            }
!        }    
!     }
!     
      // Add penalty in this simple setting.
      if ($this_attempt['RawMark'] < 1.0) {
--- 1572,1576 ----
         }
      }
!    
      // Add penalty in this simple setting.
      if ($this_attempt['RawMark'] < 1.0) {