Changeset 171 for Dev/trunk/classes/ApplicationConnector.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/ApplicationConnector.php (modified) (4 diffs)

Dev/trunk/classes/ApplicationConnector.php

@@ -11 +11 @@
  * @author jkraaijeveld
  */
-class ApplicationConnector implements IConnector{
+class ApplicationConnector extends Connector{
     
-    protected $model;
-    protected $fileName = 'data/applications/applications.rdf';
-
     /**
      * Constructor for ApplicationConnector.
@@ -21 +18 @@
     public function __construct()
     {
+                $this->fileName = 'data/applications/applications.rdf';
         //Ensure the required folder for this connector exists
         if (!is_dir('data/applications/'))
             mkdir('data/applications/');        
-    }
-    
-    /**
-     * 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'); 
     }
     
@@ -54 +31 @@
     public function get($arguments) {
         $this->load();
-        //Determine which arguments are supplied
-        $keys = array_keys($arguments);
-        //Set default values for arguments
-        $uid = ""; $title = ""; $description = ""; $style = "";
-        //Set the arguments if they are supplied
-        if(in_array("uid", $keys))
-            $uid = "predicates:uid \"".$arguments["uid"]."\"";
-        if(in_array("title", $keys))
-            $title = 'predicates:title \''.$arguments["title"].'\'';
-        if(in_array("description", $keys))
-            $description = "predicates:description \"".$arguments["description"]."\"";
-        if(in_array("style", $keys))
-            $style = "predicates:style \"".$arguments["style"]."\"";    
 
         //Create the querystring 
@@ -80 +44 @@
                                         predicates:description ?description ;
                                         predicates:style ?style ; '
-                    . $uid . $title . $description . $style . ' 
+                    . $this->createArguments($arguments) . ' 
             }';