DataObjects/core.sql

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 592ba46..26e7bfd 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("
@@ -70,15 +71,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function onUpdate($old, $req)
-    {
-        $x = $this->factory($this->tableName());
-        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
-        if ($old->etype != $this->etype) {
-            $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
-        }
-        
-    }
+    
     function beforeUpdate($old, $request,$roo)
     {
         $tn = $this->tableName();
@@ -108,13 +101,25 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             }
         }
     }
+    
     function onInsert($req)
     {
         $x = $this->factory($this->tableName());
         $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
          
     }
+    function onUpdate($old, $req)
+    {
+        $x = $this->factory($this->tableName());
+        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
+        if ($old->etype != $this->etype) {
+            $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
+        }
+    }
     
+    /**
+     * lookup by etype/name and return id
+     */
     function lookup($etype,$name) {
         $ce = DB_DataObject::Factory('core_enum');
         $ce->etype = $etype;
@@ -123,7 +128,33 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             return $ce->id;
         }
         return 0;
+    }
+    
+    
+    function lookupById($id) {
+        $ce = DB_DataObject::Factory('core_enum');
+        $ce->get($id);
+        return $ce;
+    }
+    
+    /**
+     * 
+     * 
+     * 
+     * @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)
@@ -131,6 +162,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $x = DB_DataObject::factory('core_enum');
         $x->etype = $etype;
         $x->active = 1;
+        $x->orderBy('seqid ASC');
         return $x->fetchAll($fetchArg1, $fetchArg2, $fetchArg3);
     }
     
@@ -161,11 +193,17 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         return false;
         
     }
-     
+     // fixme - all calls should be to initDatabase, we need to remove initEnums
+    function initDatabase($roo, $data)
+    {
+        $this->initEnums($data);
+    }
+    
     
     function initEnums($data, $base = array())
     {
-         
+        // base only contains etype...
+        //print_r($data);
         $seq_id = 0;
         if (!empty($base['etype'])) {
             $seq_id = 1;
@@ -180,22 +218,35 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         foreach($data as $row) {
             $t = DB_DAtaObject::Factory('core_enum');
             
-            $t->setFrom($row);
-            $t->setFrom($base);
-            unset($t->seqid); // these might have been changed
-            unset($t->display_name); // these might have been changed
+            $t->etype = isset($row['etype']) ? $row['etype'] : '';
+            $t->etype = isset($base['etype']) ? $base['etype'] : $t->etype ;
             
+            $t->name = isset($row['name']) ? $row['name'] : '';
             
-            if (!$t->find(true))
-            {
-                $t->setFrom($row);
-                $t->setFrom($base);
+            if (empty($t->name)) {
+                print_R($data);
+                die("ERROR: invalid name used for core_enum\n\n");
+            }
             
-                if (!empty($base['etype']) && empty($row['seqid'])) {
+            if (!$t->count()) {
+                // base already gave it the etype..
+                $t->setFrom($row);
+                
+                
+                //$t->is_system_enum = 1; // this should be on the caller..
+                
+                if (!empty($row['seqid'])) {
                     $t->seqid = $seq_id;
                     $seq_id++;
                 }
+                
                 $t->insert();
+            }else{
+                if ( isset($row['is_system_enum'])) {
+                     $t->is_system_enum = isset($row['is_system_enum']) ? $row['is_system_enum'] : $t->is_system_enum;
+                    
+                    $t->update();
+                }
             }
             if (!empty($row['cn'])) {
                 $this->initEnums($row['cn'], array('etype' => $t->name));