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

2001-06-18

2001-06-18 15:19:44 by Martin Stjernholm <mast@lysator.liu.se>

• 1293eb55ce47605dd52b068d0c1605a9618e98b5 (17 lines) (+9/-8) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed bugs in format_short. t_string is now t_any_text.

Rev: server/etc/modules/RXML.pmod/utils.pmod:1.24

7:   //!   //! Created 2000-01-21 by Martin Stjernholm   //! - //! $Id: utils.pmod,v 1.23 2001/06/09 00:33:25 mast Exp $ + //! $Id: utils.pmod,v 1.24 2001/06/18 15:19:44 mast Exp $      constant short_format_length = 40;   
24:    else res += "({", end = "})";    if (sizeof (res) >= short_format_length) throw (0);    for (int i = 0; i < sizeof (val);) { -  res += format_val (val[i]); -  if (++i < sizeof (val) - 1) res += ", "; +  format_val (val[i]); +  if (++i < sizeof (val)) res += ", ";    if (sizeof (res) >= short_format_length) throw (0);    }    res += end;
35:    if (sizeof (res) >= short_format_length) throw (0);    array ind = sort (indices (val));    for (int i = 0; i < sizeof (ind);) { -  res += format_val (ind[i]) + ": "; +  format_val (ind[i]) + ": ";    if (sizeof (res) >= short_format_length) throw (0); -  res += format_val (val[ind[i]]); -  if (++i < sizeof (ind) - 1) res += ", "; +  format_val (val[ind[i]]); +  if (++i < sizeof (ind)) res += ", ";    if (sizeof (res) >= short_format_length) throw (0);    }    res += "])";
188:    // No quoting of splice args. FIXME: Add some sort of    // safeguard against splicing in things like "nice><evil    // stuff='...'"? -  p->html_context() == "splice_arg" ? RXML.t_string : type); +  p->html_context() == "splice_arg" ? RXML.t_any_text : type);    if (value != RXML.nil) {    if (type->free_text && !p->p_code) return ({value});    p->add_value (value);
216:    // No quoting of splice args. FIXME: Add some sort of    // safeguard against splicing in things like "nice><evil    // stuff='...'"? -  p->html_context() == "splice_arg" ? RXML.t_string : type); +  p->html_context() == "splice_arg" ? RXML.t_any_text : type);    if (value != RXML.nil) {    if (type->free_text && !p->p_code) return ({value});    p->add_value (value);