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

Dev/trunk/classes/AnswerConnector.php

@@ -10 +10 @@
  * @author jkraaijeveld
  */
-class AnswerConnector implements IConnector{
-    protected $model;
-        protected $fileName = 'data/answers/answers.rdf';
+class AnswerConnector extends Connector{
         protected $db;
     
@@ -21 +19 @@
         //Ensure the required folder for this connector exists
         if (!is_dir('data/answers/'))
-            mkdir('data/answers/');
-    }
-    
-    /**
-     * 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'); 
+                        mkdir('data/answers/');
+                $this->fileName = 'data/answers/answers.rdf';
     }
     
@@ -53 +31 @@
         {
                 $this->load();
-                $keys = array_keys($arguments);
-                $uid = ""; $question = ""; $value = ""; 
-                if(in_array("uid", $keys))
-                        $uid = 'predicates:uid \''.$arguments["uid"].'\'';
-                if(in_array("question", $keys))
-                        $question = 'predicates:question_code \''.$arguments["question"].'\'';
-                if(in_array("values", $keys))
-                {
-                        foreach ($arguments["values"] as $val)
-                        {
-                                $value = $value . 'predicates:answered \'' . $val . '\' ';
-                        }
-                }
                 //Create the querystring
                 $querystring = '
@@ -77 +42 @@
                                 predicates:uid ?uid ;
                                 predicates:question_code ?question_code ;
-                                ' . $uid . $question . $value . '
+                                ' . $this->createArguments($arguments) . '
                         }';
 
@@ -89 +54 @@
                         foreach($results as $result)
                         {
-                                $values = $this->getValues($result['?uid']->label);
-                                $questionResult = $this->db->get("question", array("uid" => $result['?question_code']->label));
-                                $answers[] = new Answer($result['?uid']->label, $questionResult[0], $values);
+                                $questionResult = $this->db->get("question", array("code" => $result['?question_code']->label));
+                                $answers[] = new Answer($result['?uid']->label, $questionResult[0], $this->getValues($result['?uid']->label));
                         }
                 }
                 return $answers;
+        }
 
-        }
         /**
          * function getValues()
@@ -103 +67 @@
         private function getValues($uid)
         {
-                $querystring = '
-                        PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
-                        PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT DISTINCT ?answered
-                        WHERE 
-                        {
-                                _answer predicates:resource_type resources:answer ;
-                                predicates:answered ?answered ;
-                                predicates:uid \''. $uid . '\'
-                }';
-                $values = $this->model->sparqlQuery($querystring);
-                $returnArray = array();
-                if(!empty($values))
+                $result = $this->model->findRegex("[(".$uid.")]", "[(answered)]", null);
+                $iterator = $result->getStatementIterator();
+                $values = array();
+                while($iterator->hasNext())
                 {
-                        foreach($values as $value)
-                        {
-                                $returnArray[] = $value['?answered']->label;
-                        }
+                        $element = $iterator->next();
+                        $values[] = $element->getLabelObject();
                 }
-                return $returnArray;
+                return $values;
         }