stack-cvs

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

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

Modified Files:
	stackDatabase.php stackQuestion.php stackUtility.php 
	stackXML.php 
Log Message:


Index: stackDatabase.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackDatabase.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** stackDatabase.php	14 Jul 2005 07:27:03 -0000	1.31
--- stackDatabase.php	18 Jul 2005 10:53:37 -0000	1.32
***************
*** 1629,1632 ****
--- 1629,1669 ----
  }
  
+ /** 
+ * Run the database update script if needed.
+ *
+ */
+ function stack_db_database_update()
+ { 
+   global $stack_mysql;
+   extract($stack_mysql);
+ 
+   // If the options exists we are in business.
+   $query = 'SELECT options FROM stackUser';
+ 
+   if (!$connection=mysql_connect($host,$user,$pswd)) {
+       $msg = mysql_error();
+       echo "<b>Could not connet to MYSQL on host '$host', as user '$user'.  The attempt to connect generated the MYSQL Error ".mysql_errno().": ".mysql_error()."</b>"; 
+       die();
+   }
+ 
+   $db = mysql_select_db($stackdb,$connection);
+ 
+   if (!$db) {
+       echo "<b>Could not connet to the MYSQL database '$stackdb' (on host '$host', as user '$user').  The attempt to connect generated the MYSQL Error ".mysql_errno().": ".mysql_error()."</b>"; 
+       die();   
+   }
+ 
+   $result = mysql_query($query);
+  
+   if(0 == $result) {
+     include('install/stackUpdateDatabase.php');
+     die();
+   } 
+ }
+ 
+ /*****
+ * Check if updates are necessary
+ **/
+ stack_db_database_update();
  
  ?>

