Roxen.git/ server/ etc/ modules/ RXML.pmod/ module.pmod

2001-06-28

2001-06-28 20:06:59 by Martin Stjernholm <mast@lysator.liu.se>

• 7b6050ddb2b342454076cf9b4e1d5a46b99e17a6 (27 lines) (+19/-8) ^{[ Show | Annotate ]}
  Branch: 5.2

Better handling of tag sets with non-unique names.

Rev: server/etc/modules/RXML.pmod/module.pmod:1.181

2:   //   // Created 1999-07-30 by Martin Stjernholm.   // - // $Id: module.pmod,v 1.180 2001/06/28 19:32:37 mast Exp $ + // $Id: module.pmod,v 1.181 2001/06/28 20:06:59 mast Exp $      // Kludge: Must use "RXML.refs" somewhere for the whole module to be   // loaded correctly.
521:    //!    {    id_number = ++tag_set_count; -  if (all_tagsets[_name]) -  error ("The tag set name %O is not unique.\n", _name); +  if (_name) { +  if (!zero_type (all_tagsets[_name])) { +  report_warning ("The tag set name %O is not unique - ignoring it.\n", _name); +  if (TagSet other = all_tagsets[_name]) { +  // The already registered name is ambigious anyway. +  other->name = 0; +  all_tagsets[_name] = 0; +  } +  } +  else    all_tagsets[name = _name] = this_object(); -  +  }    if (_tags) add_tags (_tags);   #ifdef RXML_OBJ_DEBUG    __object_marker->create (this_object());
742:    {    switch (var) {    case "name": -  m_delete (all_tagsets, name); -  all_tagsets[name = val] = this_object(); +  if (name) m_delete (all_tagsets, name); +  if (val) all_tagsets[name = val] = this_object();    break;    case "imported":    if (!val) return val; // Pike can call us with 0 as part of an optimization.
6047:    if(objectp(what)) {    TagSet tagset;    Tag tag; -  if(what->is_RXML_Frame && (tag = what->tag) && (tagset = tag->tagset)) { +  if(what->is_RXML_Frame && (tag = what->tag) && (tagset = tag->tagset) && +  tag->name && tagset->name) {    saved_id[object_program(what)] =    ((tag->flags & FLAG_PROC_INSTR)? "p":"t") + tag->name +    (tag->plugin_name? "#"+tag->plugin_name : "") + -  "\n" + what->tag->tagset->name; +  "\n" + tagset->name;    return ([])[0];    } else if(what->is_RXML_Type)    return "t:"+what->name;