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

Diff for /loncom/interface/lonprintout.pm between versions 1.121 and 1.123

version 1.121, 2003/02/27 19:41:40 version 1.123, 2003/02/28 17:38:40
Line 157  sub sequence_content_menu { Line 157  sub sequence_content_menu {
     my $primary_sequence;      my $primary_sequence;
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});      my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
     my @sequence = split('___',$symbolic);      my @sequence = split('___',$symbolic);
     if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}       $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
       else {$primary_sequence = '/res/'.$sequence[0];}   
     my @master_seq = &coming_from_hash($primary_sequence);      my @master_seq = &coming_from_hash($primary_sequence);
     my @titles_master_seq = ();       my @titles_master_seq = (); 
     for (my $i=0;$i<=$#master_seq;$i++) {      for (my $i=0;$i<=$#master_seq;$i++) {
Line 550  ENDPART Line 549  ENDPART
     }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {      }  elsif ($choice eq 'Standard LaTeX output for the top level sequence') {
         # where is the main sequence of the course?          # where is the main sequence of the course?
  $selectionmade = 4;   $selectionmade = 4;
  my $main_seq;   my $main_seq=&Apache::lonnet::clutter($ENV{'request.course.uri'});
  if ($ENV{'request.course.uri'}=~/\/?uploaded\//) {  
     $main_seq = $ENV{'request.course.uri'};  
  } else {  
     $main_seq = '/res/'.$ENV{'request.course.uri'};  
  }  
  my @file_seq = &coming_from_hash($main_seq);   my @file_seq = &coming_from_hash($main_seq);
  for (my $i=0;$i<=$#file_seq;$i++) {   for (my $i=0;$i<=$#file_seq;$i++) {
     my ($path,$title,$symb) = split /&&/,$file_seq[$i];      my ($path,$title,$symb) = split /&&/,$file_seq[$i];
Line 598  ENDPART Line 592  ENDPART
  my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});   my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
  my @sequence = split('___',$symbolic);   my @sequence = split('___',$symbolic);
  my $primary_sequence;   my $primary_sequence;
  if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];}   
           else {$primary_sequence = '/res/'.$sequence[0];}     $primary_sequence=&Apache::lonnet::clutter($sequence[0]);
  my @master_seq = &coming_from_hash($primary_sequence);    my @master_seq = &coming_from_hash($primary_sequence); 
  for (my $i=0;$i<=$#master_seq;$i++) {   for (my $i=0;$i<=$#master_seq;$i++) {
     my ($path,$title,$symb) = split /&&/,$master_seq[$i];      my ($path,$title,$symb) = split /&&/,$master_seq[$i];
Line 742  sub coming_from_hash { Line 736  sub coming_from_hash {
  if ($hash{'src_'.$current_resource}=~/\.sequence$/) {   if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
     push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});      push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
  } else {   } else {
     my $presymb;       my $presymb=&Apache::lonnet::declutter($mainsequence);
     if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}   
               elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}   
     my $rid = $current_resource;      my $rid = $current_resource;
     if ($rid=~/,/) {      if ($rid=~/,/) {
  my @rid = split /,/, $rid;   my @rid = split /,/, $rid;
Line 758  sub coming_from_hash { Line 750  sub coming_from_hash {
         $rid =~ m/^$mapid\.(\d*)/;          $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;                    $rid = $1;  
     }      }
     $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;      my $symb = $presymb.'___'.$rid.'___'.
     my $symb = $presymb.'___'.$rid.'___'.$1;       &Apache::lonnet::declutter($hash{'src_'.$current_resource});
     push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;      push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
  }   }
  $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};   $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
