[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Fri, 17 May 2002 21:16:55 -0000
albertel Fri May 17 17:16:55 2002 EDT
Modified files:
/loncom/homework randomlabel.pm
Log:
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.25 loncom/homework/randomlabel.pm:1.26
--- loncom/homework/randomlabel.pm:1.25 Fri Apr 26 14:19:40 2002
+++ loncom/homework/randomlabel.pm Fri May 17 17:16:55 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.25 2002/04/26 18:19:40 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.26 2002/05/17 21:16:55 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -103,8 +103,8 @@
$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\">";
+ $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">\n";
+ $result.="<param name=\"bgimg\" value=\"$bgimg\">\n";
} elsif ($target eq 'tex') {
$bgimg=~s/(.gif|.jpg)$/.eps/;
$bgimg= &Apache::lonnet::filelocation($bgimg);
@@ -140,10 +140,10 @@
pop @Apache::lonxml::namespace;
if ($target eq 'web') {
$count = $Apache::randomlabel::tlabel_cnt;
- if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }
+ if( $count != 0) { $result.= "<param name=\"COUNT\" value=\"$count\">\n"; }
$count = $Apache::randomlabel::ilabel_cnt;
- if( $count != 0) { $result.= "<param name=\"icount\" value=\"$count\">"; }
- $result .= "</applet><BR />";
+ if( $count != 0) { $result.= "<param name=\"ICOUNT\" value=\"$count\">\n"; }
+ $result .= "</applet>\n<BR />";
} elsif ($target eq 'tex') {
$result='\end{picture}\\\\';
} elsif ($target eq 'edit') {
@@ -166,6 +166,7 @@
@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).
@@ -221,9 +222,9 @@
$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;
+ $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.':');
@@ -231,7 +232,7 @@
if ($target eq 'web') {
$result .= '<param name="' . $str . '" value="'.$label.'">';
$result .= '<param name="' . $xstr . '" value="'.$x.'">';
- $result .= '<param name="' . $ystr . '" value="'.$y.'">';
+ $result .= '<param name="' . $ystr . '" value="'.$y.'">'."\n";
}
}
} elsif ($target eq 'tex') {
@@ -321,20 +322,43 @@
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
+ my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
if ($target eq 'web' || $target eq 'tex' ||
$target eq 'grade' || $target eq 'answer') {
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="http://$ENV{'SERVER_NAME'}".&Apache::lonnet::hreflocation($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");
+ $result.=&Apache::edit::text_arg('Description:','description',$token);
my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
- $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
- &Apache::edit::editline('',$text,'',20).
- &Apache::edit::end_table();
+ $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
+ if ($type eq 'text') { $result.="Label Text:"; }
+ if ($type eq 'image') { $result.="Path to image:"; }
+ $result.=&Apache::edit::editline('',$text,'',20).
+ &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;
}