Changeset 289 for Dev/branches/rest-dojo-ui/server/classes

Timestamp:

02/24/12 16:17:56 (13 years ago)

Author:

hendrikvanantwerpen

Message:

[merge] svn merge ../jos-branch -r 284:287 .

Location:

Dev/branches/rest-dojo-ui

Files:

• . (modified) (1 prop)
• server/classes/models/ApplicationInstance.php (modified) (8 diffs)
• server/classes/models/ResearchToolObject.php (modified) (2 diffs)
• server/classes/models/SurveyInstance.php (modified) (2 diffs)

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

@@ -32 +32 @@
          * @param type $periodicresults: Periodical results from playing.
          */
-        public function __construct($uid = null, $application = null, $starttime = null, $endtime = null, $open = false, $playerresults = null, $groupresults = null, $periodicresults = null)
+        public function __construct($uid = null, $application = null, $starttime = null, $endtime = null, $open = 0, $playerresults = null, $groupresults = null, $periodicresults = null)
         {
                 if(!isset($uid))
@@ -56 +56 @@
                 if(is_string($this->application))
                 {
-                        $result = Application::get(array("uid" => $this->application));
+                        $app = ResearchToolObject::stripUri($this->application);
+                        $result = Application::get(array("uid" => $app["uid"]));
                         if(!isset($result[0]))
                                 return false;
@@ -96 +97 @@
                 $model->add(new Statement($resourceAI, $predicateUid, $AIUid));
 
-                $AIApplication = new Literal($this->application->uid);
+                $AIApplication = new Resource(APPLICATION . '/' . $this->application->uid);
                 $predicateApplication = new Resource(OF_APPLICATION);
                 $model->add(new Statement($resourceAI, $predicateApplication, $AIApplication));
@@ -108 +109 @@
                 $model->add(new Statement($resourceAI, $predicateEndTime, $AIEndTime));
 
-                $AIOpen = new Literal($this->open);
+                $AIOpen = new Literal((bool)$this->open);
                 $predicateOpen = new Resource(OPEN);
                 $model->add(new Statement($resourceAI, $predicateOpen, $AIOpen));
@@ -127 +128 @@
         {
                 $model = ResearchToolObject::load(ApplicationInstance::$filename);
+                $model->writeAsHTMLTable();
 
                 //Build the query string
@@ -135 +137 @@
                         WHERE
                         {
-                                _applicationinstance    predicates:resource_type        resources:applicationinstance ;
+                                ?applicationinstance    predicates:resource_type        resources:applicationinstance ;
                                 predicates:uid ?uid ;
                                 predicates:of_application ?of_application ;
@@ -141 +143 @@
                                 predicates:endtime ?endtime ;
                                 predicates:open ?open ;
-                                ' . ResearchToolObject::createArguments($arguments) . '
-                        }';
+                        ' . ResearchToolObject::createArguments($arguments) . '
+        }';
                 //Query the model
                 $results = $model->sparqlQuery($querystring);
-
                 //Create the corresponding ApplicationInstance objects
                 $aInstances = array();
@@ -156 +157 @@
                                 $endTime = new DateTime();
                                 $endTime->setTimestamp(intval($result['?endtime']->label));
-                                $open = false;
-                                if ($result['?open'] == 'true')
-                                        $open = true;
-
-                                $aInstances[] = new ApplicationInstance($result['?uid']->label, $result['?of_application']->label, $startTime, $endTime, $open, null, null, null); 
+                                $open = (bool) $result['?open'];
+                                $aInstances[] = new ApplicationInstance($result['?uid']->label, $result['?of_application']->uri, $startTime, $endTime, $open, null, null, null); 
                         }
                 }

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

@@ -30 +30 @@
                         $model->load($filename);
                 return $model;
+        }
+
+        /**
+         * function stripUri($inString)
+         * @param type $inString
+         * Takes a URI and creates a new array which contains the type and the uid of the object
+         */
+        public static function stripUri($inString)
+        {
+                $exp = explode('/', $inString);
+                if(sizeof($exp) < 7)
+                        return null;
+                else
+                        return array("type" => $exp[5], "uid" => $exp[6]);
         }
 
@@ -67 +81 @@
                                 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 = "predicates:has_resultset '" . $arguments[$key] . "\n"; break;
-                                case "of_application" : $addition = "predicates:of_application '" . $arguments[$key] . "\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 = "predicates:has_resultset '" . $arguments[$key] . "'\n"; break;
+                                case "of_application" : $addition = "predicates:of_application <" . APPLICATION . '/' .  $arguments[$key] . ">\n"; break;
                                 case "open" : $addition = "predicates:open '" . $arguments[$key] . "\n"; break;
                         }

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

@@ -26 +26 @@
      * @param type $answersets: A list of answersets.
      */
-    public function __construct($uid, $survey, $starttime, $endtime, $open, $presetanswers, $answersets)
+        public function __construct($uid = null, $survey = null, $starttime = null, $endtime = null, $open = null, $presetanswers = null, $answersets = null)
     {
         if(!isset($uid))
@@ -242 +242 @@
         }
 
-    public static function create($obj) {
-        return new SurveyInstance($obj->uid, $obj->survey, $obj->starttime,
-                $obj->endtime, $obj->open, $obj->presetanswers,
-                $obj->answersets);
-    }
+        /**
+         * Creates a new SurveyInstance object out of the given object.
+         */
+        public static function create($obj)
+        {
+                return new Survey($obj->uid, $obj->survey, $obj->starttime, $obj->endtime, $obj->open, $obj->presetanswers, $obj->answersets);  
+        }
 
 }