Line 768  sub coming_from_hash { Line 760  sub coming_from_hash {
  if ($hash{'src_'.$current_resource}=~/\.sequence$/) {   if ($hash{'src_'.$current_resource}=~/\.sequence$/) {
     push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});      push @resourcelist,&coming_from_hash($hash{'src_'.$current_resource});
  } else {   } else {
     my $presymb;       my $presymb=&Apache::lonnet::declutter($mainsequence);
     if ($mainsequence =~ /\/res\/(.*)$/) {$presymb = $1;}   
               elsif ($mainsequence =~ /\/?(uploaded\/(.*))$/) {$presymb = $1;}   
     my $rid = $current_resource;      my $rid = $current_resource;
     if ($rid=~/,/) {      if ($rid=~/,/) {
  my @rid = split /,/, $rid;   my @rid = split /,/, $rid;
Line 784  sub coming_from_hash { Line 774  sub coming_from_hash {
         $rid =~ m/^$mapid\.(\d*)/;          $rid =~ m/^$mapid\.(\d*)/;
                 $rid = $1;                    $rid = $1;  
     }      }
     $hash{'src_'.$current_resource} =~ m/\/res\/(.*)$/;      my $symb = $presymb.'___'.$rid.'___'.
     my $symb = $presymb.'___'.$rid.'___'.$1;       &Apache::lonnet::declutter($hash{'src_'.$current_resource});
     push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;      push @resourcelist,$hash{'src_'.$current_resource}.'&&'.$hash{'title_'.$current_resource}.'&&'.$symb;
  }   }
  $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};   $current_resource = $hash{'goesto_'.$hash{'to_'.$current_resource}};
Line 1159  sub details_for_menu { Line 1149  sub details_for_menu {
     my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};      my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});      my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
     my ($map,$id,$resource)=split(/___/,$symbolic);      my ($map,$id,$resource)=split(/___/,$symbolic);
       $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence;      my $name_of_sequence;
     if ($map=~/^uploaded/) {      $name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
  $name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}};  
     } else {  
  $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};  
     }  
     if ($name_of_sequence =~ /^\s*$/) {      if ($name_of_sequence =~ /^\s*$/) {
      $map =~ m|([^/]+)$|;   $map =~ m|([^/]+)$|;
       $name_of_sequence = $1;   $name_of_sequence = $1;
     }      }
     my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};      my $name_of_map = $hash{'title_'.$hash{'ids_'.&Apache::lonnet::clutter($ENV{'request.course.uri'})}};
     if ($name_of_map =~ /^\s*$/) {      if ($name_of_map =~ /^\s*$/) {
       $ENV{'request.course.uri'} =~ m|([^/]+)$|;   $ENV{'request.course.uri'} =~ m|([^/]+)$|;
       $name_of_map = $1;   $name_of_map = $1;
     }        }
     return ($name_of_resourse,$name_of_sequence,$name_of_map);      return ($name_of_resourse,$name_of_sequence,$name_of_map);
   
 }  }
Line 1355  sub printWizard { Line 1342  sub printWizard {
     if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) {       if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($ENV{'form.postdata'}=~/\/res\//)) { 
         push @{$printChoices}, ['all_problems', '<b>All problems</b> in course (may take a lot of time)', 'CHOOSE_FORMAT'];          push @{$printChoices}, ['all_problems', '<b>All problems</b> in course (may take a lot of time)', 'CHOOSE_FORMAT'];
         push @{$printChoices}, ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_STUDENTS'];          push @{$printChoices}, ['problems_for_students', "Problems from <b>$sequenceTitle</b> for selected students", 'CHOOSE_STUDENTS'];
         Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", '', 'CHOOSE_FORMAT', 'STUDENTS', 1);          Apache::lonwizard::choose_student->new($wizard, "CHOOSE_STUDENTS", "Choose Students", "Select the students you wish to print the problems for:", 'CHOOSE_FORMAT', 'STUDENTS', 1);
     }      }
   
     # FIXME: That RE should come from a library somewhere.      # FIXME: That RE should come from a library somewhere.
Line 1422  sub new { Line 1409  sub new {
     return $self;      return $self;
 }  }
   
 sub postprocess {  
     my $self = shift;  
     my $wizard = $self->{WIZARD};  
   
     # We have to manually collect the value and store it in the   
     # wizard variable  
     my $result = $ENV{'form.' . $self->{VAR_NAME} . '.layout'} . '|';  
     $result .= $ENV{'form.' . $self->{VAR_NAME} . '.cols'} . '|';  
     $result .= $ENV{'form.' . $self->{VAR_NAME} . '.paper'};  
       
     $wizard->setVar($self->{VAR_NAME}, $result);  
     $wizard->changeState($self->{NEXT_STATE});  
 }  
   
 sub render {  sub render {
     my $self = shift;      my $self = shift;
     my $wizard = $self->{WIZARD};      my $wizard = $self->{WIZARD};
Removed from v.1.121  
changed lines
  Added in v.1.123

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