DataObjects/core.sql

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 72036c4..b430049 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -32,11 +32,21 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         if(!empty($q['!name'])){
             $names = explode(',', $q['!name']);
             foreach($names as $name){
+                $name  = $this->escape($name);
                 $this->whereAdd("
                     core_enum.name NOT IN ('$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}%'
+            ");
+            
+        }
+        
     }
     
     function postListFilter($data, $authUser, $q) {
@@ -113,7 +123,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)
@@ -151,41 +180,11 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return false;
         
     }
-    /**
-     * The base enums that the system always needs,
-     * If we need to add modular enums, then this can be extended, and the two
-     * base data applied.
-     *
-     * This might be moved to an external file later? - eg json...
-     *
-     */
-    function baseEnums()
-    {
-        //
-        return array(
-            array(
-                'etype' => '',
-                'name' => 'COMPTYPE',
-                'display_name' =>  'Company Types',
-                'cn' => array(
-                    array(
-                        'name' => 'OWNER',
-                        'display_name' => 'Owner',
-                        'seqid' => 999, // last...
-                    )
-                    
-                )
-            )
-        );  
-        
-        
-        
-    }
+     
     
     function initEnums($data, $base = array())
     {
-        
-        var_Dump($data);
+         
         $seq_id = 0;
         if (!empty($base['etype'])) {
             $seq_id = 1;