Changeset 233 for Dev/branches/jos-branch/returnObjectDisplay.php

Timestamp:

01/13/12 13:57:41 (13 years ago)

Author:

fpvanagthoven

Message:

 

File:

• Dev/branches/jos-branch/returnObjectDisplay.php (modified) (3 diffs)

Dev/branches/jos-branch/returnObjectDisplay.php

@@ -3 +3 @@
 require 'classes/master.php';
 
-/* 
+/*
  * Note: do not try to implement info panel displays in this file as well, it passes and queries a lot of data that you really do not need.
  * Since this function will be used so often, adding extra unneeded code to it will slow down the regular operation of the editor (refreshes, etc..) while not offering a significant advantage over the existing getInfo.php
@@ -9 +9 @@
 
 
-if(isset($_POST['args']) && !empty($_POST['args'])) {
+if (isset($_POST['args']) && !empty($_POST['args'])) {
     // Get arguments and convert to object
     $input = $_POST['args'];
@@ -17 +17 @@
 }
 
-$dbi = new DatabaseInterface();
 $outputArray = array();
 foreach ($requestArray as $request) {
+
+    $type = $request->type;
+    $results = $type::get(array("uid" => $request->uid));
     
-    //!!! DEZE SHIT MOET WEER TERUGGEDRAAID WORDEN ZODRA QUESTIONS WEER GEWOON UIDS HEBBEN IPV CODES!
-    if ($request->type == "Question"){
-    $results = $dbi->get($request->type, array("code" => $request->uid));
-    // Bottom line, werkt prima. Questions werken nu op ns1:question_code, accessible als question->code
-    }
-    else {
-        $results =  $dbi->get($request->type, array("uid"=>$request->uid));
-    }
     if (isset($results) && !empty($results)) {
         is_array($results) ? $object = $results[0] : $object = $results;
+        if ($object->evaluate()) {
+            $object->ObjectType = $type;
+            $outputArray[] = $object;
+        }
     }
     // We now have the targeted object loaded in memory
     // First add all shared properties
-    $objectProperties = array(
-        "uid" => $object->uid,
-        "title" => $object->title,
-        "type" => get_class($object),
-        "description" => $object->description
-    );
-    // Then add object-specific properties? (E.G. pipeline for sessions, answertype for questions, age for respondents)
-    // Nothing so far, though, because data structure changes all the time...
-    // Then add the resulting array to the outputArray
-    $outputArray[] = $objectProperties;
 }
 
-
 // Encode the output array in JSON format, then send back to the client
-$output = json_encode($outputArray);
-
-die($output);
+if (!empty($outputArray)) {
+    echo JSON_encode($outputArray);
+}
 ?>