Changeset 302 for Dev/branches/rest-dojo-ui/server/classes/models/Survey.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/Survey.php (modified) (5 diffs)

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

@@ -32 +32 @@
         public function evaluate()
         {
+
                 if(is_string($this->creator))
                 {
-                        $result = User::get(array("uid" => $this->creator));    
+                        $crea = ResearchToolObject::stripUri($this->creator);
+                        $result = User::get(array("uid" => $crea["uid"]));      
                         if(!isset($result[0]))
                                 return false;
@@ -45 +47 @@
                         foreach($this->questions as $question)
                         {
-                                $result = Question::get(array("code" => $question));
+                                $ques = ResearchToolObject::stripUri($question);
+                                $result = Question::get(array("uid" => $ques["uid"]));
                                 if(!isset($result[0]))
                                         return false;
@@ -93 +96 @@
         
                 $predicateCreator = new Resource(CREATOR);
-                $surveyCreator = new Literal($this->creator->uid);
+                $surveyCreator = new Resource(USER . '/' . $this->creator->uid);
                 $model->add(new Statement($resourceSurvey, $predicateCreator, $surveyCreator));
 
@@ -100 +103 @@
             foreach($this->questions as $question)
             {
-                $questionUid = new Literal($question->uid);
+                                $questionUid = new Resource(QUESTION . '/' . $question->uid);
                 $predicateQuid = new Resource(HAS_QUESTION);
                 $model->add(new Statement($resourceSurvey,$predicateQuid,$questionUid));
@@ -145 +148 @@
             {
                                 $questions = Survey::getQuestions($model, $result['?uid']->label);
-                                $creator = $result['?creator']->label;
+                                $creator = $result['?creator']->uri;
                 $surveys[] = new Survey($result['?uid']->label, $result['?title']->label, $result['?description']->label, $creator, $questions);
             }