Changeset 271 for Dev/branches

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/Answer.php (modified) (3 diffs)
• server/classes/models/AnswerSet.php (modified) (1 diff)
• server/classes/models/Question.php (modified) (6 diffs)
• server/classes/models/SurveyInstance.php (copied) (copied from Dev/branches/jos-branch/server/classes/models/SurveyInstance.php) (5 diffs)
• server/rdfConstants.php (modified) (2 diffs)

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

@@ -11 +11 @@
  */
 class Answer extends ResearchToolObject {
+
+        /**
+         * static function create()
+         * @param type $obj : The object which should be converted to an Answer 
+         */
+        public static function create($obj)
+        {
+                return new Answer($obj->uid, $obj->question, $obj->values)
+        }
+
         public static $filename = 'data/results/answers.rdf';
 
@@ -40 +50 @@
                 if(is_string($this->question))
                 {
-                        $result = Question::get(array("code" => $this->question));
+                        $result = Question::get(array("uid" => $this->question));
                         if(!isset($result[0]))
                                 return false;
@@ -73 +83 @@
                 //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))

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

@@ -80 +80 @@
         public function save()
         {
-                //If evaluation fails, some references are incorrect.
-                //We shouldn't save in this case. Instead - let the user know. This function returns false if the evaluation has failed.
+                //If evaluation fails, some references are incorrect. We shouldn't save in this case.
                 //TODO: Decide how to fix invalid references graciously.
                 if(!$this->evaluate()) 

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

@@ -10 +10 @@
  */
 class Question extends ResearchToolObject{    
+
+        /**
+         * static function create()
+         * @param type $obj : The object which should be converted to a Question
+         */
+        public static function create($obj)
+        {
+                return new Question($obj->uid, $obj->code, $obj->title, $obj->type, $obj->description, $obj->category, $obj->answers);  
+        }
+
+
         private static $filename = 'data/questions/questions.rdf';
 
@@ -18 +29 @@
     public $category;
     public $answers; // format answers['#']
-    
+
+
     /**
      * Constructor for a Question. $uid equals the corresponding code.
@@ -28 +40 @@
      * @param type $answers 
      */
-    public function __construct($uid, $code = null, $title = null, $type = null, $description = null, $category = null, $answers = null)
+        public function __construct($uid = null, $code = null, $title = null, $type = null, $description = null, $category = null, $answers = null)
     {
                 if(!isset($uid))
@@ -68 +80 @@
         $model->add(new Statement($resourceQuestion,$predicateUid,$questionUid));
         
-        $questionQCode = new Literal($this->uid);
+        $questionQCode = new Literal($this->code);
         $predicateQCode = new Resource(QCODE);
         $model->add(new Statement($resourceQuestion,$predicateQCode,$questionQCode));
@@ -124 +136 @@
                 predicates:question_category ?category ;
                                 '. ResearchToolObject::createArguments($arguments) . '
-        }';
+                        }';
 
                 
         //Create the querystring 
         $results = $model->sparqlQuery($querystring);
-
         
         $questions = array();
@@ -144 +155 @@
     
     /**
-     * Gets the answers belonging to the given uid.
+     * Gets the preset answers belonging to the given uid.
      * @param type $uid : The uid of the Question in question (haha, pun).
      */

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);
                         }
                 }

Dev/branches/rest-dojo-ui/server/rdfConstants.php

@@ -25 +25 @@
 define('RESULTSET', SURVEYTOOL_RESOURCES_NAMESPACE . 'resultset');
 define('APPLICATIONINSTANCE', SURVEYTOOL_RESOURCES_NAMESPACE . 'applicationinstance');
+define('SURVEYINSTANCE', SURVEYTOOL_RESOURCES_NAMESPACE . 'surveyinstance');
 
 // Predicates used for RDF triples
@@ -65 +66 @@
 define('CREATIONDATE', SURVEYTOOL_PREDICATES_NAMESPACE . 'creationdate');
 define('OPEN', SURVEYTOOL_PREDICATES_NAMESPACE . 'open');
+define('OF_SURVEY', SURVEYTOOL_PREDICATES_NAMESPACE . 'of_survey');
+define('PRESET_ANSWER', SURVEYTOOL_PREDICATES_NAMESPACE . 'preset_answer');
 ?>