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

Dev/trunk/classes/AnswerSetConnector.php

@@ -6 +6 @@
  * @author jkraaijeveld
  */
-class AnswerSetConnector implements IConnector{
-    protected $model;
-    protected $fileName = 'data/answers/answersets.rdf';
+class AnswerSetConnector extends Connector{
     protected $db;
 
@@ -16 +14 @@
         public function __construct()
         {
+                $this->fileName = 'data/answers/answersets.rdf';
                 //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'); 
         }
 
@@ -51 +28 @@
         {
                 $this->load();
-                
-                $keys = array_keys($arguments);
-                $uid = ""; $survey = ""; $respondent = ""; $answers = "";
-                if(in_array("uid", $keys))
-                        $uid = 'predicates:uid \''.$arguments["uid"].'\' ';
-                if(in_array("survey", $keys))
-                        $survey = 'predicates:for_survey \''.$arguments["survey"].'\' ';
-                if(in_array("respondent", $keys))
-                        $respondent = 'predicates:by_respondent \''.$arguments["respondent"].'\' ';
-                if(in_array("answers", $keys))
-                {
-                        foreach ($arguments["answers"] as $answer)
-                        {
-                                $answers = $answers . 'predicates:given_answer \'' . $answer . '\' ';
-                        }
-                }
 
                 //Build the query string
@@ -79 +40 @@
                                 predicates:for_survey ?for_survey ;
                                 predicates:by_respondent ?by_respondent ;
-                                ' . $uid . $survey . $respondent . $answers . '
+                                ' . $this->createArguments($arguments) . '
                         }';
-
                 //Query the model
                 $results = $this->model->sparqlQuery($querystring);
@@ -105 +65 @@
         private function getAnswers($uid)
         {
-                $querystring = '
-                        PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE .'>
-                        PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE .'>
-                        SELECT DISTINCT ?given_answer
-                        WHERE
-                        {
-                                _answerset predicates:resource_type resources:answerset ;
-                                predicates:given_answer ?given_answer ;
-                                predicates:uid \'' . $uid . '\'
-                        }';
-                $answers = $this->model->sparqlQuery($querystring);
-                $returnArray = array();
-                if(!empty($answers))
+                $result = $this->model->findRegex("[(".$uid.")]", "[(given_answer)]", null);
+                $iterator = $result->getStatementIterator();
+                $answers = array();
+                while($iterator->hasNext())
                 {
-                        foreach($answers as $answer)
-                        {
-                                $answerR = $this->db->get("answer", array("uid" => $answer["?given_answer"]->label));
-                                $returnArray[] = $answerR[0];
-                        }
+                        $element = $iterator->next();
+                        $answersR = $this->db->get("answer", array("uid" => $element->getLabelObject()));
+                        $answers[] = $answersR[0];
                 }
-                return $returnArray;
+                return $answers;
         }