Changeset 229 for Dev/branches/jos-branch/classes/models

Timestamp:

01/13/12 10:28:30 (13 years ago)

Author:

jkraaijeveld

Message:

• Fixed why ResultSet::get() wasn't working
• Updated SessionInstance? to support ResultSets?

Location:

Dev/branches/jos-branch/classes/models

Files:

• ResultSet.php (modified) (3 diffs)
• SessionInstance.php (modified) (4 diffs)

Dev/branches/jos-branch/classes/models/ResultSet.php

@@ -119 +119 @@
                 $querystring = '
                         PREFIX predicates: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
-                        PREFIX resources: <' . SURVEYTOOL_PREDICATES_NAMESPACE . '>
+                        PREFIX resources: <' . SURVEYTOOL_RESOURCES_NAMESPACE . '>
                         SELECT DISTINCT ?uid
                         WHERE
@@ -127 +127 @@
                                 ' . ResearchToolObject::createArguments($arguments) . '
                         }';
-
                 //Query the model
                 $results = $model->sparqlQuery($querystring);
@@ -148 +147 @@
         private static function getAnswerSets($model, $uid)
         {
-                $result = $this->model->findRegex("[(".$uid.")]", "[(has_answerset)]" ,null);
+                $result = $model->findRegex("[(".$uid.")]", "[(has_answerset)]" ,null);
                 $iterator = $result->getStatementIterator();
                 $answersets = array();

Dev/branches/jos-branch/classes/models/SessionInstance.php

@@ -79 +79 @@
                         $result = ResultSet::get(array("uid" => $this->resultset));
                         if(!isset($result[0]))
-                                return true;
-                        $newResultSets[] = $result[0];
+                                return false;
+                        $this->resultset = $result[0];
                 }
                 return true;
@@ -185 +185 @@
                                 predicates:endtime ?endtime ;
                                 predicates:of_session ?of_session ;
+                                predicates:has_resultset ?has_resultset ;
                                 ' . ResearchToolObject::createArguments($arguments) . '
         }';
@@ -196 +197 @@
                                 //Create a SessionInstance object out of every result. Get all the required fields as well.
                                 $notes = SessionInstance::getNotes($model, $result['?uid']->label);
-                                $resultset = SessionInstance::getResultSet($model, $result['?uid']->label);
+                                $resultset = isset($result['?has_resultset']) ? $result['?has_resultset']->label : null;
                                 $starttime = new DateTime();
                                 $starttime->setTimestamp(intval($result['?starttime']->label));
@@ -234 +235 @@
         }
 
-        /**
-         * function getResultSet($uid)
-         * param type $uid : The SessionInstance uid for which the ResultSet should be gotten.
-         */
-        public static function getResultSet($model, $uid)
-        {
-                //TODO: Implement when ResultSet is in.
-                return null;
-        }
-
-
 
 }