Changeset 268

Timestamp:

02/17/12 13:21:55 (13 years ago)

Author:

jkraaijeveld

Message:

Implemented SurveyInstance?

Location:

Dev/branches/jos-branch/server

Files:

• . (modified) (1 prop)
• classes/models (modified) (1 prop)
• classes/models/Answer.php (modified) (2 diffs)
• classes/models/AnswerSet.php (modified) (1 diff)
• classes/models/Question.php (modified) (3 diffs)
• classes/models/SurveyInstance.php (added)
• rdfConstants.php (modified) (2 diffs)

Dev/branches/jos-branch/server/classes/models/Answer.php

@@ -40 +40 @@
                 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 +73 @@
                 //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/jos-branch/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/jos-branch/server/classes/models/Question.php

@@ -68 +68 @@
         $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 +124 @@
                 predicates:question_category ?category ;
                                 '. ResearchToolObject::createArguments($arguments) . '
-        }';
+                        }';
 
                 
         //Create the querystring 
         $results = $model->sparqlQuery($querystring);
-
         
         $questions = array();
@@ -144 +143 @@
     
     /**
-     * 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/jos-branch/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');
 ?>