Changeset 207 for Dev/branches/Cartis/classes

Timestamp:

01/06/12 10:24:45 (13 years ago)

Author:

cartis

Message:

Got latest classes from trunk & update 05-12-2012

Location:

Dev/branches/Cartis/classes

Files:

• Connector.php (modified) (1 diff)
• DatabaseInterface.php (modified) (5 diffs)
• Session.php (modified) (5 diffs)
• SessionConnector.php (modified) (5 diffs)
• SessionInstance.php (added)
• SessionInstanceConnector.php (added)
• sessionEditorWidget.php (modified) (2 diffs)
• surveyEditorWidget.php (modified) (1 diff)

Dev/branches/Cartis/classes/Connector.php

@@ -66 +66 @@
                                 case "password" : $addition = "predicates:password '" . $arguments[$key] . "'\n"; break;
                                 case "creator" : $addition = "predicates:creator '" . $arguments[$key] . "'\n"; break;
-                                case "datetime" : $addition = "predicates:datetime '" . $arguments[$key] . "'\n"; break;
+                                case "creationdate" : $addition = "predicates:creationdate '" . $arguments[$key] . "'\n"; break;
                                 case "applications" : foreach($arguments[$key] as $application) { $addition = $addition . "predicates:has_application '" . $application . "'\n"; } break;
-
                                 case "surveys" : foreach($arguments[$key] as $survey) { $addition = $addition . "predicates:has_survey '" . $survey . "'\n"; } break;
                                 case "answersets" : foreach($arguments[$key] as $answerset) { $addition = $addition . "predicates:has_answerset '" . $answerset . "'\n"; } break;
                                 case "questions" : foreach($arguments[$key] as $question) { $addition = $addition . "predicates:has_question '" . $question . "'\n"; } break;
-
+                                case "location" : $addition = "predicates:location '" . $arguments[$key] . "\n"; break;
+                                case "facilitator" : $addition = "predicates:facilitator '" . $arguments[$key] . "\n"; break;
+                                case "starttime" : $addition = "predicates:starttime '" . $arguments[$key] . "\n"; break;
+                                case "endtime" : $addition = "predicates:endtime '" . $arguments[$key] . "\n"; break;
+                                case "session" : $addition = "predicates:of_session '" . $arguments[$key] . "\n"; break;
+                                case "resultset" : $addition = "predciates:has_resultset '" . $arguments[$key] . "\n"; break;
                         }
                         $argumentString = $argumentString . $addition;

Dev/branches/Cartis/classes/DatabaseInterface.php

@@ -25 +25 @@
         private $answerSetConnector;
         private $sessionConnector;
+        private $sessionInstanceConnector;
     
     /**
@@ -39 +40 @@
                 $this->answerSetConnector = new AnswerSetConnector();
                 $this->sessionConnector = new SessionConnector();
+                $this->sessionInstanceConnector = new SessionInstanceConnector();
     }
     
@@ -75 +77 @@
                                 return $this->sessionConnector->get($arguments);
                                 break;
+                        case "sessioninstance":
+                                return $this->sessionInstanceConnector->get($arguments);
+                                break;
         }
     }
@@ -87 +92 @@
         {
             case "Application":
-                $this->applicationConnector->set($rToolObject);
+                return $this->applicationConnector->set($rToolObject);
                 break;
             case "Question":
-                $this->questionConnector->set($rToolObject);
+                return $this->questionConnector->set($rToolObject);
                 break;
             case "User":
-                $this->userConnector->set($rToolObject);
+                return $this->userConnector->set($rToolObject);
                 break;
             case "Survey":
-                                $this->surveyConnector->set($rToolObject);
+                                return $this->surveyConnector->set($rToolObject);
                                 break;
             case "Respondent":
-                                $this->respondentConnector->set($rToolObject);
+                                return $this->respondentConnector->set($rToolObject);
                                 break;
             case "Answer":
-                                $this->answerConnector->set($rToolObject);
+                                return $this->answerConnector->set($rToolObject);
                                 break;
                         case "AnswerSet":
-                                $this->answerSetConnector->set($rToolObject);
+                                return $this->answerSetConnector->set($rToolObject);
                                 break;
                         case "Session":
-                                $this->sessionConnector->set($rToolObject);
+                                return $this->sessionConnector->set($rToolObject);
+                                break;
+                        case "SessionInstance":
+                                return $this->sessionInstanceConnector->set($rToolObject);
                                 break;
         }
@@ -122 +130 @@
         foreach ($rToolObjects as $rToolObject)
         {
-            $this->set($rToolObject);
-        }
+                        if(!$this->set($rToolObject))
+                                return false;
+                }
+                return true;
     }
 

Dev/branches/Cartis/classes/Session.php

@@ -10 +10 @@
         public $title;
         public $creator;
-        public $datetime;
+        public $creationdate;
         public $pipeline;
-        public $answersets;
 
         
@@ -23 +22 @@
          * @param type $pipeline
          */
