X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=976da64350dd3feb5ea29c71b186e3888fa2270f;hb=583137df41a46bd37634c1f3cddd899b6fc8e807;hp=4e22973a9dfbcb3d72d6b3a513670450360ad3b1;hpb=adb77cec0389afd19bccb5f53e760ca42ad116d8;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 4e22973a..976da643 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -158,15 +158,48 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         $tn = $this->tableName();
         $x = $this->factory($tn);
         
-        if(empty($req['etype'])){
+        if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+            
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name or etype missing');
+            }
+            
             if($x->get('name', $req['name'])){
-                $roo->jerr('name is exsiting');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
-        }else{
+        } else if (!empty($req['_bulk_names'])) {
+            
+            $lines = explode("\n", $req['_bulk_names']);
+            foreach($lines as $l) {
+                $l = trim($l);
+                if (!strlen($l)) {
+                    continue;
+                }
+                $bits = explode(',', $l);
+                $rr = array(
+                    'etype' => $req['etype'],
+                    'name' => array_shift($bits)
+                );
+                
+                $rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
+                
+                $x = $this->factory($tn);
+                $x->beforeInsert($rr, $roo);
+                $x->setFrom($rr);
+                $x->insert();
+                
+            }
+            $roo->jok("inserted");
+            
+        } else {
+            if (empty($req['name']) || !strlen(trim($req['name']))) {
+                $roo->jerr('name missing');
+            }
+            
             $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
             $x->find(true);
             if($x->count() > 0){
-                $roo->jerr('is exsiting');
+                $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         }
     }
@@ -178,7 +211,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
          
     }
     
-    function onUpdate($old, $req)
+    function onUpdate($old, $req, $roo)
     {
         $x = $this->factory($this->tableName());
         $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')"); // no idea why need to do this!!??