--- loncom/homework/randomlabel.pm 2003/09/08 19:17:34 1.48
+++ loncom/homework/randomlabel.pm 2004/01/08 20:28:20 1.55
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.48 2003/09/08 19:17:34 albertel Exp $
+# $Id: randomlabel.pm,v 1.55 2004/01/08 20:28:20 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,6 +63,9 @@ use Apache::edit;
use Apache::File();
use Apache::Constants qw(:common :http);
+my %args;
+my $cgi_id;
+
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
}
@@ -92,18 +95,20 @@ sub start_randomlabel {
}
my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
- my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
+ my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
+ if (!$texwidth) { $texwidth=90; }
$Apache::randomlabel::tlabel_cnt=0;
$Apache::randomlabel::ilabel_cnt=0;
if ($target eq 'web') {
- &Apache::lonxml::startredirection();
- $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
+ $cgi_id=&Apache::loncommon::get_cgi_id();
+ %args=();
+ $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
} elsif ($target eq 'tex') {
my $newbgimg = $bgimg;
$bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
$bgimg= &Apache::lonnet::filelocation($bgimg);
- $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
- $bgimg=~s/\/$//;
+ $bgimg=~s|http:/[^/]*//home/httpd/html|;
+ $bgimg=~s|/$||;
#if no eps file try to replicate it
if (not-e $bgimg) {
if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
@@ -117,22 +122,18 @@ sub start_randomlabel {
my $temp_file;
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
$temp_file = Apache::File->new('>>'.$filename);
- $newbgimg =~ s/(.*)\/res\//\/home\/httpd\/html\/res\//;
+ $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;
print $temp_file "$newbgimg\n";
- $bgimg =~ m/\/([^\/]+)$/;
- $bgimg = '/home/httpd/prtspool/'.$1;
+ $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+ $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
}
}
}
- $bgimg=~s/\/$//;
+ $bgimg=~s|/$||;
my $dirtywidth=$texwidth+5;
- if ($texwidth==90) {
- $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
- } else {
- $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
- }
+ $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.
+ $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.
+ $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$Apache::edit::bgimgsrc=
@@ -163,22 +164,18 @@ sub end_randomlabel {
my $count;
pop @Apache::lonxml::namespace;
if ($target eq 'web') {
- my $args=&Apache::lonxml::endredirection();
- $args=~s/\s*&/&/g;
- $args=~s/\s*$//;
$count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $args.= "&COUNT=$count"; }
+ if( $count != 0) { $args{"cgi.$cgi_id.COUNT"}=$count; }
$count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $args.= "&ICOUNT=$count"; }
- my $token=$Apache::lonxml::curdepth.'_'.$$;
- $result.='<img src="/adm/randomlabel.png?token='.$token;
- $result.='" /><br />'."\n";
- &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
+ if( $count != 0) { $args{"cgi.$cgi_id.ICOUNT"}=$count; }
+ $result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
+ &Apache::lonnet::appenv(%args);
} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';
my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
- my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
+ my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
+ if (!$texwidth) { $texwidth=90; }
my $howtoskipback = $texwidth*$height/$width;
$result.= ' \vskip -'.$howtoskipback.' mm } \\\\ ';
} elsif ($target eq 'edit') {
@@ -187,6 +184,14 @@ sub end_randomlabel {
return $result;
}
+sub adjust_textwidth {
+ my $texwidth=shift;
+ my $pagewidth=$ENV{'form.textwidth'};
+ $pagewidth=~s/\s*mm\s*$//;
+ if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}
+ return $texwidth;
+}
+
sub start_labelgroup {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -275,9 +280,9 @@ sub end_labelgroup {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}
if ($target eq 'web') {
- $result .= '&'. $str .'='.&Apache::lonnet::escape($label);
- $result .= '&'. $xstr .'='.$x;
- $result .= '&'. $ystr .'='.$y;
+ $args{"cgi.$cgi_id.$str"} =&Apache::lonnet::escape($label);
+ $args{"cgi.$cgi_id.$xstr"}=$x;
+ $args{"cgi.$cgi_id.$ystr"}=$y;
}
}
} elsif ($target eq 'tex') {
@@ -285,7 +290,8 @@ sub end_labelgroup {
my $WY1=0; # Web y-coord. of (ULC)
my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
- my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);
+ my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
+ if (!$texwidth) { $texwidth=90; }
my $TX1=0;
my $TY1=$texwidth*($wheight/$wwidth);
my $TX2=$texwidth;
@@ -399,7 +405,6 @@ sub start_label {
$result.=&Apache::edit::editline('',$text,'',50).
&Apache::edit::end_table();
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/label");
$result = '<label>';
if ($type eq 'image') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -411,7 +416,7 @@ sub start_label {
$result = $token->[4];
}
}
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/label",$parser);
}
return $result;
}