Changeset 302 for Dev/branches/rest-dojo-ui/server/classes/models/SurveyInstance.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/SurveyInstance.php (modified) (11 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 = null, $presetanswers = null, $answersets = null)
+        public function __construct($uid = null, $survey = null, $starttime = null, $endtime = null, $open = 0, $presetanswers = null, $answersets = null)
     {
         if(!isset($uid))
@@ -37 +37 @@
         $this->starttime = $starttime;
         $this->endtime = $endtime;
-        $this->open = $open;
+                $this->open = $open;
         $this->presetanswers = $presetanswers;
         $this->answersets = $answersets;
@@ -51 +51 @@
         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]))
             {
@@ -65 +66 @@
                 foreach($this->presetanswers as $answer)
                 {
-                        $result = Answer::get(array("uid" => $answer));
+                                                $ans = ResearchToolObject::stripUri($answer);
+                        $result = Answer::get(array("uid" => $ans["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -79 +81 @@
                 foreach($this->answersets as $answerSet)
                 {
-                        $result = AnswerSet::get(array("uid" => $answerSet));
+                                                $aset = ResearchToolObject::stripUri($answerSet);
+                        $result = AnswerSet::get(array("uid" => $aset["uid"]));
                         if(!isset($result[0]))
                         {
@@ -132 +135 @@
         $predicateEndTime = new Resource(ENDTIME);
         $model->add(new Statement($resourceSI, $predicateEndTime, $SIEndTime));
-
-        $SIOpen = new Literal($this->open);
+        $SIOpen = new Literal((bool) $this->open);
         $predicateOpen = new Resource(OPEN);
         $model->add(new Statement($resourceSI, $predicateOpen, $SIOpen));
@@ -141 +143 @@
                 foreach($this->presetanswers as $answer)
                 {
-                        $answerId = new Literal($answer->uid);
+                        $answerId = new Resource(ANSWER . '/' . $answer->uid);
                         $predicateAnswer = new Resource(PRESET_ANSWER);
                         $model->add(new Statement($resourceSI, $predicateAnswer, $answerId));
@@ -151 +153 @@
                 foreach($this->answersets as $answer)
                 {
-                        $answerSetId = new Literal($answer->uid);
+                        $answerSetId = new Resource(ANSWERSET . '/' . $answer->uid);
                         $predicateAnswerSet = new Resource(HAS_ANSWERSET);
                         $model->add(new Statement($resourceSI, $predicateAnswerSet, $answerSetId));
@@ -163 +165 @@
         * Gets the array of SurveyInstance objects belonging tothe arguments supplied.
         * @param type $arguments: An array containing zero or more of the following keys:
-        *                                                 'uid', 'of_survey', 'starttime', 'endtime', 'open', 'preset_answers', 'has_answerset'
+        *                                                 'uid', 'of_survey', 'starttime', 'endtime', 'open', 'preset_answers', 'answersets'
         */
         public static function get($arguments)
@@ -195 +197 @@
                                 $endTime = new DateTime();
                                 $endTime->setTimestamp(intval($result['?endtime']->label));
-                                $open = false;
-                                if ($result['?open'] == 'true')
-                                        $open = true;
-                                $presetAnswers = SurveyInstance::getPresetAnswers($model, $result['?uid']->label);
-                                $answerSets = SurveyInstance::getAnswerSets($model, $result['?uid']->label);
-                                $sInstances[] = new SurveyInstance($result['?uid']->label, $result['?of_survey']->uri, $startTime, $endTime, $open, $presetAnswers, $answerSets);
+                                $open = (bool) $result['?open'];
+                                $fields = SurveyInstance::getFields($model, $result['?uid']->label);
+                                $sInstances[] = new SurveyInstance($result['?uid']->label, $result['?of_survey']->uri, $startTime, $endTime, $open, $fields[0], $fields[1]);
                         }
                 }
@@ -207 +206 @@
 
         /**
-         * function getPresetAnswers()
+         * function getFields()
          * @param type $model : The RDF model to query against.
-         * @param type $uid : The UID of the SurveyInstance for which the preset answers should be retrieved.
+         * @param type $uid : The UID of the SurveyInstance for which the preset answers and answersets should be retrieved.
+         * returns : an array with [0] => all preset answers and [1] => all answersets.
          */
-        private static function getPresetAnswers($model, $uid)
+        private static function getFields($model, $uid)
         {
-                $result = $model->findRegex("[(".$uid.")]", "[(preset_answer)]", null);
+                $result = $model->findRegex("[(".$uid.")]", "[(preset_answer)|(has_answerset)]", null);
                 $iterator = $result->getStatementIterator();
                 $answers = array();
+                $sets = array();
                 while($iterator->hasNext())
                 {
                         $element = $iterator->next();
-                        $answers[] = $element->getLabelObject();
+                        if($element->getLabelPredicate() == PRESET_ANSWER)
+                                $answers[] = $element->getLabelObject();
+                        else if($element->getLabelPredicate() == HAS_ANSWERSET)
+                                $sets[] = $element->getLabelObject();
                 }
-                return $answers;
-        }
-
-        /**
-         * function getAnswerSets()
-         * @param type $model : The RDF model to query against.
-         * @param type $uid : The UID of the SurveyInstance for which the preset answers should be retrieved.
-         */
-        private static function getAnswerSets($model, $uid)
-        {
-                $result = $model->findRegex("[(".$uid.")]", "[(has_answerset)]", null);
-                $iterator = $result->getStatementIterator();
-                $answersets = array();
-                while($iterator->hasNext())
-                {
-                        $element = $iterator->next();
-                        $answersets[] = $element->getLabelObject();
-                }
-                return $answersets;
+                return array($answers, $sets);
         }