[Stack-cvs] stack-dev/opaque/datatypes QuestionListDT.php, 1.4, 1.4.4.1 StackQuestionPageDT.php, 1.5, 1.5.2.1 StackDeployedInstancesDT.php, 1.2, 1.2.4.1

[Ben H. <bdv...@us...>]

Update of /cvsroot/stack/stack-dev/opaque/datatypes
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29766/opaque/datatypes

Modified Files:
      Tag: question_reporting
	QuestionListDT.php StackQuestionPageDT.php 
	StackDeployedInstancesDT.php 
Log Message:
Merging from the current HEAD into question_reporting. Apologies in advance if this all goes horribly wrong.

Index: StackDeployedInstancesDT.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/datatypes/StackDeployedInstancesDT.php,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -d -r1.2 -r1.2.4.1
*** StackDeployedInstancesDT.php	23 Jun 2009 14:39:37 -0000	1.2
--- StackDeployedInstancesDT.php	22 Nov 2010 23:05:52 -0000	1.2.4.1
***************
*** 23,33 ****
      /* string */
      public $qNote;
      public $seed; // generation seed (not deployment selection seed!)
  
!     public function __construct($id, $qNote, $seed)
      {
          $this->id = $id;
          $this->qNote = $qNote;
          $this->seed = $seed;
      }
  }
--- 23,37 ----
      /* string */
      public $qNote;
+     public $xhtml;
      public $seed; // generation seed (not deployment selection seed!)
+     public $isPrimed; // are responses for question tests pre-cached?
  
!     public function __construct($id, $qNote, $xhtml, $seed, $isPrimed)
      {
          $this->id = $id;
          $this->qNote = $qNote;
+         $this->xhtml = $xhtml;
          $this->seed = $seed;
+         $this->isPrimed = $isPrimed;
      }
  }

Index: StackQuestionPageDT.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/datatypes/StackQuestionPageDT.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** StackQuestionPageDT.php	27 Aug 2009 16:04:07 -0000	1.5
--- StackQuestionPageDT.php	22 Nov 2010 23:05:52 -0000	1.5.2.1
***************
*** 28,34 ****
      public $categories;
      /* array */
!     public $publicQuestions;
  
!     public function __construct($questionItems, $xhtml, $head, $categories)
      {
          $this->questionItems = $questionItems;
--- 28,36 ----
      public $categories;
      /* array */
!     public $publicQuestions; // not used?
!     /* array */
! 	public $keywords;
  
!     public function __construct($questionItems, $xhtml, $head, $categories, $keywords)
      {
          $this->questionItems = $questionItems;
***************
*** 36,39 ****
--- 38,42 ----
          $this->head = $head;
          $this->categories = $categories;
+         $this->keywords = $keywords;
      }
  }

Index: QuestionListDT.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/datatypes/QuestionListDT.php,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** QuestionListDT.php	23 Jun 2009 14:39:37 -0000	1.4
--- QuestionListDT.php	22 Nov 2010 23:05:52 -0000	1.4.4.1
***************
*** 35,40 ****
      /* int */
      public $nodeployed;
  
!     public function __construct($id, $name, $description, $valid, $dateEdited, $moodleCategories, $published, $nodeployed)
      {
          $this->id = $id;
--- 35,42 ----
      /* int */
      public $nodeployed;
+     /* array */
+     public $keywords;
  
!     public function __construct($id, $name, $description, $valid, $dateEdited, $moodleCategories, $published, $nodeployed, $keywords)
      {
          $this->id = $id;
***************
*** 46,49 ****
--- 48,52 ----
          $this->published = $published;
          $this->nodeployed = $nodeployed;
+         $this->keywords = $keywords;
      }
  }