Changeset 271 for Dev/branches/rest-dojo-ui/server/classes/models/SurveyInstance.php

Timestamp:

02/19/12 11:31:11 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Merged changes from jos-branch:268,269 to rest-dojo-ui.

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server (modified) (1 prop)
• server/classes/models (modified) (1 prop)
• server/classes/models/SurveyInstance.php (copied) (copied from Dev/branches/jos-branch/server/classes/models/SurveyInstance.php) (5 diffs)

Dev/branches/rest-dojo-ui/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);
                         }
                 }