[Stack-cvs] stack-1-0 changelog.txt,1.1.2.7,1.1.2.8 editquiz.php,1.13.2.2,1.13.2.3 import.php,1.1.2.3,1.1.2.4 question_bank.php,1.8.2.6,1.8.2.7

[pkiddie <pk...@us...>]

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

Modified Files:
      Tag: development_xmlrqp
	changelog.txt editquiz.php import.php question_bank.php 
Log Message:
Mini changes to ensure all metadata is written out into the schema correctly, question done, quizzes in progress

Index: changelog.txt
===================================================================
RCS file: /cvsroot/stack/stack-1-0/Attic/changelog.txt,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** changelog.txt	15 Aug 2005 16:09:23 -0000	1.1.2.7
--- changelog.txt	17 Aug 2005 11:24:05 -0000	1.1.2.8
***************
*** 33,36 ****
--- 33,41 ----
    Each potential response now has a order element, as order is crucial.
    Question variable keyval types are encompassed within a <questionVar> XML declaration
+   Each questionVar also has an order for XML parsing to work
+ 
+ - Question and quiz metadata now defaults to to the specified 'default'
+ - update database to work on questionUserLastEdited - should be of type 'text'
+ - 
  
  Known issues:

Index: import.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/Attic/import.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** import.php	16 Aug 2005 22:43:28 -0000	1.1.2.3
--- import.php	17 Aug 2005 11:24:05 -0000	1.1.2.4
***************
*** 356,360 ****
  {
  
!  echo "<h2>Details of questions uploaded</h2>";
  
     echo '<table><thead><tr>';
--- 356,362 ----
  {
  
! include("{$stack_root}/html/qselectform.php");
! 
!  echo "<h2>Details of the uploaded</h2>";
  
     echo '<table><thead><tr>';
***************
*** 406,409 ****
--- 408,414 ----
  echo "</tbody></table>\n";
  
+ echo "<p><a href=\"javascript:SelectQs('export_xml_list');\">Edit imported question</a> ";
+ echo "<p><a href=\"javascript:SelectQs('edit_metadata');\">View list of questions</a> ";
+ 
  }
  

Index: editquiz.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/editquiz.php,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -C2 -d -r1.13.2.2 -r1.13.2.3
*** editquiz.php	15 Aug 2005 16:09:23 -0000	1.13.2.2
--- editquiz.php	17 Aug 2005 11:24:05 -0000	1.13.2.3
***************
*** 143,150 ****
      $quiz['quizid'] = $quizid;
      //<TODO> Automatically generated quiz metadata
!     $quiz['questionFormat'] = 'text/xml; charset="utf-8"';
!     $quiz['questionPublisher'] = $stack_web_url;
      $quiz['type'] = 'quiz';
!     $quiz['questionUserLastEdited'] = $user['firstname']." ".$user['lastname'];
      $action = 'quiz_edit';
   }
--- 143,157 ----
      $quiz['quizid'] = $quizid;
      //<TODO> Automatically generated quiz metadata
!     $quiz['quizGUID'] = stack_generate_guid($stack_web_url);
!     $quiz['quizFormat'] = 'text/xml; charset="utf-8"';
!     $quiz['quizPublisher'] = $stack_web_url;
      $quiz['type'] = 'quiz';
!     $quiz['quizUserLastEdited'] = $user['firstname']." ".$user['lastname'];
!     
!     if ($user['email']!='')
!       {
! 	     $question['questionUserLastEdited'].=' <'.$user['email'].'>';
!       }
!       
      $action = 'quiz_edit';
   }

Index: question_bank.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/question_bank.php,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -d -r1.8.2.6 -r1.8.2.7
*** question_bank.php	16 Aug 2005 15:24:16 -0000	1.8.2.6
--- question_bank.php	17 Aug 2005 11:24:06 -0000	1.8.2.7
***************
*** 86,90 ****
   }
   
!  if ('edit_from_db' == $action or 'edit_new' == $action) {
       $action = 'edit';
   }
--- 86,90 ----
   }
   
!  if ('edit_from_db' == $action) {
       $action = 'edit';
   }