X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=c5d5b96a3d92da92948b9f0eec8f97512249f0e1;hb=f929da61c52e11b9b518653488b8ddd17cf5d19a;hp=3c3ad1592d5cd0f290be88ef9de36a564a76ed2a;hpb=80498467d9b0d3ee2fa379642ac9a95500d6cd15;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 3c3ad159..c5d5b96a 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -54,11 +54,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if (!empty($q['_list_actions'])) {
             $this->listActions($roo,$q);
         }
+        //die("apply filters");
         if (!empty($q['_split_event_name'])) {
             $this->selectAdd("
                 
-                substr( event, substring_index(event, '.')) as event_left,
-                substr( event, 0, substring_index(event, '.')) as event_right        
+                substr( event, LOCATE(event, '.')) as event_left,
+                substr( event, 0, LOCATE(event, '.')) as event_right        
                              
             ");
             
@@ -67,6 +68,27 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         }
         
     }
+    
+    function toRooSingleArray($au,$q)
+    {
+        $ret = $this->toArray();
+        if (empty($q['_split_event_name'])) {
+            return $ret;
+        }
+        $bits = explode('.', $this->event);
+        $ret['event_left'] = $bits[0];
+        $ret['event_right'] = $bits[1];
+        // check core enu.
+        if (!empty($ret['event_right'])) {
+            $ce = DB_DataObject::factory('core_enum')->lookupObject($q['_split_event_name'], $ret['event_right']);
+            $ret['event_right_display_name'] = $ce->display_name;
+        }
+        
+        return $ret;
+        
+        
+    }
+    
     function listActions($roo, $q) {
         
         //print_r($q);