Changeset 302 for Dev/branches/rest-dojo-ui/server/classes/models/Session.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/Session.php (modified) (6 diffs)

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

@@ -48 +48 @@
                 if(is_string($this->creator))
                 {
-                        $result = User::get(array("uid" => $this->creator));
+                        $crea = ResearchToolObject::stripUri($this->creator);
+                        $result = User::get(array("uid" => $crea["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -54 +55 @@
                 }
                 if(!empty($this->pipeline) && is_string($this->pipeline[0]))
-                {
+                {       
                         $newPipeline = array();
                         foreach($this->pipeline as $element)
                         {
-                                //Check if the element's UID can be found in surveys, if not: 
-                                //Check applications. If it isn't in either: invalid reference.
-                                $result = Survey::get(array("uid" => $element));
-                                if(!isset($result[0]))
-                                        $result = Application::get(array("uid" => $element));
+                                $ele = ResearchToolObject::stripUri($element);
+                                $result;
+                                if($ele["type"] == "survey")
+                                {
+                                        $result = Survey::get(array("uid" => $ele["uid"]));     
+                                }
+                                else if($ele["type"] == "application")
+                                {
+                                        $result = Application::get(array("uid" => $ele["uid"]));
+                                }
                                 if(!isset($result[0]))
                                         return false;
@@ -107 +113 @@
                 $model->add(new Statement($resourceSession, $predicateTitle, $sessionTitle));
 
-                $sessionCreator = new Literal($this->creator->uid);
+                $sessionCreator = new Resource(USER . '/' . $this->creator->uid);
                 $predicateCreator = new Resource(CREATOR);
                 $model->add(new Statement($resourceSession, $predicateCreator, $sessionCreator));
@@ -121 +127 @@
                         foreach($this->pipeline as $element)
                         {
-                                $sessionObject = new Literal($element->uid);
+                                $sessionObject = null;
                                 $predicateObject = null;
                                 if(get_class($element) == "Application")
+                                {
+                                        $sessionObject = new Resource(APPLICATION . '/' . $element->uid);
                                         $predicateObject = new Resource(HAS_APPLICATION);
+                                }
                                 else if(get_class($element) == "Survey")
+                                {
+                                        $sessionObject = new Resource(SURVEY . '/' . $element->uid);
                                         $predicateObject = new Resource(HAS_SURVEY);
+                                }
                                 if(isset($predicateObject))
                                         $model->add(new Statement($resourceSession, $predicateObject, $sessionObject));
@@ -132 +144 @@
                 }
 
-                if(isset($this->answersets))
-                {
-                        foreach($this->answersets as $answerset)
-                        {
-                                $sessionAnswerSet = new Literal($answerset->uid);
-                                $predicateAnswerSet = new Resource(HAS_ANSWERSET);
-                                $model->add(new Statement($resourceSession, $predicateAnswerSet, $sessionAnswerSet));
-                        }
-                }
-                
                 return $model->saveAs(Session::$filename, 'rdf');
         }
@@ -178 +180 @@
                                 //Create a session object out of every result, get all required fields as well.
                                 $pipeline = Session::getPipeline($model, $result['?uid']->label);
-                                $creator = $result['?creator']->label;
+                                $creator = $result['?creator']->uri;
                                 $creationdate = new DateTime();
                                 $creationdate->setTimestamp(intval($result['?creationdate']->label));