Changeset 130 for Dev/branches/jos-branch/classes

Timestamp:

10/24/11 13:47:23 (14 years ago)

Author:

jkraaijeveld

Message:

Added support for questions and users

Location:

Dev/branches/jos-branch/classes

Files:

• Application.php (modified) (2 diffs)
• ApplicationConnector.php (modified) (4 diffs)
• DatabaseInterface.php (modified) (1 diff)
• Question.php (modified) (1 diff)
• ResearchToolObject.php (modified) (1 diff)
• Survey.php (deleted)

Dev/branches/jos-branch/classes/Application.php

@@ -14 +14 @@
     public function __construct($uid = null, $title = null, $description = null, $style = null) 
     {
+        if(!isset ($uid))
+        {
+            $uid = md5(uniqid(rand(), true));
+        }
         $this->uid = $uid;
         $this->title = $title;
@@ -19 +23 @@
         $this->style = $style;
     }
-    
-    public static function getApplication($info)
-    {
-        return new Application(
-                $info['applicationID'],
-                $info['applicationTitle'],
-                $info['applicationDescription'],
-                $info['applicationStyle']);
-    }
 
 }

Dev/branches/jos-branch/classes/ApplicationConnector.php

@@ -61 +61 @@
         //Set the arguments if they are supplied
         if(in_array("uid", $keys))
-            $uid = "\"".$arguments["id"]."\"";
+            $uid = "\"".$arguments["uid"]."\"";
         if(in_array("title", $keys))
             $title = '\''.$arguments["title"].'\'';
@@ -81 +81 @@
                                         predicates:description ?description ;
                                         predicates:style ?style ;
-                                        predicates:uid ' . $uid . ' 
+                                        predicates:uid ' . $uid . ' 
                                         predicates:title ' . $title . ' 
                                         predicates:description ' . $description . ' 
-                                        predicates:style ' . $style . ' 
+                                        predicates:style ' . $style . '
             }';
 
         //Query the model
         $results = $this->model->sparqlQuery($querystring);
-                if(!empty($results))
-                        {
-                        $applications = array();
-                        //Run over all results and create appropriate Application objets
-                        foreach($results as $result)
-                        { 
-                                $applications[] = new Application($result['?uid']->label, $result['?title']->label, $result['?description']->label, $result['?style']->label);
-                        }
-                        //Return the list of application objects
-                        return $applications;
-                }
-                else
-                {
-                        return array();
-                }
+        $applications = array();
+        if(!empty($results))
+        {
+            //Run over all results and create appropriate Application objets
+            foreach($results as $result)
+            { 
+                    $applications[] = new Application($result['?uid']->label, $result['?title']->label, $result['?description']->label, $result['?style']->label);
+            }
+        }
+        return $applications;
     }
     
@@ -114 +109 @@
     public function set($rToolObject)
     {
+        $this->load();
         $resourceApplication = new Resource(APPLICATION.'/'.$rToolObject->uid);
-                //Remove the old value stored with the given id
-                $this->model->subtract($this->model->find($resourceApplication, null, null));
-                
-                //Add the new statements to the model
+        //Remove the old value stored with the given id
+        $this->model->subtract($this->model->find($resourceApplication, null, null));
+
+        //Add the new statements to the model
         $resourceApplicationType = new Resource(APPLICATION);
         $predicateRType = new Resource(RTYPE);
@@ -139 +135 @@
         $this->model->add(new Statement($resourceApplication,$predicateStyle,$applicationStyle));
                 
-                $this->save();
+        $this->save();
     }
 }

Dev/branches/jos-branch/classes/DatabaseInterface.php

@@ -17 +17 @@
      * Constructor for the DatabaseInterface class
      */
-    protected $applicationConnector;
+    private $applicationConnector;
+    private $questionConnector;
+    private $userConnector;
     
+    /**
+     * Constructor for DatabaseInterface.
+     * Initializes all the connectors.
+     */
     public function __construct() {
         $this->applicationConnector = new ApplicationConnector();
+        $this->questionConnector = new QuestionConnector();
+        $this->userConnector = new UserConnector();
     }
     
+    /**
+     * Get the data corresponding to the given type and arguments
+     * @param type $type
+     * @param type $arguments
+     * @return type 
+     */
     public function get($type, $arguments)
     {
-        switch($type)
+        switch(strtolower($type))
         {
             case "application":
                 return $this->applicationConnector->get($arguments);
-            
+                break;
+            case "question":
+                return $this->questionConnector->get($arguments);
+                break;
+            case "user":
+                return $this->userConnector->get($arguments);
+                break;
         }
     }
         
-        public function set($rToolObject)
-        {
-                switch(get_class($rToolObject))
-                {
-                        case "Application":
-                                $this->applicationConnector->set($rToolObject);
-                }
-        }
-        
+    /**
+     * Saves the given object based on its class.
+     * @param type $rToolObject 
+     */
+    public function set($rToolObject)
+    {
+        switch(get_class($rToolObject))
+        {
+            case "Application":
+                $this->applicationConnector->set($rToolObject);
+                break;
+            case "Question":
+                $this->questionConnector->set($rToolObject);
+                break;
+            case "User":
+                $this->userConnector->set($rToolObject);
+                break;
+        }
+    }
+    
+    /**
+     * Saves all the objects in the given array, assuming they are 
+     * valid ResearchToolObjects.
+     * @param type $rToolObjects 
+     */
+    public function batchSet($rToolObjects)
+    {
+        foreach ($rToolObjects as $rToolObject)
+        {
+            $this->set($rToolObject);
+        }
+    }
+
         
 }

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

@@ -11 +11 @@
  * @author fpvanagthoven
  */
-class Question {    
-    public $code;
+class Question extends ResearchToolObject{    
     public $title;
     public $type;
     public $description;
+    public $category;
     public $answers; // format answers['#']
-    public $category;
     
-    public function __construct($code, $title = null, $type = null, $description = null)
+    /**
+     * Constructor for a Question. $uid equals the corresponding code.
+     * @param type $uid
+     * @param type $title
+     * @param type $type
+     * @param type $description
+     * @param type $category
+     * @param type $answers 
+     */
+    public function __construct($uid, $title = null, $type = null, $description = null, $category = null, $answers = null)
     {
-        $this->code = $code;
+        $this->uid = $uid;
         $this->title = $title;
         $this->type = $type;
         $this->description = $description;
-        $this->answers = array();
+        $this->category =  $category;
+        $this->answers = $answers;
     }
-    
-    /* reminder that constructor doesn't contain category haha */
-    public function setCategory($category)
-    {
-        $this->category = $category;
-    }
-    
-    public static function getQuestion($code, $info)
-    {
-        $question = new Question($code);
-        $question->title = $info['questionTitle'];
-        $question->type = $info['questionType'];
-        if(isset($info['questionDescription']))
-            $question->description = $info['questionDescription'];
-        $question->category = $info['questionCategory'];
-        
-        $i = 1;
-        while (isset($info['ans' . $i]))
-        {
-            array_push($question->answers, $info['ans' . $i]);
-            $i++;
-        }
-        
-        return $question;
-    }
-
 }
 

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

@@ -6 +6 @@
  */
 class ResearchToolObject {
-    private $uid;
+    public $uid;
 }