-        public function __construct($uid = null, $title = null, $creator = null, $datetime = null, $pipeline = null, $answersets = null)
+        public function __construct($uid = null, $title = null, $creator = null, $datetime = null, $pipeline = null)
         {
                 if(!isset($uid))
@@ -32 +31 @@
                 $this->title = $title;
                 $this->creator = $creator;
-                $this->datetime = $datetime;
+                $this->creationdate = $datetime;
                 $this->pipeline = $pipeline;
-                $this->answersets = $answersets;
         }
 
@@ -67 +65 @@
                         $this->pipeline = $newPipeline;
                 }
-                if(!empty($this->answersets) && is_string($this->answersets[0]))
-                {
-                        $newAnswerSets = array();
-                        foreach($this->answersets as $element)
-                        {
-                                $result = $dbi->get("answerset", array("uid" => $element));
-                                if(!isset($result[0]))
-                                        return false;
-                                $newAnswerSets[] = $result[0];
-                        }
-                        $this->answersets = $newAnswerSets;
-                }
                 return true;
         }
@@ -90 +76 @@
          * are written to the file whilst the others get lost.
          */
+        //DO NOT USE - BROKEN AS OF 23/12/2011
         public function toSPSS($location)
         {

Dev/branches/Cartis/classes/SessionConnector.php

@@ -28 +28 @@
          * function get()
          * @param type $arguments : An array containing one or more of the following elements:
-         * 'uid', 'title', 'datetime', 'applications', 'surveys', 'answersets'
+         * 'uid', 'title', 'creationdate', 'applications', 'surveys'
          */
         public function get($arguments)
@@ -38 +38 @@
                         PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
                         PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT DISTINCT ?uid, ?title, ?creator, ?datetime
+                        SELECT DISTINCT ?uid, ?title, ?creator, ?creationdate
                         WHERE
                         {
@@ -45 +45 @@
                                 predicates:title ?title ;
                                 predicates:creator ?creator ;
-                                predicates:datetime ?datetime ;
+                                predicates:creationdate ?creationdate ;
                                 ' . $this->createArguments($arguments) . '
                         }';
@@ -58 +58 @@
                                 //Create a session object out of every result, get all required fields as well.
                                 $pipeline = $this->getPipeline($result['?uid']->label);
-                                $answersets = $this->getAnswerSets($result['?uid']->label);
                                 $creator = $result['?creator']->label;
-                                $datetime = new DateTime();
-                                $datetime->setTimestamp(intval($result['?datetime']->label));
-                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $creator, $datetime, $pipeline, $answersets);
+                                $creationdate = new DateTime();
+                                $creationdate->setTimestamp(intval($result['?creationdate']->label));
+                                $sessions[] = new Session($result['?uid']->label, $result['?title']->label, $creator, $creationdate, $pipeline);
                         }
                 }
@@ -135 +134 @@
                 $this->model->add(new Statement($resourceSession, $predicateCreator, $sessionCreator));
 
-                $sessionTimestamp = new Literal($rToolObject->datetime->getTimestamp());
+                $sessionTimestamp = new Literal($rToolObject->creationdate->getTimestamp());
         //      $sessionTimestamp = new Literal($rToolObject->datetime);    // Edit of above function, allows for creation of session, but still results in errors...
-        $predicateTimestamp = new Resource(DATETIME);
+        $predicateTimestamp = new Resource(CREATIONDATE);
                 $this->model->add(new Statement($resourceSession, $predicateTimestamp, $sessionTimestamp));
 

Dev/branches/Cartis/classes/sessionEditorWidget.php

@@ -88 +88 @@
 
     public function LoadSession() {   // Initialize variables on page load.
-        // Redirect if no session is set
+                // Redirect if no session is set
         if (!isset($_SESSION['currentSession'])) {
             redirect("selectSession.php");
@@ -94 +94 @@
         // Store the current session in internal variable
         $results = $this->dbi->get("Session", array("uid"=> $_SESSION['currentSession']));
+                print_r($results);
         if (!empty($results)) {
             if ($results[0]->evaluate()) {

Dev/branches/Cartis/classes/surveyEditorWidget.php

@@ -10 +10 @@
  * @author Thijs Schipper
  */
-class surveyEditorWidget {
+class SurveyEditorWidget {
 
     private $loadedSurvey;