DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 810328f..6a42840 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -29,8 +29,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $this->whereAdd("etype = ''");
         }
         
+        // this should be handled by roo... using '!name[0]' ....
         if(!empty($q['!name'])){
-            $names = explode(',', $q['!name']);
+            $names = is_array($q['!name']) ? $q['!name'] : explode(',', $q['!name']);
             foreach($names as $name){
                 $name  = $this->escape($name);
                 $this->whereAdd("
@@ -38,13 +39,13 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 ");
             }
         }
-        if(!empty($q['search']['display_name')){
+        if(!empty($q['search']['display_name'])) {
+            $name = $this->escape($q['search']['display_name']);
+            // ilike on postgres?!?
+            $this->whereAdd("
+                core_enum.display_name LIKE '{$name}%'
+            ");
             
-            foreach($names as $name){
-                $this->whereAdd("
-                    core_enum.name NOT IN ('$name')
-                ");
-            }
         }
         
     }
@@ -123,7 +124,26 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             return $ce->id;
         }
         return 0;
+    }
+    
+    /**
+     * 
+     * 
+     * 
+     * @param string $etype
+     * @param array $name array of name
+     * @return array ID of core_enum 
+     */
+    
+    function lookupAllByName($etype,$name) {
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->etype = $etype;
+        $ce->whereAddIn('name', $name, 'string');
         
+        if ($ce->count() > 0) {
+            return $ce->fetchAll('id');
+        }
+        return array();
     }
     
     function fetchAllByType($etype, $fetchArg1=false, $fetchArg2=false, $fetchArg3=false)