Changeset 233 for Dev/branches/jos-branch/classes/models

Timestamp:

01/13/12 13:57:41 (13 years ago)

Author:

fpvanagthoven

Message:

 

Location:

Dev/branches/jos-branch/classes/models

Files:

• Question.php (modified) (7 diffs)
• ResearchToolObject.php (modified) (1 diff)

Dev/branches/jos-branch/classes/models/Question.php

@@ -12 +12 @@
         private static $filename = 'data/questions/questions.rdf';
 
+    public $code;
     public $title;
     public $type;
@@ -27 +28 @@
      * @param type $answers 
      */
-    public function __construct($uid, $title = null, $type = null, $description = null, $category = null, $answers = null)
+    public function __construct($uid, $code = null, $title = null, $type = null, $description = null, $category = null, $answers = null)
     {
                 if(!isset($uid))
@@ -33 +34 @@
                         $uid = md5(uniqid(rand(), true));
                 }
+        $this->code = $code;
         $this->uid = $uid;
         $this->title = $title;
@@ -61 +63 @@
         $predicateRType = new Resource(RTYPE);
         $model->add(new Statement($resourceQuestion,$predicateRType,$resourceQuestionType));
+        
+        $questionUid = new Literal($this->uid);
+        $predicateUid = new Resource(UID);
+        $model->add(new Statement($resourceQuestion,$predicateUid,$questionUid));
         
         $questionQCode = new Literal($this->uid);
@@ -98 +104 @@
      * Get the questions corresponding to the arguments.
          * @param type $arguments : An array having one ore more of the following elements:
-         * 'code', 'title', 'type', 'description', 'category', 'definedanswers'.
+         * 'uid', 'code', 'title', 'type', 'description', 'category', 'definedanswers'.
      */
     public static function get($arguments)
@@ -107 +113 @@
             PREFIX  predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
             PREFIX  resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-            SELECT DISTINCT ?uid, ?title, ?type, ?description, ?category
+            SELECT DISTINCT ?uid, ?code, ?title, ?type, ?description, ?category
             WHERE       
             {
                 _question       predicates:resource_type        resources:question ;                
-                predicates:question_code ?uid ;
+                predicates:uid ?uid ;
+                predicates:question_code ?code ;
                 predicates:title ?title ;
                 predicates:question_type ?type ;
@@ -130 +137 @@
             {
                                 $answers = Question::getAnswers($model, $result['?uid']->label);
-                $questions[] = new Question($result['?uid']->label, $result['?title']->label, $result['?type']->label, $result['?description']->label, $result['?category']->label, $answers);
+                $questions[] = new Question($result['?uid']->label, $result['?code']->label, $result['?title']->label, $result['?type']->label, $result['?description']->label, $result['?category']->label, $answers);
             }
         }

Dev/branches/jos-branch/classes/models/ResearchToolObject.php

@@ -5 +5 @@
  * @author jkraaijeveld
  */
+// Survey database interface class as intermediate for storing data from the site to the RDF database 
+require_once 'rdfConstants.php';
+// Include RAP Library to write RDF files
+include(RDFAPI_INCLUDE_DIR . "RDFAPI.php");
+
+
 abstract class ResearchToolObject {