Diff for /loncom/homework/randomlabel.pm between versions 1.64 and 1.68

version 1.64, 2005/02/10 23:00:10 version 1.68, 2005/04/12 09:35:22
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 7/20/2001 Isaac Tsai, initial syntax  
 # 8/10/2001 Isaac Tsai,   
 # 8/30/2001 Isaac Tsai,   
 # SYNTAX:  # SYNTAX:
 # <randomlabel bgimg="URL" width="12" height="45" texwidth="50">  # <randomlabel bgimg="URL" width="12" height="45" texwidth="50">
 #    <labelgroup name="GroupOne" type="image">  #    <labelgroup name="GroupOne" type="image">
Line 91  sub start_randomlabel { Line 88  sub start_randomlabel {
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);      my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
     if ( defined($bgimg) && $bgimg !~ /^http:/ ) {      if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
  $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);   $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
  if (&Apache::lonnet::repcopy($bgimg) ne OK) {   if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {
     $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';      $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
  }   }
     }      }
Line 176  sub make_eps_image { Line 173  sub make_eps_image {
  &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,   &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
        $depth,1);         $depth,1);
     my $dirtywidth=$width_param+5;      my $dirtywidth=$width_param+5;
     my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.      my $result ="\n".'\vspace*{2mm}\noindent'."\n".
    '\parbox{'.$dirtywidth.
  ' mm}{  \noindent \epsfxsize='.$width_param.   ' mm}{  \noindent \epsfxsize='.$width_param.
  ' mm \epsffile{'.$path.$file.   ' mm \epsffile{'.$path.$file.
  '}\setlength{\unitlength}{1mm}  \begin{picture}('.   '}\setlength{\unitlength}{1mm}'."\n".'  \begin{picture}('.
  $width_param.','.$height_param.')(0,-'.$height_param.')';   $width_param.','.$height_param.')(0,-'.$height_param.')'."\n";
     return $result;      return $result;
 }  }
   
Line 201  sub start_labelgroup { Line 199  sub start_labelgroup {
  @Apache::randomlabel::ycoord = ();   @Apache::randomlabel::ycoord = ();
  @Apache::randomlabel::value = ();   @Apache::randomlabel::value = ();
  @Apache::randomlabel::label_arr  = ();   @Apache::randomlabel::label_arr  = ();
  @Apache::randomlabel::decription  = ();   @Apache::randomlabel::description  = ();
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Name:','name',$token).   $result.=&Apache::edit::text_arg('Name:','name',$token).

Removed from v.1.64  
changed lines
  Added in v.1.68


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>