Changeset 171 for Dev/trunk/classes/UserConnector.php

Timestamp:

12/02/11 15:26:01 (13 years ago)

Author:

jkraaijeveld

Message:

Iteration of refactoring in the Connector code.

• Abstracted load() and save() to a new superclass Connector. Every connector extends Connector.
• Query arguments are now correctly created by Connector's createArguments() function, removing redundant if/if/if statements in every get() function.
• Every sidefunction which previously used a seperate query to get data now uses the RAP findRegex method, should increase performance.
• Question arguments have been changed slightly: 'uid' is now 'code' and 'answers' is now 'definedanswers' to avoid confusion.

File:

• Dev/trunk/classes/UserConnector.php (modified) (3 diffs)

Dev/trunk/classes/UserConnector.php

@@ -10 +10 @@
  * @author jkraaijeveld
  */
-class UserConnector implements IConnector{
-    
-    protected $model;
-    protected $fileName = 'data/users/users.rdf';
+class UserConnector extends Connector{
     
     /**
-     * Constructor for RespondentConnector.
+     * Constructor for UserConnector.
      */
     public function __construct()
     {
+                $this->fileName = 'data/users/users.rdf';
         //Ensure the required folder for this connector exists
         if (!is_dir('data/users/'))
             mkdir('data/users/');       
-    }
-    
-    /**
-     * function load()
-     * Loads the file into the standard MemModel.
-     */
-    public function load() {
-        //Get the Memory Model from the ModelFactory
-        $this->model = ModelFactory::getDefaultModel();
-        //Ensure the required file exists before loading
-        if(file_exists($this->fileName))
-            $this->model->load($this->fileName);
-    }
-    
-    /**
-     * function save()
-     * Saves the MemModel into the given file.
-     */
-    public function save() {
-        $this->model->saveAs($this->fileName,'rdf'); 
     }
     
@@ -53 +31 @@
     public function get($arguments) {
         $this->load();
-        //Determine which arguments are supplied
-        $keys = array_keys($arguments);
-        //Set default values for arguments
-        $uid = ""; $name = ""; $password = "";
-        //Set the arguments if they are supplied
-        if(in_array("uid", $keys))
-            $uid = "predicates:uid \"".$arguments["uid"]."\"";
-        if(in_array("name", $keys))
-            $name = 'predicates:name \''.$arguments["name"].'\'';
-        if(in_array("password", $keys))
-            $password = "predicates:password \"".$arguments["password"]."\"";
-       
         //Create the querystring 
         $querystring = '
@@ -76 +42 @@
                                         predicates:name ?name ;
                                         predicates:password ?password ;
-                                        ' . $uid . $name . $password . '
+                                        ' . $this->createArguments($arguments) . '
             }';
         //Query the model
-        $results = $this->model->sparqlQuery($querystring);
+                $results = $this->model->sparqlQuery($querystring);
         $users = array();
         if(!empty($results))