[Stack-cvs] stack-dev/lib/ui/inputTypes InputTypeController.php, 1.12.8.1, 1.12.8.2

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

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

Modified Files:
      Tag: item_state_separation
	InputTypeController.php 
Log Message:
Implemented reduceToState optimisation.  To test.

Index: InputTypeController.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/ui/inputTypes/InputTypeController.php,v
retrieving revision 1.12.8.1
retrieving revision 1.12.8.2
diff -C2 -d -r1.12.8.1 -r1.12.8.2
*** InputTypeController.php	9 Nov 2010 16:51:35 -0000	1.12.8.1
--- InputTypeController.php	16 Nov 2010 19:04:31 -0000	1.12.8.2
***************
*** 45,49 ****
      * @access private
      */
!     private $availableTypes;
  
      /**
--- 45,49 ----
      * @access private
      */
!     private static $availableTypes;
  
      /**
***************
*** 118,135 ****
          }
          //set list of avaliable input types, in a format that can be translated
!         $this->availableTypes['Algebraic Input'] = get_string('stackInputType_Algebraic', 'stack', '');
!         $this->availableTypes['True/False'] = get_string('stackInputType_truefalse', 'stack', '');
!         $this->availableTypes['Single Character'] = get_string('stackInputType_singlechar', 'stack', '');
!         $this->availableTypes['DropDownList'] = get_string('stackInputType_dropdownlist', 'stack', '');
! 		$this->availableTypes['Matrix'] = get_string('stackInputType_matrix', 'stack', '');
!         $this->availableTypes['List'] = get_string('stackInputType_list', 'stack', '');
!         $this->availableTypes['Textarea'] = get_string('stackInputType_Textarea', 'stack', '');
!         $this->availableTypes['Slider'] = get_string('stackInputType_slider', 'stack', '');
!         // We currently don't allow strings to be passed to the CAS, so remove this type.
!         //$this->availableTypes['String'] = get_string('stackInputType_String', 'stack', '');
!         // Currently there are too many bugs with DragMath - so don't offer it!
!         //$this->avaliableTypes['Dragmath with input box'] = get_string('stackInputType_dragmathInputBox', 'stack', '');
!         //$this->avaliableTypes['Dragmath only'] = get_string('stackInputType_dragmathOnly', 'stack', '');
! 
      }
  
--- 118,136 ----
          }
          //set list of avaliable input types, in a format that can be translated
!         if(empty(self::$availableTypes)){
!         	self::$availableTypes['Algebraic Input'] = get_string('stackInputType_Algebraic', 'stack', '');
!         	self::$availableTypes['True/False'] = get_string('stackInputType_truefalse', 'stack', '');
!         	self::$availableTypes['Single Character'] = get_string('stackInputType_singlechar', 'stack', '');
!         	self::$availableTypes['DropDownList'] = get_string('stackInputType_dropdownlist', 'stack', '');
! 			self::$availableTypes['Matrix'] = get_string('stackInputType_matrix', 'stack', '');
!         	self::$availableTypes['List'] = get_string('stackInputType_list', 'stack', '');
!         	self::$availableTypes['Textarea'] = get_string('stackInputType_Textarea', 'stack', '');
!         	self::$availableTypes['Slider'] = get_string('stackInputType_slider', 'stack', '');
!         	// We currently don't allow strings to be passed to the CAS, so remove this type.
!         	//$this->availableTypes['String'] = get_string('stackInputType_String', 'stack', '');
!         	// Currently there are too many bugs with DragMath - so don't offer it!
!         	//$this->avaliableTypes['Dragmath with input box'] = get_string('stackInputType_dragmathInputBox', 'stack', '');
!         	//$this->avaliableTypes['Dragmath only'] = get_string('stackInputType_dragmathOnly', 'stack', '');
!         }
      }
  
***************
*** 172,176 ****
          //display a drop down list
          $widget = '<select name="'.$prefix.'">';
!         foreach($this->availableTypes as $key => $val)
          {
              //if indexed array of values, use val for both display and return
--- 173,177 ----
          //display a drop down list
          $widget = '<select name="'.$prefix.'">';
!         foreach(InputTypeController::availableTypes as $key => $val)
          {
              //if indexed array of values, use val for both display and return