[Stack-cvs] stack-dev/lib/ui DisplayItem.php, 1.91.2.4.2.6, 1.91.2.4.2.7

[Simon H. <sim...@us...>]

Update of /cvsroot/stack/stack-dev/lib/ui
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22401/lib/ui

Modified Files:
      Tag: item_state_separation
	DisplayItem.php 
Log Message:
Ongoing debugging

Index: DisplayItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/ui/DisplayItem.php,v
retrieving revision 1.91.2.4.2.6
retrieving revision 1.91.2.4.2.7
diff -C2 -d -r1.91.2.4.2.6 -r1.91.2.4.2.7
*** DisplayItem.php	30 Nov 2010 10:34:33 -0000	1.91.2.4.2.6
--- DisplayItem.php	1 Dec 2010 18:21:32 -0000	1.91.2.4.2.7
***************
*** 212,217 ****
              $this->seed = $seed;
          }
!         //$this->itemOpts = new ItemOption(); // but will load the options stored with the question - check line a little below
!         $this->itemOpts = NULL; 
  
          $this->item = new InstantiatedItem($questionId, $this->itemOpts, $this->seed, $userId);
--- 212,218 ----
              $this->seed = $seed;
          }
!         $this->itemOpts = new ItemOption(); // but will load the options stored with the question - check line a little below
!         //$this->itemOpts = NULL; 
!         //echo "jellyfish:<pre>";var_dump(ItemOption::$options);//$this->itemOpts);
  
          $this->item = new InstantiatedItem($questionId, $this->itemOpts, $this->seed, $userId);
***************
*** 350,354 ****
  	                }
  	            }
! 	            else
  	            {
  	                //check if worked solution has been requested
--- 351,355 ----
  	                }
  	            }
! 	            else // posted != NULL
  	            {
  	                //check if worked solution has been requested
***************
*** 365,369 ****
  	                // update student answers, add attempt, update answerboxes.
  	                $this->updateSAnswer($posted, $processRequest);
! 
  	                $xhtml .= $this->cachedQuestionStem;
  
--- 366,370 ----
  	                // update student answers, add attempt, update answerboxes.
  	                $this->updateSAnswer($posted, $processRequest);
! 	            	
  	                $xhtml .= $this->cachedQuestionStem;
  
***************
*** 742,745 ****
--- 743,748 ----
          //for example the matrix input type needs to join multiple answers into one maxima command.
  
+     	//echo "ipad:<pre>";var_dump($this->itemOpts);
+     	
          //echo "<pre>";print_r($posted);
          $posted = $this->filterInputs($posted);
***************
*** 772,776 ****
          if($process == true)
          {
!             //var_dump($implicitForbid);
              $this->studentAnswers->syntaxCheck($this->itemOpts, $this->item->getQuestionPartsByStudentAnsKey(), $implicitForbid);
              $this->studentAnswers->scoreIfValid($this->item->getQuestionPartsByStudentAnsKey());
--- 775,779 ----
          if($process == true)
          {
!         	//var_dump($implicitForbid);
              $this->studentAnswers->syntaxCheck($this->itemOpts, $this->item->getQuestionPartsByStudentAnsKey(), $implicitForbid);
              $this->studentAnswers->scoreIfValid($this->item->getQuestionPartsByStudentAnsKey());