Changeset 302 for Dev/branches/rest-dojo-ui/server/classes/models/AnswerSet.php

Timestamp:

03/03/12 19:09:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Merge jos-branch 285:298

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server/classes/models/AnswerSet.php (modified) (7 diffs)

Dev/branches/rest-dojo-ui/server/classes/models/AnswerSet.php

@@ -46 +46 @@
                 if(is_string($this->survey))
                 {
-                        $result = Survey::get(array("uid" => $this->survey));
+                        $surv = ResearchToolObject::stripUri($this->survey);
+                        $result = Survey::get(array("uid" => $surv["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -53 +54 @@
                 if(is_string($this->respondent))
                 {
-                        $result = Respondent::get(array("uid" => $this->respondent));
+                        $resp = ResearchToolObject::stripUri($this->respondent);
+                        $result = Respondent::get(array("uid" => $resp["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -63 +65 @@
                         foreach($this->answers as $answer)
                         {
-                                $result = Answer::get(array("uid" => $answer));
+                                $answ = ResearchToolObject::stripUri($answer);
+                                $result = Answer::get(array("uid" => $answ["uid"]));
                                 if(!isset($result[0]))
                                         return false;
@@ -91 +94 @@
                 $model = ResearchToolObject::load(AnswerSet::$filename);
 
-
                 $resourceAnswerSet = new Resource(ANSWERSET . '/' . $this->uid);
                 //Remove the old value stored with the given id
@@ -105 +107 @@
                 $model->add(new Statement($resourceAnswerSet, $predicateId, $answerSetId));
 
-                $surveyId = new Literal($this->survey->uid);
+                $surveyId = new Resource(SURVEY . '/' . $this->survey->uid);
                 $predicateSurvey = new Resource(FOR_SURVEY);
                 $model->add(new Statement($resourceAnswerSet, $predicateSurvey, $surveyId));
 
-                $respondentId = new Literal($this->respondent->uid);
+                $respondentId = new Resource(RESPONDENT . '/' . $this->respondent->uid);
                 $predicateRespondent = new Resource(BY_RESPONDENT);
                 $model->add(new Statement($resourceAnswerSet, $predicateRespondent, $respondentId));
@@ -121 +123 @@
                         foreach($this->answers as $answer)
                         {
-                                $answerId = new Literal($answer->uid);
+                                $answerId = new Resource(ANSWER . '/' . $answer->uid);
                                 $predicateAnswer = new Resource(GIVEN_ANSWER);
                                 $model->add(new Statement($resourceAnswerSet, $predicateAnswer, $answerId));
@@ -160 +162 @@
                         foreach($results as $result)
                         {
-                                $survey = $result['?for_survey']->label;
-                                $respondent = $result['?by_respondent']->label;
+                                $survey = $result['?for_survey']->uri;
+                                $respondent = $result['?by_respondent']->uri;
                                 $datetime = new DateTime();
                                 $datetime->setTimestamp(intval($result['?datetime']->label));