Index: stackXML.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackXML.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** stackXML.php	18 Jul 2005 10:44:18 -0000	1.8
--- stackXML.php	18 Jul 2005 10:53:37 -0000	1.9
***************
*** 315,319 ****
  function stack_schema_create_metadata()
  {
!     global $stackQuestion, $sqlToSchemaMapping;     //use definitive stackQuestion data structure
      
      $xml = "";
--- 315,319 ----
  function stack_schema_create_metadata()
  {
!     global $sqlToSchemaMapping,$stackQuestion;      //use definitive stackQuestion data structure
      
      $xml = "";

Index: stackUtility.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackUtility.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** stackUtility.php	14 Jul 2005 18:31:23 -0000	1.28
--- stackUtility.php	18 Jul 2005 10:53:37 -0000	1.29
***************
*** 23,28 ****
  require_once("{$stack_root}/frontend_general/frontend_util.php");
  
- 
- 
  /** 
  * Displays the contents of an array for HTML display.
--- 23,26 ----

Index: stackQuestion.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackQuestion.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** stackQuestion.php	18 Jul 2005 10:44:18 -0000	1.26
--- stackQuestion.php	18 Jul 2005 10:53:37 -0000	1.27
***************
*** 274,279 ****
  $stackQuestion['questionFormat']['type']='meta';
  $stackQuestion['questionFormat']['values']=array('application','audio','image',
! 						 'message','model','text','video',
! 						 'multipart');
  $stackQuestion['questionFormat']['required']='optional';
  $stackQuestion['questionFormat']['mysql']='TINYTEXT';
--- 274,279 ----
  $stackQuestion['questionFormat']['type']='meta';
  $stackQuestion['questionFormat']['values']=array('application','audio','image',
!                          'message','model','text','video',
!                          'multipart');
  $stackQuestion['questionFormat']['required']='optional';
  $stackQuestion['questionFormat']['mysql']='TINYTEXT';
***************
*** 298,304 ****
  $stackQuestion['questionLearningContext']['type']='meta';
  $stackQuestion['questionLearningContext']['values']=array('Primary Education','Secondary Education','Higher Education',
! 							  'University First Cycle','University Second Cycle','University Post Grade',
! 							  'Technical School First Cycle','Technical School Second Cycle','Professional Formation',
! 							  'Continuous Formation','Vocational Training','unspecified');
  $stackQuestion['questionLearningContext']['required']='optional';
  $stackQuestion['questionLearningContext']['mysql']='TINYTEXT';
--- 298,304 ----
  $stackQuestion['questionLearningContext']['type']='meta';
  $stackQuestion['questionLearningContext']['values']=array('Primary Education','Secondary Education','Higher Education',
!                               'University First Cycle','University Second Cycle','University Post Grade',
!                               'Technical School First Cycle','Technical School Second Cycle','Professional Formation',
!                               'Continuous Formation','Vocational Training','unspecified');
  $stackQuestion['questionLearningContext']['required']='optional';
  $stackQuestion['questionLearningContext']['mysql']='TINYTEXT';
***************
*** 309,313 ****
  $stackQuestion['questionDifficulty']['type']='meta';
  $stackQuestion['questionDifficulty']['values']=array('Very Easy','Easy','Medium',
! 						     'Difficult','Very Difficult','unspecified');
  $stackQuestion['questionDifficulty']['required']='optional';
  $stackQuestion['questionDifficulty']['mysql']='TINYTEXT';
--- 309,313 ----
  $stackQuestion['questionDifficulty']['type']='meta';
  $stackQuestion['questionDifficulty']['values']=array('Very Easy','Easy','Medium',
!                              'Difficult','Very Difficult','unspecified');
  $stackQuestion['questionDifficulty']['required']='optional';
  $stackQuestion['questionDifficulty']['mysql']='TINYTEXT';
***************
*** 318,323 ****
  $stackQuestion['questionCompetency']['type']='meta';
  $stackQuestion['questionCompetency']['values']=array('think','argue','solve',
! 						     'represent','language','communicate',
! 						     'tools','unspecified');
  $stackQuestion['questionCompetency']['required']='optional';
  $stackQuestion['questionCompetency']['mysql']='TINYTEXT';
--- 318,323 ----
  $stackQuestion['questionCompetency']['type']='meta';
  $stackQuestion['questionCompetency']['values']=array('think','argue','solve',
!                              'represent','language','communicate',
!                              'tools','unspecified');
  $stackQuestion['questionCompetency']['required']='optional';
  $stackQuestion['questionCompetency']['mysql']='TINYTEXT';
***************
*** 328,332 ****
  $stackQuestion['questionCompetencyLevel']['type']='meta';
  $stackQuestion['questionCompetencyLevel']['values']=array('elementary','simpleConceptual','multiStep',
! 							  'complex','unspecified');
  $stackQuestion['questionCompetencyLevel']['required']='optional';
  $stackQuestion['questionCompetencyLevel']['mysql']='TINYTEXT';
--- 328,332 ----
  $stackQuestion['questionCompetencyLevel']['type']='meta';
  $stackQuestion['questionCompetencyLevel']['values']=array('elementary','simpleConceptual','multiStep',
!                               'complex','unspecified');
  $stackQuestion['questionCompetencyLevel']['required']='optional';
  $stackQuestion['questionCompetencyLevel']['mysql']='TINYTEXT';
***************
*** 344,348 ****
  $stackQuestion['questionExcerciseType']['type']='meta';
  $stackQuestion['questionExcerciseType']['values']=array('algebraicExpression','mcqSingleAnswer','mcqMultipleAnswer',
! 							'fillInBlank','unspecified');
  $stackQuestion['questionExcerciseType']['required']='optional';
  $stackQuestion['questionExcerciseType']['mysql']='TINYTEXT';
--- 344,348 ----
  $stackQuestion['questionExcerciseType']['type']='meta';
  $stackQuestion['questionExcerciseType']['values']=array('algebraicExpression','mcqSingleAnswer','mcqMultipleAnswer',
!                             'fillInBlank','unspecified');
  $stackQuestion['questionExcerciseType']['required']='optional';
  $stackQuestion['questionExcerciseType']['mysql']='TINYTEXT';