[Stack-cvs] stack-dev/lib/items RawKeyVal.php, 1.32, 1.33 StudentAns.php, 1.46, 1.47 CasTextType.php, 1.26, 1.27 CasString.php, 1.16, 1.17

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

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

Modified Files:
	RawKeyVal.php StudentAns.php CasTextType.php CasString.php 
Log Message:
Comma validation bug

Index: CasTextType.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/items/CasTextType.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CasTextType.php	30 Sep 2010 16:56:15 -0000	1.26
--- CasTextType.php	13 Oct 2010 12:15:19 -0000	1.27
***************
*** 403,407 ****
              {
                  $cmd = trim($cmd);
!                 $castext .= '@ev(stack_validate_typeless('.$cmd.', '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              }
              return $castext;
--- 403,407 ----
              {
                  $cmd = trim($cmd);
!                 $castext .= '@ev(stack_validate_typeless(['.$cmd.'], '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              }
              return $castext;

Index: StudentAns.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/items/StudentAns.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** StudentAns.php	30 Sep 2010 16:56:15 -0000	1.46
--- StudentAns.php	13 Oct 2010 12:15:19 -0000	1.47
***************
*** 442,450 ****
                  if($sameType == 'false')
                  {
!                     $casCommands["caschat$i"] = 'stack_validate_typeless('.$starredAnswer.','.$ForbidFloats.','.$LowestTerms.')';
                  }
                  else
                  {
!                     $casCommands["caschat$i"] = 'stack_validate('.$starredAnswer.','.$ForbidFloats.','.$LowestTerms.','.$TAns.')';
                  }
                  $validLabels[] = $label;
--- 442,450 ----
                  if($sameType == 'false')
                  {
!                     $casCommands["caschat$i"] = 'stack_validate_typeless(['.$starredAnswer.'],'.$ForbidFloats.','.$LowestTerms.')';
                  }
                  else
                  {
!                     $casCommands["caschat$i"] = 'stack_validate(['.$starredAnswer.'],'.$ForbidFloats.','.$LowestTerms.','.$TAns.')';
                  }
                  $validLabels[] = $label;

Index: RawKeyVal.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/items/RawKeyVal.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** RawKeyVal.php	30 Sep 2010 16:56:15 -0000	1.32
--- RawKeyVal.php	13 Oct 2010 12:15:19 -0000	1.33
***************
*** 518,522 ****
              {
                  $kv = trim($pair->getMaximaPair());
!                 $castext .= '@ev(stack_validate_typeless('.$kv.', '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              }
              return $castext;
--- 518,522 ----
              {
                  $kv = trim($pair->getMaximaPair());
!                 $castext .= '@ev(stack_validate_typeless(['.$kv.'], '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              }
              return $castext;

Index: CasString.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/items/CasString.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CasString.php	27 Aug 2009 16:23:00 -0000	1.16
--- CasString.php	13 Oct 2010 12:15:19 -0000	1.17
***************
*** 257,261 ****
          {
              $cs = trim($this->casString);
!             $validString = '@ev(stack_validate_typeless('.$cs.', '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              return $validString;
          }
--- 257,261 ----
          {
              $cs = trim($this->casString);
!             $validString = '@ev(stack_validate_typeless(['.$cs.'], '.$forbidFloats.', '.$lowestTerms.'), simp: '.$simplify.')@';
              return $validString;
          }