Changeset 159 for Dev/trunk/classes

Timestamp:

11/18/11 11:35:13 (13 years ago)

Author:

jkraaijeveld

Message:

Added a creator to Session. Remember to remove your current database file for Sessions.

Location:

Dev/trunk/classes

Files:

• Session.php (modified) (3 diffs)
• SessionConnector.php (modified) (5 diffs)

Dev/trunk/classes/Session.php

@@ -9 +9 @@
 {
         public $title;
+        public $creator;
         public $datetime;
         public $pipeline;
@@ -18 +19 @@
          * @param type $uid
          * @param type $title
+         * @param type $creator
          * @param type $datetime
          * @param type $pipeline
          */
-        public function __construct($uid = null, $title = null, $datetime = null, $pipeline = null, $answersets = null)
+        public function __construct($uid = null, $title = null, $creator = null, $datetime = null, $pipeline = null, $answersets = null)
         {
                 if(!isset($uid))
@@ -29 +31 @@
                 $this->uid = $uid;
                 $this->title = $title;
+                $this->creator = $creator;
                 $this->datetime = $datetime;
                 $this->pipeline = $pipeline;

Dev/trunk/classes/SessionConnector.php

@@ -56 +56 @@
 
                 $keys = array_keys($arguments);
-                $uid = ""; $title = ""; $datetime = ""; $applications = ""; $surveys = ""; $answersets = "";
+                $uid = ""; $title = ""; $creator = ""; $datetime = ""; $applications = ""; $surveys = ""; $answersets = "";
                 if(in_array("uid", $keys))
                         $uid = 'predicates:uid \''.$arguments["uid"].'\' ';
                 if(in_array("title", $keys))
                         $title = 'predicates:title \''.$arguments["title"].'\' ';
+                if(in_array("creator", $keys))
+                        $creator = 'predicates:creator \''.$arguments["creator"].'\' ';
                 if(in_array("datetime", $keys))
                         $datetime = 'predicates:datetime \''.$arguments["datetime"].'\' ';
@@ -89 +91 @@
                         PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
                         PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT DISTINCT ?uid, ?title, ?datetime
+                        SELECT DISTINCT ?uid, ?title, ?creator, ?datetime
                         WHERE
                         {
@@ -95 +97 @@
                                 predicates:uid ?uid ;
                                 predicates:title ?title ;
-                                ' . $uid . $title . $datetime . $applications . $surveys . $answersets . '
+                                predicates:creator ?creator ;
+                                predicates:datetime ?datetime ;
+                                ' . $uid . $title . $creator . $datetime . $applications . $surveys . $answersets . '
                         }';
                 //Query the model
                 $results = $this->model->sparqlQuery($querystring);
-
                 $sessions = array();
                 if(!empty($results))
@@ -109 +112 @@
                                 $pipeline = $this->getPipeline($result['?uid']->label);
                                 $answersets = $this->getAnswerSets($result['?uid']->label);
+                                $creator = $this->db->get("User", array("uid" => $result['?creator']->label));
                                 $datetime = new DateTime();
-                                $datetime->setTimestamp(intval($result['?datetime']));
-                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $datetime, $pipeline, $answersets);
+                                $datetime->setTimestamp(intval($result['?datetime']->label));
+                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $creator[0], $datetime, $pipeline, $answersets);
                         }
                 }
@@ -183 +187 @@
                 $predicateTitle = new Resource(TITLE);
                 $this->model->add(new Statement($resourceSession, $predicateTitle, $sessionTitle));
+
+                $sessionCreator = new Literal($rToolObject->creator->uid);
+                $predicateCreator = new Resource(CREATOR);
+                $this->model->add(new Statement($resourceSession, $predicateCreator, $sessionCreator));
 
                 $sessionTimestamp = new Literal($rToolObject->datetime->getTimestamp());