--- loncom/homework/randomlabel.pm	2001/10/13 05:57:43	1.4
+++ loncom/homework/randomlabel.pm	2002/01/21 16:40:57	1.11
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
+#
+# $Id: randomlabel.pm,v 1.11 2002/01/21 16:40:57 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 7/20/2001 Isaac Tsai, initial syntax
 # 8/10/2001 Isaac Tsai, 
 # 8/30/2001 Isaac Tsai, 
@@ -33,15 +58,30 @@
 #  ===========================================
 package Apache::randomlabel;
 use strict;
+use Apache::edit;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }
 
 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';
+
   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);
@@ -64,7 +104,7 @@ sub start_randomlabel {
       &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).
-	    '</td></tr><tr><td colspan="3">';
+	     &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',
@@ -103,17 +143,19 @@ 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') {
+  if ($target eq 'web' || $target eq 'tex' || 
+      $target eq 'grade' || $target eq 'answer') {
     $Apache::randomlabel::groupname=$name;
     $Apache::randomlabel::type=$type;
     @Apache::randomlabel::xcoord = ();
     @Apache::randomlabel::ycoord = ();
+    @Apache::randomlabel::value = ();
     @Apache::randomlabel::label_arr  = ();
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::select_arg('Type:','type',['text','image'],$token).
-	'</td></tr><tr><td colspan="3">';
+	  &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'name','type');
@@ -125,22 +167,27 @@ sub start_labelgroup {
   return $result;
 }
 
-sub add_var {
-  my ($name,$value,$type,$safeeval) = @_;
-  if ($type eq 'array') {
-    my $code = 'push(@'.$name.',\''.$value.'\');';
-    my $out=Apache::run::run($code,$safeeval);
-  } else {
-    &Apache::lonxml::error('Unsupported add_var type :'.$type.':');
+sub add_vars {
+  my ($name,$order,$label,$labelorder,$value,$safeeval) = @_;
+  my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
+  my $out=Apache::run::run($code,$safeeval);
+  if ($value) {
+    $code = '${'.$name."}{'value_".($order+1)."'}='".$value."';";
+    $out=Apache::run::run($code,$safeeval);
+    $code = '${'.$name."}{'labelvalue_".($labelorder+1)."'}='".$value."';";
+    $out=Apache::run::run($code,$safeeval);
   }
+  $code = '${'.$name."}{'numlocations'}='".($order+1)."';";
+  $out=Apache::run::run($code,$safeeval);
 }
+
 # begin to assign labels to locations
 sub end_labelgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $gname = $Apache::randomlabel::groupname;
   my $type  = $Apache::randomlabel::type;
   my $result='';
-  if ($target eq 'web') {
+  if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
     my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
     &Apache::structuretags::shuffle(\@idx_arr);
     for(0 .. $#Apache::randomlabel::label_arr) {
@@ -148,14 +195,17 @@ sub end_labelgroup {
       my $xstr;
       my $ystr;
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$_] ]";
+      my $x = $Apache::randomlabel::xcoord[$_];
+      my $y = $Apache::randomlabel::ycoord[$_];
+      my $value = $Apache::randomlabel::value[$_];
       if( $type eq 'text') {
-	&add_var($gname,$label,'array',$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_var($gname,$idx_arr[$_],'array',$safeeval);
+	&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;
@@ -163,11 +213,11 @@ sub end_labelgroup {
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
-      my $x = $Apache::randomlabel::xcoord[$_];
-      my $y = $Apache::randomlabel::ycoord[$_];
-      $result .= '<param name="' . $str  . '" value="'.$label.'">';
-      $result .= '<param name="' . $xstr . '" value="'.$x.'">';
-      $result .= '<param name="' . $ystr . '" value="'.$y.'">';
+      if ($target eq 'web') {
+	$result .= '<param name="' . $str  . '" value="'.$label.'">';
+	$result .= '<param name="' . $xstr . '" value="'.$x.'">';
+	$result .= '<param name="' . $ystr . '" value="'.$y.'">';
+      }
     }
   } elsif ($target eq 'tex') {
     my $WX1=0; #  Web x-coord. of upper left corner (ULC)
@@ -194,15 +244,16 @@ sub end_labelgroup {
       my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
       my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];
+      my $value = $Apache::randomlabel::value[$i];
       my $tcX=$x*($texwidth/$wwidth);
       my $tcY=$TY1-$y*($TY1/$wheight)-2;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
       if( $type eq 'text') {
-	&add_var($gname,$label,'array',$safeeval);
+	&add_vars($gname,$i,$label,$idx_arr[$i],$value,$safeeval);
       } elsif ( $type eq 'image') {
-	&add_var($gname,$idx_arr[$i],'array',$safeeval);
+	&add_vars($gname,$i,$idx_arr[$i],$idx_arr[$i],$value,$safeeval);
       } else {
 	&Apache::lonxml::error('Unknown type of label :'.$type.':');
       }
@@ -213,23 +264,26 @@ sub end_labelgroup {
   return $result;
 }
 
-# <location x=123 y=456 />
+# <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 $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
   my $result='';
   push(@Apache::randomlabel::xcoord,$x);
   push(@Apache::randomlabel::ycoord,$y);
+  push(@Apache::randomlabel::value,$value);
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).
-	'</td></tr><tr><td colspan="3">';
+	&Apache::edit::text_arg('Value:','value',$token).
+	  &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'x','y');
+						 'x','y','value');
     if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();
@@ -249,18 +303,19 @@ sub end_location {
 sub start_label {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  if ($target eq 'web' || $target eq 'tex') {
+  if ($target eq 'web' || $target eq 'tex' || 
+      $target eq 'grade' || $target eq 'answer') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
-    $result.='</td></tr><tr><td colspan="3">'.
+    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
       &Apache::edit::editfield('',$text,'',20,1).
 	&Apache::edit::end_table();
   } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");
-    $result.=&Apache::edit::modifiedfield($token);
+    $result.='<label>'.&Apache::edit::modifiedfield($token);
   }
   return $result;
 }