DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 8ca0f22..af2681d 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -26,7 +26,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
 //        DB_DataObject::debugLevel(1);
         if (!empty($q['query']['empty_etype'])) {
-            $this->whereAdd("etype = ''");
+            $this->whereAdd("core_enum.etype = ''");
         }
         
         // this should be handled by roo... using '!name[0]' ....
@@ -130,11 +130,12 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
         $tn = $this->tableName();
         $x = $this->factory($tn);
-        if(!($old->etype == $request['etype'] && $old->name == $request['name'])){
+        // check if record exists?
+        if(isset($request['etype']) &&   !($old->etype == $request['etype'] && $old->name == $request['name'])){
             $x->whereAdd("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr('record already exists');
             }
         }
     }
@@ -338,7 +339,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function merge($id, $roo)
+    function merge($merge_to, $roo)
     {
         $affects  = array();
         
@@ -361,25 +362,22 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             $chk = DB_DataObject::factory($ka[0]);
             
             if (!is_a($chk,'DB_DataObject')) {
-                $this->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
+                $roo->jerr('Unable to load referenced table, check the links config: ' .$ka[0]);
             }
-           // print_r(array($chk->tablename() , $ka[1] ,  $xx->tablename() , $this->key ));
-            $chk->{$ka[1]} =  $xx->{$this->key};
+            
+            $chk->{$ka[1]} = $this->id;
 
-            if (count($chk->keys())) {
-                $matches = $chk->count();
-            } else {
-                //DB_DataObject::DebugLevel(1);
-                $matches = $chk->count($ka[1]);
+            foreach ($chk->fetchAll() as $c){
+                $cc = clone ($c);
+                $c->{$ka[1]} = $merge_to;
+                $c->update($cc);
             }
-
-            if ($matches) {
-                $chk->_match_key = $ka[1];
-                $match_ar[] = clone($chk);
-                continue;
-            }          
         }
         
+        $this->delete();
+        
+        $roo->jok('Merged');
+        
     }