--- loncom/homework/randomlabel.pm 2002/02/07 16:45:06 1.13
+++ loncom/homework/randomlabel.pm 2002/12/03 10:32:57 1.41
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.13 2002/02/07 16:45:06 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.41 2002/12/03 10:32:57 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -57,55 +57,92 @@
# (21,54) : $GroupTwo[2] = "TEXT-2"
# ===========================================
package Apache::randomlabel;
+use Apache::lonnet;
use strict;
use Apache::edit;
+use Apache::File();
+use Apache::Constants qw(:common :http);
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
}
+sub check_int {
+ # utility function to do error checking on a integer.
+ my ($num,$default) = @_;
+ $default = 100 if (! defined($default));
+ $num =~ s/\s+//g; # We dont need no stinkin white space!
+ # If it is a real, just grab the integer part.
+ ($num,undef) = split (/\./,$num) if ($num =~ /\./);
+ # set to default if what we have left doesn't match anything...
+ $num = $default unless ($num =~/^\d+$/);
+ return $num;
+}
+
sub start_randomlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- '/res/adm/includes/GLabel.class';
-
+ push (@Apache::lonxml::namespace,'randomlabel');
my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
-
if ( $bgimg !~ /^http:/ ) {
- $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;
$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
- if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
- $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
- } elsif ($bgimg =~ m:^/home/.*/public_html:) {
- $bgimg =~ s:^/home/(.*)/public_html:/~$1:;
- }
- $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
}
- my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
- my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
- my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
- my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+ 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);
- if (!$code) { $code='GLabel.class'; }
- if (!$codebase) { $codebase='/res/adm/includes/'; }
$Apache::randomlabel::tlabel_cnt=0;
$Apache::randomlabel::ilabel_cnt=0;
if ($target eq 'web') {
- $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";
- $result.="<param name=\"bgimg\" value=\"$bgimg\">";
+ &Apache::lonxml::startredirection();
+ $result.="BGIMG=".&Apache::lonnet::escape($bgimg);
} elsif ($target eq 'tex') {
- $bgimg=~s/(.gif|.jpg)$/.eps/;
- $bgimg=~s/http:\/\/[^\/]*/\/home\/httpd\/html/;
- $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
+ my $newbgimg = $bgimg;
+ $bgimg=~s/(.gif|.jpg|.png)$/.eps/;
+ $bgimg= &Apache::lonnet::filelocation($bgimg);
+ if (not $ENV{'request.role'}=~/^au\./) {
+ $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 ) {
+ #if replication failed try to find ps file
+ $bgimg=~s/\.eps$/\.ps/;
+ #if no ps file try to replicate it
+ if (not-e $bgimg &&
+ &Apache::lonnet::repcopy($bgimg) ne OK) {
+ #if replication failed try to produce eps file dynamically
+ $bgimg=~s/\.ps$/\.eps/;
+ 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\//;
+ print $temp_file "$newbgimg\n";
+ $bgimg =~ m/\/([^\/]+)$/;
+ $bgimg = '/home/httpd/prtspool/'.$1;
+ }
+ }
+ }
+ } else {
+ $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
+ }
+ $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.')';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
- $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'<br />'.
- &Apache::edit::text_arg('Width(pixel):','width',$token,4).
- &Apache::edit::text_arg('Height(pixel):','height',$token,4).
- &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
- &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
+ $result.=&Apache::edit::browse('bgimg').' ';
+ $result.=&Apache::edit::search('bgimg').'<br />'.
+ &Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6).
+ &Apache::edit::text_arg('Height(pixel):','height' ,$token,6).
+ &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
+ &Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
'bgimg','width','height',
@@ -122,16 +159,29 @@ sub end_randomlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my $count;
-
-
+ pop @Apache::lonxml::namespace;
if ($target eq 'web') {
- $count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }
- $count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }
- $result .= "</applet><BR />";
+ my $args=&Apache::lonxml::endredirection();
+ $args=~s/\s*&/&/g;
+ $args=~s/\s*$//;
+ $count = $Apache::randomlabel::tlabel_cnt;
+ if( $count != 0) { $args.= "&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)));
} elsif ($target eq 'tex') {
- $result='\end{picture}';
+ $result='\end{picture}\\\\';
+ @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
+ my $one=$1;
+ @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
+ my $two=$1;
+ @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
+ my $three=$1;
+ my $howtoskipback = $three*$one/$two;
+ $result.=' \vskip -'.$howtoskipback.' mm }';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -144,14 +194,15 @@ sub start_labelgroup {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
$type =~tr/A-Z/a-z/;
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
$Apache::randomlabel::groupname=$name;
$Apache::randomlabel::type=$type;
@Apache::randomlabel::xcoord = ();
@Apache::randomlabel::ycoord = ();
@Apache::randomlabel::value = ();
@Apache::randomlabel::label_arr = ();
+ @Apache::randomlabel::decription = ();
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Name:','name',$token).
@@ -169,7 +220,7 @@ sub start_labelgroup {
}
sub add_vars {
- my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+ my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
my $out=Apache::run::run($code,$safeeval);
if ($value) {
@@ -178,6 +229,10 @@ sub add_vars {
$code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
$out=Apache::run::run($code,$safeeval);
}
+ if ($image) {
+ my $code = '${'.$name."}{'image_".($order+1)."'}='".$image."';";
+ my $out=Apache::run::run($code,$safeeval);
+ }
$code = '${'.$name."}{'numlocations'}='".($order+1)."';";
$out=Apache::run::run($code,$safeeval);
}
@@ -188,7 +243,8 @@ sub end_labelgroup {
my $gname = $Apache::randomlabel::groupname;
my $type = $Apache::randomlabel::type;
my $result='';
- if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' ||
+ $target eq 'analyze') {
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
&Apache::structuretags::shuffle(\@idx_arr);
for(0 .. $#Apache::randomlabel::label_arr) {
@@ -200,24 +256,26 @@ sub end_labelgroup {
my $y = $Apache::randomlabel::ycoord[$_];
my $value = $Apache::randomlabel::value[$_];
if( $type eq 'text') {
- &add_vars($gname,$_,$label,$idx_arr[$_],$value,$safeeval);
+ &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
$str = 'LB'.$Apache::randomlabel::tlabel_cnt;
$xstr = 'X'.$Apache::randomlabel::tlabel_cnt;
$ystr = 'Y'.$Apache::randomlabel::tlabel_cnt;
$Apache::randomlabel::tlabel_cnt += 1;
} elsif ( $type eq 'image') {
- &add_vars($gname,$_,$idx_arr[$_],$idx_arr[$_],$value,$safeeval);
- $str = 'LB'.$Apache::randomlabel::ilabel_cnt;
- $xstr = 'X'.$Apache::randomlabel::ilabel_cnt;
- $ystr = 'Y'.$Apache::randomlabel::ilabel_cnt;
+ &add_vars($gname,$_,
+ $Apache::randomlabel::description[$idx_arr[$_]],
+ $idx_arr[$_],$value,$label,$safeeval);
+ $str = 'IMG'.$Apache::randomlabel::ilabel_cnt;
+ $xstr = 'IX'.$Apache::randomlabel::ilabel_cnt;
+ $ystr = 'IY'.$Apache::randomlabel::ilabel_cnt;
$Apache::randomlabel::ilabel_cnt += 1;
} else {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}
if ($target eq 'web') {
- $result .= '<param name="' . $str . '" value="'.$label.'">';
- $result .= '<param name="' . $xstr . '" value="'.$x.'">';
- $result .= '<param name="' . $ystr . '" value="'.$y.'">';
+ $result .= '&'. $str .'='.&Apache::lonnet::escape($label);
+ $result .= '&'. $xstr .'='.$x;
+ $result .= '&'. $ystr .'='.$y;
}
}
} elsif ($target eq 'tex') {
@@ -246,15 +304,20 @@ sub end_labelgroup {
my $x = $Apache::randomlabel::xcoord[$i];
my $y = $Apache::randomlabel::ycoord[$i];
my $value = $Apache::randomlabel::value[$i];
- my $tcX=$x*($texwidth/$wwidth) - $texwidth;
- my $tcY=$TY1-$y*($TY1/$wheight)-2;
+ #x latex coordinate
+ my $tcX=($x)*($texwidth/$wwidth);
+ #y latex coordinate
+# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+ my $tcY=$TY1-$y*($TY1/$wheight);
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
if( $type eq 'text') {
- &add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
+ &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
} elsif ( $type eq 'image') {
- &add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
+ &add_vars($gname,$i,
+ $Apache::randomlabel::description[$idx_arr[$i]],
+ $idx_arr[$i],$value,$label,$safeeval);
} else {
&Apache::lonxml::error('Unknown type of label :'.$type.':');
}
@@ -268,8 +331,8 @@ sub end_labelgroup {
# <location x="123" y="456" value="some value"/>
sub start_location {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $x= &Apache::lonxml::get_param('x',$parstack,$safeeval);
- my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval);
+ my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
+ my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
my $result='';
push(@Apache::randomlabel::xcoord,$x);
@@ -304,19 +367,45 @@ sub end_location {
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
+ if ($target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+ $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
+ if ($type eq 'image') {
+ &Apache::lonxml::debug("Turning $ltext and $Apache::lonxml::pwd[-1]");
+ $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],
+ $ltext);
+ &Apache::lonxml::debug("into $ltext");
+ my $description = &Apache::lonxml::get_param('description',
+ $parstack,$safeeval);
+ push(@Apache::randomlabel::description,$description);
+ }
push(@Apache::randomlabel::label_arr,$ltext);
} elsif ($target eq 'edit') {
- $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::tag_start($target,$token,"$type Label");
my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
- $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',20,1).
- &Apache::edit::end_table();
+ if ($type eq 'image') {
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ $result.=&Apache::edit::text_arg('Description:','description',$token);
+ }
+ if ($type eq 'text') { $result.="Label Text:"; }
+ if ($type eq 'image') { $result.="Path to image: "; }
+ $result.=&Apache::edit::editline('',$text,'',50).
+ &Apache::edit::end_table();
} elsif ($target eq 'modified') {
my $text=$$parser[-1]->get_text("/label");
- $result.='<label>'.&Apache::edit::modifiedfield($token);
+ $result = '<label>';
+ if ($type eq 'image') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+ 'description');
+ if ($constructtag) {
+ $result = &Apache::edit::rebuild_tag($token);
+ } else {
+ $result = $token->[4];
+ }
+ }
+ $result.=&Apache::edit::modifiedfield($token);
}
return $result;
}