Diff for /loncom/homework/structuretags.pm between versions 1.164 and 1.168

version 1.164, 2003/04/03 21:58:09 version 1.168, 2003/05/04 08:00:31
Line 38  use Apache::File(); Line 38  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));      &Apache::lonxml::register('Apache::structuretags',('block','languageblock','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext'));
 }  }
   
 sub start_web {  sub start_web {
Line 104  sub page_start { Line 104  sub page_start {
  }   }
  $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);   $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
  if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {   if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
     my ($symb)=&Apache::lonxml::whichuser();      my ($symb,undef,undef,undef,$publicuser)=
     if ($symb eq '') {   &Apache::lonxml::whichuser();
       if ($symb eq '' && !$publicuser) {
  my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");   my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
  $help="Browsing resource, all submissions are temporary.<br />";   $help="Browsing resource, all submissions are temporary.<br />";
  $body_tag_start.=$help;   $body_tag_start.=$help;
Line 270  sub start_problem { Line 271  sub start_problem {
     @Apache::structuretags::whileconds=();      @Apache::structuretags::whileconds=();
     @Apache::structuretags::whilebody=();      @Apache::structuretags::whilebody=();
     @Apache::structuretags::whileline=();      @Apache::structuretags::whileline=();
       $Apache::lonhomework::scantronmode=0;
   
       if (defined($ENV{'scantron.maxquest'})) {
    $Apache::lonhomework::scantronmode=1;
       }
   
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
  &initialize_storage();   &initialize_storage();
Line 597  sub end_block { Line 603  sub end_block {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq "edit") {      if ($target eq "edit") {
    $result.= &Apache::edit::tag_end($target,$token,'');
       }
       return $result;
   }
   
   sub start_languageblock {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
       my $result;
   
       if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'analyze') {
    my $include = $token->[2]->{'include'};
    my $exclude = $token->[2]->{'exclude'};
           my %languages=&Apache::loncommon::display_languages();
           $result='1';
    if ($include) {
               $result='';
               foreach (split(/\,/,$include)) {
                   if ($languages{$_}) { $result='1'; }
               }
    }
           if ($exclude) {
               foreach (split(/\,/,$exclude)) {
                   if ($languages{$_}) { $result='0'; }
               }
    }
    if ( ! $result ) {
       my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser);
       &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
    }
    $result='';
       } elsif ($target eq 'edit') {
    $result .=&Apache::edit::tag_start($target,$token);
    $result .=&Apache::edit::text_arg('Include Language:','include',
     $token,40);
    $result .=&Apache::edit::text_arg('Exclude Language:','exclude',
     $token,40);
    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'include',
        'exclude');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       }
       return $result;
   }
   
   sub end_languageblock {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result;
       if ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
     }      }
     return $result;      return $result;

Removed from v.1.164  
changed lines
  Added in v.1.168


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