Changeset 302 for Dev/branches/rest-dojo-ui/server/classes/models/SessionInstance.php

Timestamp:

03/03/12 19:09:19 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Merge jos-branch 285:298

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server/classes/models/SessionInstance.php (modified) (13 diffs)

Dev/branches/rest-dojo-ui/server/classes/models/SessionInstance.php

@@ -22 +22 @@
         public $notes;
         public $session;
-        public $resultset;
+        public $surveyinstances;
+        public $applicationinstances;
 
         /**
@@ -34 +35 @@
          * @param type $notes
          * @param type $session
-         * @param type $resultset
-         */
-        public function __construct($uid = null, $title = null, $location = null, $facilitator = null, $starttime = null, $endtime = null, $notes = null, $session = null, $resultset = null)
+         * @param type $surveyinstances
+         * @param type $applicationinstances
+         */
+        public function __construct($uid = null, $title = null, $location = null, $facilitator = null, $starttime = null, $endtime = null, $notes = null, $session = null, $surveyinstances = null, $applicationinstances = null)
         {
                 if(!isset($uid))
@@ -50 +52 @@
                 $this->notes = $notes;
                 $this->session = $session;
-                $this->resultset = $resultset;
+                $this->surveyinstances = $surveyinstances;
+                $this->applicationinstances = $applicationinstances;
         }
 
