Branch: Tag:

2000-07-03

2000-07-03 06:47:16 by Martin Nilsson <mani@lysator.liu.se>

Removed roxenlib

Rev: server/modules/logging/home_logger.pike:1.25
Rev: server/modules/scripting/cgi.pike:2.39
Rev: server/modules/scripting/php4.pike:2.8
Rev: server/modules/scripting/pikescript.pike:1.62
Rev: server/modules/scripting/piketag.pike:2.6
Rev: server/modules/scripting/servlet.pike:2.9

7:   // return "Hello world!\n";   // </pike>    - constant cvs_version = "$Id: piketag.pike,v 2.5 2000/03/16 18:34:42 nilsson Exp $"; + constant cvs_version = "$Id: piketag.pike,v 2.6 2000/07/03 06:43:20 nilsson Exp $";   constant thread_safe=1;    - inherit "roxenlib"; +    inherit "module"; - #include <module.h>; +       constant module_type = MODULE_PARSER;   constant module_name = "Pike tag";
38:    "How to report errors (e.g. backtraces generated by the Pike code):\n"    "\n"    "<p><ul>\n" -  "<li><i>Off</i> - Silent.\n" -  "<li><i>Log</i> - System debug log.\n" -  "<li><i>HTML comment</i> - Include in the generated page as an HTML comment.\n" -  "<li><i>HTML text</i> - Include in the generated page as normal text.\n" +  "<li><i>Off</i> - Silent.</li>\n" +  "<li><i>Log</i> - System debug log.</li>\n" +  "<li><i>HTML comment</i> - Include in the generated page as an HTML comment.</li>\n" +  "<li><i>HTML text</i> - Include in the generated page as normal text.</li>\n"    "</ul>\n",    ({"Off", "Log", "HTML comment", "HTML text"}));   
51:      string reporterr (string header, string dump)   { -  if (QUERY (debugmode) == "Off") return ""; +  if (query("debugmode") == "Off") return "";       report_error( header + dump + "\n" ); -  switch (QUERY (debugmode)) +  switch (query("debugmode"))    {    case "HTML comment": -  return "\n<!-- " + html_encode_string(header + dump) + "\n-->\n"; +  return "\n<!-- " + Roxen.html_encode_string(header + dump) + "\n-->\n";    case "HTML text": -  return "\n<br><font color=red><b><pre>" + html_encode_string (header) + -  "</b></pre></font><pre>\n"+html_encode_string (dump) + "</pre><br>\n"; +  return "\n<br><font color=\"red\"><b><pre>" + Roxen.html_encode_string (header) + +  "</b></pre></font><pre>\n"+Roxen.html_encode_string (dump) + "</pre><br />\n";    default:    return "";    }
155:    // Not in the program cache.    p = compile_string(s, "Pike-tag("+request_id->not_query+":"+    request_id->misc->line+")"); -  if (sizeof(program_cache) > QUERY(program_cache_limit)) +  if (sizeof(program_cache) > query("program_cache_limit"))    {    array a = indices(program_cache);    int i;       // Zap somewhere between 25 & 50% of the cache. -  for(i = QUERY(program_cache_limit)/2; i > 0; i--) +  for(i = query("program_cache_limit")/2; i > 0; i--)    m_delete(program_cache, a[random(sizeof(a))]);    }    program_cache[s] = p;