stack-cvs

[Simon H. <sim...@us...>]

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

Modified Files:
      Tag: item_state_separation
	QuestionListDT.php StackQuestionPageDT.php 
Log Message:
Brought back up to date with big HEAD merge.

Index: QuestionListDT.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/datatypes/QuestionListDT.php,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -C2 -d -r1.4 -r1.4.10.1
*** QuestionListDT.php	23 Jun 2009 14:39:37 -0000	1.4
--- QuestionListDT.php	9 Nov 2010 16:51:39 -0000	1.4.10.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;
      }
  }

Index: StackQuestionPageDT.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/opaque/datatypes/StackQuestionPageDT.php,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -C2 -d -r1.5 -r1.5.8.1
*** StackQuestionPageDT.php	27 Aug 2009 16:04:07 -0000	1.5
--- StackQuestionPageDT.php	9 Nov 2010 16:51:39 -0000	1.5.8.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;
      }
  }