@@ -61 +64 @@
                 if(is_string($this->facilitator))
                 {
-                        $result = User::get(array("uid" => $this->facilitator));
+                        $faci = ResearchToolObject::stripUri($this->facilitator);
+                        $result = User::get(array("uid" => $faci["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -69 +73 @@
                 if(is_string($this->session))
                 {
-                        $result = Session::get(array("uid" => $this->session));
+                        $sess = ResearchToolObject::stripUri($this->session);
+                        $result = Session::get(array("uid" => $sess["uid"]));
                         if(!isset($result[0]))
                                 return false;
                         $this->session = $result[0]; 
                 }
-
-                if(is_string($this->resultset))
-                {
-                        $result = ResultSet::get(array("uid" => $this->resultset));
-                        if(!isset($result[0]))
-                                return false;
-                        $this->resultset = $result[0];
+                if(!empty($this->surveyinstances) && is_string($this->surveyinstances[0]))
+                {
+                        $newSurveyInstances = array();
+                        foreach($this->surveyinstances as $surveyInstance)
+                        {
+                                $sins = ResearchToolObject::stripUri($surveyInstance);
+                                $result = SurveyInstance::get(array("uid" => $sins["uid"]));
+                                if(!isset($result[0]))
+                                        return false;
+                                $newSurveyInstances[] = $result[0];
+                        }
+                        $this->surveyinstances = $newSurveyInstances;
+                }
+
+                if(!empty($this->applicationinstances) && is_string($this->applicationinstances[0]))
+                {
+                        $newApplicationInstances = array();
+                        foreach($this->applicationinstances as $applicationInstance)
+                        {
+                                $ains = ResearchToolObject::stripUri($applicationInstance);
+                                $result = ApplicationInstance::get(array("uid" => $ains["uid"]));
+                                if(!isset($result[0]))
+                                        return false;
+                                $newApplicationInstances[] = $result[0];
+                        }
+                        $this->applicationinstances = $newApplicationInstances;
                 }
                 return true;
@@ -124 +148 @@
                 $model->add(new Statement($resourceSInstance, $predicateLocation, $sInstanceLocation));
 
-                $sInstanceFacilitator = new Literal($this->facilitator->uid);
+                $sInstanceFacilitator = new Resource(USER . '/' . $this->facilitator->uid);
                 $predicateFacilitator = new Resource(FACILITATOR);
                 $model->add(new Statement($resourceSInstance, $predicateFacilitator, $sInstanceFacilitator));
@@ -146 +170 @@
                 }
 
-                $sInstanceSession = new Literal($this->session->uid);
+                $sInstanceSession = new Resource(SESSION . '/' . $this->session->uid);
                 $predicateSession = new Resource(OF_SESSION);
                 $model->add(new Statement($resourceSInstance, $predicateSession, $sInstanceSession));
 
-                if(isset($this->resultset))
-                {
-                        //$sInstanceResultSet = new Literal($this->resultset->uid);
-                        $sInstanceResultSet = new Literal($this->resultset);
-                        $predicateResultSet = new Resource(HAS_RESULTSET);
-                        $model->add(new Statement($resourceSInstance, $predicateResultSet, $sInstanceResultSet));
-                }
+                if(isset($this->surveyinstances))
+                {
+                        foreach($this->surveyinstances as $surveyinstance)
+                        {
+                                $sInstanceSurveyInstance = new Resource(SURVEYINSTANCE . '/' . $surveyinstance->uid);
+                                $predicateSurveyInstance = new Resource(HAS_SURVEYINSTANCE);
+                                $model->add(new Statement($resourceSInstance, $predicateSurveyInstance, $sInstanceSurveyInstance));
+                        }
+                }
+
+                if(isset($this->applicationinstances))
+                {
+                        foreach($this->applicationinstances as $applicationinstance)
+                        {
+                                $sInstanceAppInstance = new Resource(APPLICATIONINSTANCE . '/' . $applicationinstance->uid);
+                                $predicateAppInstance = new Resource(HAS_APPLICATIONINSTANCE);
+                                $model->add(new Statement($resourceSInstance, $predicateAppInstance, $sInstanceAppInstance));
+                        }
+                }
+
                 $model->saveAs(SessionInstance::$filename, 'rdf');
                 return true;
@@ -164 +201 @@
          * function get()
          * @param type $arguments : An array containing one or more of the following elements:
-         * 'uid', 'title', 'location', 'facilitator', 'starttime', 'endtime' 'notes', 'session', 'resultset'
+         * 'uid', 'title', 'location', 'facilitator', 'starttime', 'endtime' 'notes', 'session', 'applicationinstances', 'surveyinstances'
          */
         public static function get($arguments)
@@ -174 +211 @@
                         PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
                         PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
-                        SELECT DISTINCT ?uid, ?title, ?location, ?facilitator, ?starttime, ?endtime, ?of_session, ?has_resultset 
+                        SELECT DISTINCT ?uid, ?title, ?location, ?facilitator, ?starttime, ?endtime, ?of_session
                         WHERE
                         {
@@ -185 +222 @@
                                 predicates:endtime ?endtime ;
                                 predicates:of_session ?of_session ;
-                                predicates:has_resultset ?has_resultset ;
                                 ' . ResearchToolObject::createArguments($arguments) . '
         }';
@@ -196 +232 @@
                         {
                                 //Create a SessionInstance object out of every result. Get all the required fields as well.
-                                $notes = SessionInstance::getNotes($model, $result['?uid']->label);
+                                $fields = SessionInstance::getFields($model, $result['?uid']->label);
                                 $resultset = isset($result['?has_resultset']) ? $result['?has_resultset']->label : null;
                                 $starttime = new DateTime();
@@ -206 +242 @@
                                         $result['?title']->label,
                                         $result['?location']->label,
-                                        $result['?facilitator']->label,
+                                        $result['?facilitator']->uri,
                                         $starttime,
                                         $endtime,
-                                        $notes,
-                                        $result['?of_session'],
-                                        $resultset
+                                        $fields[0],
+                                        $result['?of_session']->uri,
+                                        $fields[1],
+                                        $fields[2]
                                 );
                         }
@@ -219 +256 @@
         
         /**
-         * function getNotes()
-         * param type $uid : The SessionInstance uid for which the notes should be retrieved.
-         */
-        public static function getNotes($model, $uid)
-        {
-                $result = $model->findRegex("[(".$uid.")]", "[(has_note)]", null);
+         * function getFields()
+         * param type $uid : The SessionInstance uid for which the fields should be retrieved.
+         * returns : An array with [0] => all notes, [1] => all SurveyInstances and [2] => all ApplicationInstances.
+         */
+        public static function getFields($model, $uid)
+        {
+                $result = $model->findRegex("[(".$uid.")]", "[(has_note)|(has_applicationinstance)|(has_surveyinstance)]", null);
                 $iterator = $result->getStatementIterator();
                 $notes = array();
+                $applicationinstances = array();
+                $surveyinstances = array();
                 while($iterator->hasNext())
                 {
                         $element = $iterator->next();
-                        $notes[] = $element->getLabelObject();
-                }
-                return $notes;
+                        if($element->getLabelPredicate() == HAS_NOTE)
+                                $notes[] = $element->getLabelObject();
+                        else if($element->getLabelPredicate() == HAS_APPLICATIONINSTANCE)
+                                $applicationinstances[] = $element->getLabelObject();
+                        else if($element->getLabelPredicate() == HAS_SURVEYINSTANCE)
+                                $surveyinstances[] = $element->getLabelObject();
+                }
+                return array($notes, $surveyinstances, $applicationinstances);
         }