$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 already exists');
+ $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('name already exists');
+ $roo->jerr("name already exists - '{$req['name']}'" );
}
}
}
}
- 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!!??
//$t->is_system_enum = 1; // this should be on the caller..
- if (!empty($row['seqid'])) {
+ if (!empty($row['seqid']) && !is_numeric($row['seqid'])) {
$t->seqid = $seq_id;
$seq_id++;
}
$t->insert();
}else{
$t->find(true); // fetch it..
+ $o = clone($t);
+
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();
}
+
+ $t->display_name = isset($row['display_name']) ? $row['display_name'] : '';
+
+ $t->update($o);
+
}
if (!empty($row['cn'])) {
$this->initEnums($row['cn'], array('etype' => $t->name));