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

Diff for /loncom/homework/outputtags.pm between versions 1.28 and 1.31

version 1.28, 2003/05/02 19:11:12 version 1.31, 2003/08/13 18:50:43
Line 88  sub start_displaytitle { Line 88  sub start_displaytitle {
     } else {      } else {
  $Apache::outputtags::showonce{'displayduetitle'}=1;   $Apache::outputtags::showonce{'displayduetitle'}=1;
     }      }
       my $name=&Apache::structuretags::get_resource_name();
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<h1>$Apache::lonhomework::name</h1>";   $result="<h1>$name</h1>";
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.='</td></tr>';   $result.='</td></tr>';
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {      } elsif ($target eq 'tex' and $Apache::lonhomework::type ne 'exam') {
  $Apache::lonhomework::name=~s/%/\%/g;   $name=&Apache::lonxml::latex_special_symbols($name);
  $Apache::lonhomework::name=~s/&/\&/g;   $result='\vskip 0 mm\noindent\textbf{'.$name.'}\vskip 0 mm';
  $result='\vskip 0 mm\noindent\textbf{'.$Apache::lonhomework::name.'}\vskip 0 mm';  
     }      }
     return $result;      return $result;
 }  }
Line 109  sub end_displaytitle { Line 109  sub end_displaytitle {
     return @result;      return @result;
 }  }
   
   sub multipart {
       my ($uri)=@_;
       if (!defined($uri)) { $uri=$ENV{'request.uri'}; }
       my @parts;
       my $metadata = &Apache::lonnet::metadata($uri,'packages');
       foreach (split(/\,/,$metadata)) {
    if ($_ =~ /^part_(.*)$/) {
       my $part = $1;
       if ($part ne '0') { push(@parts,$part); }
    }
       }
       return @parts;
   }
   
 sub start_displayweight {  sub start_displayweight {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
Line 128  sub start_displayweight { Line 142  sub start_displayweight {
     if (!defined($weight) || ($weight eq '')) { $weight=1; }      if (!defined($weight) || ($weight eq '')) { $weight=1; }
     $result.=$weight;      $result.=$weight;
  } else {   } else {
     my $metadata = &Apache::lonnet::metadata($ENV{'request.uri'},      my @parts=&multipart($ENV{'request.uri'});
      'packages');  
     my $weight;      my $weight;
     foreach (split(/\,/,$metadata)) {      if (@parts) {
  if ($_ =~ /^part_(.*)$/) {          foreach my $part (@parts) {
     my $part = $1;  
     my $pweight=&Apache::lonnet::EXT("resource.$part.weight");      my $pweight=&Apache::lonnet::EXT("resource.$part.weight");
     if (!defined($pweight) || ($pweight eq '')) { $pweight=1; }      if (!defined($pweight) || ($pweight eq '')) { $pweight=1; }
     $weight+=$pweight;      $weight+=$pweight;
  }          }
       } else {
    $weight = &Apache::lonnet::EXT("resource.$id.weight");
                   if (!defined($weight) || ($weight eq '')) { $weight=1; }
     }      }
     $result=$weight;      $result=$weight;
  }   }
Removed from v.1.28  
changed lines
  Added in v.1.31

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