Roxen.git/ server/ modules/ tags/ rxmltags.pike

2000-06-23

2000-06-23 16:19:18 by Martin Stjernholm <mast@lysator.liu.se>

• 9c5b0d0da76116f40730de8a07868e7969628d65 (11 lines) (+6/-5) ^{[ Show | Annotate ]}
  Branch: 5.2

No need to do fix_relative to try_get_file, since it does that
internally.

Rev: server/modules/tags/rxmltags.pike:1.133

7:   #define _rettext id->misc->defines[" _rettext"]   #define _ok id->misc->defines[" _ok"]    - constant cvs_version="$Id: rxmltags.pike,v 1.132 2000/06/18 16:49:05 grubba Exp $"; + constant cvs_version="$Id: rxmltags.pike,v 1.133 2000/06/23 16:19:18 mast Exp $";   constant thread_safe=1;   constant language = roxen->language;   
506:    if(args->src) {    string|object file=id->conf->real_file(Roxen.fix_relative(args->src, id), id);    if(!file) { -  file=id->conf->try_get_file(Roxen.fix_relative(args->src,id),id); +  file=id->conf->try_get_file(args->src,id);    if(file)    file=class {    int p=0;
635:    return 0;    }    }; -  if(string s=id->conf->try_get_file(Roxen.fix_relative(args->file, id), id) ) { +  if(string s=id->conf->try_get_file(args->file, id) ) {    result = (string)strlen(s);    return 0;    }
770:    if(args->nocache) {    int nocache=id->pragma["no-cache"];    id->pragma["no-cache"] = 1; -  result=id->conf->try_get_file(Roxen.fix_relative(args->file,id),id); +  result=id->conf->try_get_file(args->file,id);    if(!result) RXML.run_error("No such file ("+args->file+").\n");    id->pragma["no-cache"] = nocache;    }    else -  result=id->conf->try_get_file(Roxen.fix_relative(args->file,id),id); +  result=id->conf->try_get_file(args->file,id);    if(args->quote=="html") result=Roxen.html_encode_string(result);      #ifdef OLD_RXML_COMPAT