stack-cvs

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

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

Modified Files:
      Tag: item_state_separation
	InstantiatedItem.php 
Log Message:


Index: InstantiatedItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/items/InstantiatedItem.php,v
retrieving revision 1.81.8.5
retrieving revision 1.81.8.6
diff -C2 -d -r1.81.8.5 -r1.81.8.6
*** InstantiatedItem.php	9 Nov 2010 16:51:37 -0000	1.81.8.5
--- InstantiatedItem.php	19 Nov 2010 18:16:19 -0000	1.81.8.6
***************
*** 176,180 ****
          }
  
!         $state = new ItemState($seed, $userID);
      }
  
--- 176,180 ----
          }
  
!         //$state = new ItemState($seed, $userID);
      }
  
***************
*** 641,645 ****
      * @access public
      */
!     public function getFeedback() // to itemState
      {
          return $this->feedback;
--- 641,645 ----
      * @access public
      */
!     public function getFeedback()
      {
          return $this->feedback;
***************
*** 652,656 ****
      * @access public
      */
!     public function getMark() // to itemState
      {
          return $this->mark;
--- 652,656 ----
      * @access public
      */
!     public function getMark()
      {
          return $this->mark;
***************
*** 825,833 ****
  	/*
  	 * Saves the state to the state cache.
! 	*/
  	public function saveState($stateID) {
         $state->save($$stateID);
  	}
! 
  	/*
  	 * Attempts to load the state from the state cache.
--- 825,833 ----
  	/*
  	 * Saves the state to the state cache.
! 	*
  	public function saveState($stateID) {
         $state->save($$stateID);
  	}
! */
  	/*
  	 * Attempts to load the state from the state cache.
***************
*** 894,900 ****
      *
      */
!     public function getAnswerNote() // to ItemState
      {
- 
        $an = array();
        if (!empty($this->attempts)) {
--- 894,899 ----
      *
      */
!     public function getAnswerNote()
      {
        $an = array();
        if (!empty($this->attempts)) {
***************
*** 906,915 ****
      }
  
!     public function getpreCalculated() // to ItemState
      {
          return $this->preCalculated;
      }
  
!     public function getAttempts() // to ItemState
      {
          return $this->attempts;
--- 905,914 ----
      }
  
!     public function getpreCalculated()
      {
          return $this->preCalculated;
      }
  
!     public function getAttempts()
      {
          return $this->attempts;