$tn = $this->tableName();
$x = $this->factory($tn);
- if(empty($req['etype'])){
- if (empty($req['name'])) {
- $roo->jerr('name missing for new top level 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 if (!empty($req['_bulk_names'])) {
-
$lines = explode("\n", $req['_bulk_names']);
foreach($lines as $l) {
$l = trim($l);
continue;
}
$bits = explode(',', $l);
- $x = $this->factory($tn);
$rr = array(
- 'etype');
- $rr['name'] = array_shift($bits);
+ 'etype' => $req['etype'],
+ 'name' => array_shift($bits)
+ );
+
$rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
- $rr[']
+ $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->etype = isset($base['etype']) ? $base['etype'] : $t->etype ;
$t->name = isset($row['name']) ? $row['name'] : '';
+ $t->display_name = isset($row['display_name']) ? $row['display_name'] : '';
if (empty($t->name)) {
print_R($data);