Roxen.git/ server/ modules/ graphics/ graphic_text.pike

2000-12-05

2000-12-05 00:26:48 by Martin Nilsson <mani@lysator.liu.se>

• 6e80e122b118c834cc5e98fbce67697a7f96dda0 (16 lines) (+10/-6) ^{[ Show | Annotate ]}
  Branch: 2.1

query_internal_location -> query_absolute_internal_location

Rev: server/modules/graphics/atlas/atlas.pike:1.9
Rev: server/modules/graphics/cimg.pike:1.36
Rev: server/modules/graphics/gbutton.pike:1.67
Rev: server/modules/graphics/graphic_text.pike:1.258
Rev: server/modules/graphics/rimage/rimage.pike:1.19
Rev: server/modules/tags/check_spelling.pike:1.16

1:   // This is a roxen module. Copyright © 1996 - 2000, Roxen IS.   //    - constant cvs_version="$Id: graphic_text.pike,v 1.257 2000/11/19 21:32:55 kuntri Exp $"; + constant cvs_version="$Id: graphic_text.pike,v 1.258 2000/12/05 00:25:57 nilsson Exp $";      #include <module.h>   inherit "module";
892:    string ext="";    if(query("ext")) ext="."+(p->format || "gif");    if(!args->short) -  return ({ query_internal_location()+image_cache->store( ({p,content}), id )+ext }); +  return ({ query_absolute_internal_location(id) + +  image_cache->store( ({p,content}), id )+ext });    return ({ "+"+image_cache->store( ({p,content}), id )+ext });    }    }
910:    mapping p=mk_gtext_arg(args,id);    if(args->href && !p->fgcolor) p->fgcolor=id->misc->gtext_link||"#0000ff";    if(!args->short) -  return ({ query_internal_location()+"$"+image_cache->store(p, id)+"/" }); +  return ({ query_absolute_internal_location(id) + +  "$"+image_cache->store(p, id)+"/" });    return ({ "+"+image_cache->store(p, id )+"/foo" });    }    }
984:    string fn = image_cache->store( ({ p, word }),id );    mapping size = image_cache->metadata( fn, id, 1 );    if(setalt) arg->alt=word; -  arg->src=query_internal_location()+fn+ext; +  arg->src=query_absolute_internal_location(id)+fn+ext;    if( size )    {    arg->width = (string)size->xsize;
999:    mapping size = image_cache->metadata( num, id, 1 );    if(!arg->alt) arg->alt=replace(c,"\"","'");    -  arg->src=query_internal_location()+num+ext; +  arg->src=query_absolute_internal_location(id)+num+ext;    if(size) {    arg->width=(string)size->xsize;    arg->height=(string)size->ysize;
1054:    return    res+    " "+sn+"l = new Image("+arg->width+", "+arg->height+");"+sn+"l.src = \""+arg->src+"\";\n" -  " "+sn+"h = new Image("+arg->width+", "+arg->height+");"+sn+"h.src = \""+query_internal_location()+num2+ext+"\";\n" +  " "+sn+"h = new Image("+arg->width+", "+arg->height+");"+sn+"h.src = \""+ +  query_absolute_internal_location(id)+num2+ext+"\";\n"    "</script>"+    "<a"+ea+"href=\""+url+"\" "+    (input?"onClick='document.forms[0].submit();' ":"")