Changeset 269 for Dev/branches/jos-branch/server

Timestamp:

02/17/12 16:29:20 (13 years ago)

Author:

jkraaijeveld

Message:

Added create() methods to Answer and Question

Location:

Dev/branches/jos-branch/server/classes/models

Files:

• Answer.php (modified) (1 diff)
• Question.php (modified) (3 diffs)
• SurveyInstance.php (modified) (5 diffs)

Dev/branches/jos-branch/server/classes/models/Answer.php

@@ -11 +11 @@
  */
 class Answer extends ResearchToolObject {
+
+        /**
+         * static function create()
+         * @param type $obj : The object which should be converted to an Answer 
+         */
+        public static function create($obj)
+        {
+                return new Answer($obj->uid, $obj->question, $obj->values)
+        }
+
         public static $filename = 'data/results/answers.rdf';
 

Dev/branches/jos-branch/server/classes/models/Question.php

@@ -10 +10 @@
  */
 class Question extends ResearchToolObject{    
+
+        /**
+         * static function create()
+         * @param type $obj : The object which should be converted to a Question
+         */
+        public static function create($obj)
+        {
+                return new Question($obj->uid, $obj->code, $obj->title, $obj->type, $obj->description, $obj->category, $obj->answers);  
+        }
+
+
         private static $filename = 'data/questions/questions.rdf';
 
@@ -18 +29 @@
     public $category;
     public $answers; // format answers['#']
-    
+
+
     /**
      * Constructor for a Question. $uid equals the corresponding code.
@@ -28 +40 @@
      * @param type $answers 
      */
-    public function __construct($uid, $code = null, $title = null, $type = null, $description = null, $category = null, $answers = null)
+        public function __construct($uid = null, $code = null, $title = null, $type = null, $description = null, $category = null, $answers = null)
     {
                 if(!isset($uid))

Dev/branches/jos-branch/server/classes/models/SurveyInstance.php

@@ -26 +26 @@
      * @param type $answersets: A list of answersets.
      */
-    public function __construct($uid = null, $survey = null, $starttime = null, $endtime = null, $open = false, $presetanswers = null, $answersets = null)
+    public function __construct($uid, $survey, $starttime, $endtime, $open, $presetanswers, $answersets)
     {
         if(!isset($uid))
@@ -40 +40 @@
         $this->presetanswers = $presetanswers;
         $this->answersets = $answersets;
-    }
+        }
+
 
     /**
@@ -120 +121 @@
         $model->add(new Statement($resourceSI, $predicateId, $SIID));
         
-        $SISurvey = new Literal($this->survey->uid);
+        $SISurvey = new Resource(SURVEY . '/' . $this->survey->uid);
         $predicateSurvey = new Resource(OF_SURVEY);
         $model->add(new Statement($resourceSI, $predicateSurvey, $SISurvey));
@@ -167 +168 @@
         {
                 $model = ResearchToolObject::load(SurveyInstance::$filename);
-
                 //Build the query string
                 $querystring = '
@@ -200 +200 @@
                                 $presetAnswers = SurveyInstance::getPresetAnswers($model, $result['?uid']->label);
                                 $answerSets = SurveyInstance::getAnswerSets($model, $result['?uid']->label);
-                                $sInstances[] = new SurveyInstance($result['?uid']->label, $result['?of_survey']->label, $startTime, $endTime, $open, $presetAnswers, $answerSets);
+                                $sInstances[] = new SurveyInstance($result['?uid']->label, $result['?of_survey']->uri, $startTime, $endTime, $open, $presetAnswers, $answerSets);
                         }
                 }