[BACK]Return to randomlabel.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlabel.pm between versions 1.22 and 1.23

version 1.22, 2002/03/22 22:06:06 version 1.23, 2002/04/08 21:28:53
Line 64  BEGIN { Line 64  BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));    &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 {  sub start_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';    my $result='';
   $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=    push (@Apache::lonxml::extlinks, '/res/adm/includes/GLabel.class');
     '/res/adm/includes/GLabel.class';  
   push (@Apache::lonxml::namespace,'randomlabel');    push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);    my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
   
   if ( $bgimg !~ /^http:/ ) {    if ( $bgimg !~ /^http:/ ) {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$bgimg;      push (@Apache::lonxml::extlinks,$bgimg);
     $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);      $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
     if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {      if ($bgimg =~ /$Apache::lonnet::perlvar{'lonDocRoot'}/) {
       $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;        $bgimg=~s/$Apache::lonnet::perlvar{'lonDocRoot'}//;
Line 84  sub start_randomlabel { Line 94  sub start_randomlabel {
   }    }
   my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);    my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);    my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);    my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
   my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);    my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);    my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }    if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }    if (!$codebase) { $codebase='/res/adm/includes/'; }
Line 272  sub end_labelgroup { Line 282  sub end_labelgroup {
 # <location x="123" y="456" value="some value"/>  # <location x="123" y="456" value="some value"/>
 sub start_location {  sub start_location {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $x= &Apache::lonxml::get_param('x',$parstack,$safeeval);    my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
   my $y= &Apache::lonxml::get_param('y',$parstack,$safeeval);    my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
   my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);    my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
   my $result='';    my $result='';
   push(@Apache::randomlabel::xcoord,$x);    push(@Apache::randomlabel::xcoord,$x);
Removed from v.1.22  
changed lines
  Added in v.1.23

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