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

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

@@ -50 +50 @@
                 if(is_string($this->question))
                 {
-                        $result = Question::get(array("uid" => $this->question));
+                        $ans = ResearchToolObject::stripUri($this->question);
+                        $result = Question::get(array("uid" => $ans["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -71 +72 @@
                         PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
                         PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT DISTINCT ?uid, ?question_code
+                        SELECT DISTINCT ?uid, ?to_question
                         WHERE
                         {
@@ -77 +78 @@
 
                                 predicates:uid ?uid ;
-                                predicates:question_code ?question_code ;
+                                predicates:to_question ?to_question ;
                                 ' . ResearchToolObject::createArguments($arguments) . '
                         }';
@@ -83 +84 @@
                 //Query the model
                 $results = $model->sparqlQuery($querystring);   
-        //An answer can have multiple values, get all these values for the answer instances found.
+                //An answer can have multiple values, get all these values for the answer instances found.
                 $answers = array();
                 if(!empty($results))
@@ -89 +90 @@
                         foreach($results as $result)
                         {
-                                $answers[] = new Answer($result['?uid']->label, $result['?question_code']->label, Answer::getValues($model, $result['?uid']->label));
+                                $answers[] = new Answer($result['?uid']->label, $result['?to_question']->uri, Answer::getValues($model, $result['?uid']->label));
                         }
                 }
@@ -142 +143 @@
                 $model->add(new Statement($resourceAnswer, $predicateId, $answerId));
 
-                $questionId = new Literal($this->question->uid);
-                $predicateQId = new Resource(QCODE);
+                $questionId = new Resource(QUESTION . '/' . $this->question->uid);
+                $predicateQId = new Resource(TO_QUESTION);
                 $model->add(new Statement($resourceAnswer, $predicateQId, $questionId));