[Stack-cvs] stack-1-0 editquiz.php,1.18,1.19 import.php,1.6,1.7 question_bank.php,1.13,1.14

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

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

Modified Files:
	editquiz.php import.php question_bank.php 
Log Message:


Index: import.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/import.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** import.php	29 Aug 2005 19:08:04 -0000	1.6
--- import.php	30 Aug 2005 12:20:29 -0000	1.7
***************
*** 148,152 ****
  
      global $stackQuiz;
- 
      //1. Decide what has been imported
      if (array_key_exists('mathQuiz',$imported))             //If it is a quiz/list of questions
--- 148,151 ----
***************
*** 356,360 ****
     echo '<th>ID</th><th>Name</th> <th>Description</th> <th>Key words</th> <th></th>';
     echo '</tr></thead><tbody>';
-    
     stack_question_validate($question,$errs);
     stack_xml_reinstate_question_meta_defaults($question);       //Reinstate any missing metadata in order to all fields to database
--- 355,358 ----

Index: editquiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/editquiz.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** editquiz.php	29 Aug 2005 19:08:04 -0000	1.18
--- editquiz.php	30 Aug 2005 12:20:28 -0000	1.19
***************
*** 175,179 ****
      $quiz = stack_db_quiz_get($quizid);  
      stack_xml_remove_quiz_meta_defaults($quiz);         //Pass quiz by reference and remove all default metadata
!     $name = stack_xml_write_quiz_new($quiz,"{$stack_root}/{$stack_tmpdir}/"); 
   }  
  
--- 175,179 ----
      $quiz = stack_db_quiz_get($quizid);  
      stack_xml_remove_quiz_meta_defaults($quiz);         //Pass quiz by reference and remove all default metadata
!     $name = stack_xml_write_quiz($quiz,"{$stack_root}/{$stack_tmpdir}/"); 
   }  
  

Index: question_bank.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/question_bank.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** question_bank.php	29 Aug 2005 19:08:04 -0000	1.13
--- question_bank.php	30 Aug 2005 12:20:29 -0000	1.14
***************
*** 139,143 ****
        include_once("{$stack_root}/scripts/stackXML.php");
        stack_question_validate($question,$errors);
!       $name = stack_xml_write_question_file($question, "{$stack_root}/{$stack_tmpdir}/");
        $questions_to_export = TRUE;
    }
--- 139,143 ----
        include_once("{$stack_root}/scripts/stackXML.php");
        stack_question_validate($question,$errors);
!       $name = stack_xml_write_question($question, "{$stack_root}/{$stack_tmpdir}/");
        $questions_to_export = TRUE;
    }