[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Fri, 26 Apr 2002 18:18:37 -0000
sakharuk Fri Apr 26 14:18:37 2002 EDT
Modified files:
/loncom/xml londefdef.pm
Log:
fixed path to figures
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.53 loncom/xml/londefdef.pm:1.54
--- loncom/xml/londefdef.pm:1.53 Tue Apr 16 10:37:24 2002
+++ loncom/xml/londefdef.pm Fri Apr 26 14:18:37 2002
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.53 2002/04/16 14:37:24 sakharuk Exp $
+# $Id: londefdef.pm,v 1.54 2002/04/26 18:18:37 sakharuk Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -45,9 +45,11 @@
package Apache::londefdef;
+use Apache::lonnet;
use strict;
use Apache::lonxml;
+
BEGIN {
&Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td'));
@@ -1386,28 +1388,14 @@
$currentstring = $token->[4];
} elsif ($target eq 'tex') {
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+ $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
my $file;
my $path;
- if ($src =~ m!(.*)/([^/]*)$!) {
- $file = $2;
- $path = $1;
- if ($path=~m:^/:) {
- $path = '/home/httpd/html'.$path;
- } elsif ($path =~ /^\./) {
- $path = $Apache::lonxml::pwd[-1].'/'.$path;
- } else {
- #else it is a full url don't print
- $path = undef;
- }
- } else {
- $path = $Apache::lonxml::pwd[-1];
- $file = $src;
- }
$file=~s/(\.gif|\.jpg)$/\.eps/;
if ($path) {
- $currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+ $currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
} else {
- $currentstring = 'See the image at \tt{'.$src.'}';
+ $currentstring .= 'See the image at \tt{'.$src.'}';
}
}
return $currentstring;