[Stack-cvs] stack-1-0/scripts stackQuestion.php,1.19.2.1,1.19.2.2

[Juliette W. <jv...@us...>]

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

Modified Files:
      Tag: frontend_dev
	stackQuestion.php 
Log Message:
Couple of fixes and made function names more consistent

Index: stackQuestion.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** stackQuestion.php	17 Jun 2005 06:28:55 -0000	1.19.2.1
--- stackQuestion.php	17 Jun 2005 13:16:41 -0000	1.19.2.2
***************
*** 1014,1018 ****
      }
  
-  
  
      // Now put the implicit question variables back into the castext strings.
--- 1014,1017 ----
***************
*** 1023,1028 ****
          if ('castext' == $stackQuestion[$qfield]['type'] and array_key_exists($qfield,$question)) {
              $errct = '';
!             $questionInst["{$qfield}Inst"]= stack_castext_to_display($question["{$qfield}Inst"], $imp_locs_Inst, $options['Display'] , $errct);
! 
              if (''!=$errct) { // We have some errors!
                  $errors[$qfield]=$err_when_inst.$errct;
--- 1022,1031 ----
          if ('castext' == $stackQuestion[$qfield]['type'] and array_key_exists($qfield,$question)) {
              $errct = '';
!             if (array_key_exists($options, 'Display')) {
!                 $displayed = $options['Display'];
!                 $questionInst["{$qfield}Inst"]= stack_castext_to_display($question["{$qfield}Inst"], $imp_locs_Inst, $displayed , $errct);
!             } else {
!                 echo "Error - Display not set in options variable";
!             }
              if (''!=$errct) { // We have some errors!
                  $errors[$qfield]=$err_when_inst.$errct;