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

Diff for /loncom/interface/lonprintout.pm between versions 1.560 and 1.560.2.2

version 1.560, 2009/08/03 11:01:14 version 1.560.2.2, 2009/08/25 10:57:18
Line 26 Line 26
 #  #
 #  #
 package Apache::lonprintout;  package Apache::lonprintout;
   
 use strict;  use strict;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
 use Apache::lonxml;  use Apache::lonxml;
Line 74  my $ssi_retry_count = 5; # Some arbitrar Line 73  my $ssi_retry_count = 5; # Some arbitrar
   
 my $font_size = 'normalsize'; # Default is normalsize...  my $font_size = 'normalsize'; # Default is normalsize...
   
   #----------------------------  Helper helpers. -------------------------
   
   #  Returns the text needd for a student chooser.
   #  that text must still be parsed by the helper xml parser.
   # Parameters:
   #   this_state   - State name of the chooser.
   #   sort_choice  - variable to hold the sorting choice.
   #   variable     - Name of variable to hold students.
   #   next_state   - State after chooser.
   
   
   sub generate_student_chooser {
       my ($this_state, 
    $sort_choice, 
    $variable, 
    $next_state) = @_;
   
       my $result = <<CHOOSE_STUDENTS;
     <state name="$this_state" title="Select Students and Resources">
         <message><b>Select sorting order of printout</b> </message>
   
       <choices variable="$sort_choice">
         <choice computer='0'>Sort by section then student</choice>
         <choice computer='1'>Sort by students across sections.</choice>
       </choices>
   
         <message><br /><hr /><br /> </message>
         <student multichoice='1' 
                  variable="$variable" 
                  nextstate="$next_state" 
                  coursepersonnel="1" />
     </state>
   
   CHOOSE_STUDENTS
   
     return $result;
   }
   
   #-----------------------------------------------------------------------
   
   
 # Fetch the contents of a resource, uninterpreted.  # Fetch the contents of a resource, uninterpreted.
 # This is used here to fetch a latex file to be included  # This is used here to fetch a latex file to be included
Line 1343  sub print_page_in_course { Line 1382  sub print_page_in_course {
   
   
     if ($mode ne '') {$mode='\\'.$mode}      if ($mode ne '') {$mode='\\'.$mode}
     my $result.= &print_latex_header($mode);      my $result   =    &print_latex_header($mode);
     if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {      if ($currentURL=~m|^(/adm/wrapper/)?ext/|) {
  $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;   $currentURL=~s|^(/adm/wrapper/)?ext/|http://|;
  my $title=&Apache::lonnet::gettitle($symb);   my $title=&Apache::lonnet::gettitle($symb);
Line 1413  sub print_page_in_course { Line 1452  sub print_page_in_course {
   
     my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);      my $texversion = &ssi_with_retries($urlp, $ssi_retry_count, %form);
   
     # There seems to be an extraneous \vskip 1mm \\\\ :  
   
     $texversion =~ s/^\\vskip 1mm \\\\\\\\//;  
   
     # current document with answers.. no need to encap in minipage      # current document with answers.. no need to encap in minipage
     #  since there's only one answer.      #  since there's only one answer.
Line 1438  sub print_page_in_course { Line 1474  sub print_page_in_course {
  if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {   if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
     $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;      $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
  } else {   } else {
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     if ($helper->{'VARS'}->{'construction'} ne '1') {      if ($helper->{'VARS'}->{'construction'} ne '1') {
  my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});   my $title = &Apache::lonnet::gettitle($helper->{'VARS'}->{'symb'});
  $title = &Apache::lonxml::latex_special_symbols($title);   $title = &Apache::lonxml::latex_special_symbols($title);
Line 1473  sub print_page_in_course { Line 1509  sub print_page_in_course {
  $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;   $texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$currentURL| \\strut\\\\\\strut /;
   
     }      }
       $texversion = &latex_header_footer_remove($texversion);
   
       # the first remaining line is a comment from londefdef the second
       # line  seems to be an extraneous \vskip 1mm \\\\ :
               # (imperfect removal from header_footer_remove?
   
       $texversion =~ s/\\vskip 1mm \\\\\\\\//;
   
     $result .= $texversion;      $result .= $texversion;
     if ($currentURL=~m/\.page\s*$/) {      if ($currentURL=~m/\.page\s*$/) {
  ($result,$numberofcolumns) = &page_cleanup($result);   ($result,$numberofcolumns) = &page_cleanup($result);
Line 1560  sub recently_generated { Line 1604  sub recently_generated {
 #    A reference to a page break hash.  #    A reference to a page break hash.
 #  #
 #  #
 #use Data::Dumper;  use Data::Dumper;
 #sub dump_helper_vars {  #sub dump_helper_vars {
 #    my ($helper) = @_;  #    my ($helper) = @_;
 #    my $helpervars = Dumper($helper->{'VARS'});  #    my $helpervars = Dumper($helper->{'VARS'});
Line 1962  ENDPART Line 2006  ENDPART
   $helper->{'VARS'}->{'symb'});    $helper->{'VARS'}->{'symb'});
  }   }
     } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or      } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')       or
        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') or
        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
              ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or               ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')       or
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_resources')      or # BUGBUG
Line 1970  ENDPART Line 2016  ENDPART
   
   
         #-- produce an output string          #-- produce an output string
  if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {   if (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems')  or
       ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_in_page') ) {
     $selectionmade = 2;      $selectionmade = 2;
  } elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {   } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') or
    ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_resources_in_page'))
    {
       &Apache::lonnet::logthis("Selectionmade => 3");
     $selectionmade = 3;      $selectionmade = 3;
  } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems')    } elsif (($helper->{'VARS'}->{'PRINT_TYPE'} eq 'all_problems') 
  ) {   ) {
Line 2012  ENDPART Line 2062  ENDPART
     $result.="\\newpage\n";      $result.="\\newpage\n";
  }   }
     }      }
     my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);      my ($sequence,$middle_thingy,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
     $urlp=&Apache::lonnet::clutter($urlp);      $urlp=&Apache::lonnet::clutter($urlp);
     $form{'symb'}=$master_seq[$i];      $form{'symb'}=$master_seq[$i];
   
       &Apache::lonnet::logthis("Element $i Sequence $sequence Middle $middle_thingy URLP $urlp");
     my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem      my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #title of the assignment which contains this problem
   
     if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}      if ($selectionmade==7) {$helper->{VARS}->{'assignment'}=$assignment;}
Line 2024  ENDPART Line 2074  ENDPART
     my $texversion='';      my $texversion='';
     if ($urlp!~m|^/adm/|      if ($urlp!~m|^/adm/|
  && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {   && $urlp=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) {
    &Apache::lonnet::logthis("Problem");
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  &Apache::lonxml::remember_problem_counter();   &Apache::lonxml::remember_problem_counter();
    &Apache::lonnet::logthis("Fetching tex for $urlp");
    my $debug = Dumper(%form);
    &Apache::lonnet::logthis("Form: $debug");
   
  $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);   $texversion.=&ssi_with_retries($urlp, $ssi_retry_count, %form);
    &Apache::lonnet::logthis("texversion so far: $texversion");
  if ($urlp=~/\.page$/) {   if ($urlp=~/\.page$/) {
       &Apache::lonnet::("Special page actions");
     ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);      ($texversion,my $number_of_columns_page) = &page_cleanup($texversion);
     if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;}       if ($number_of_columns_page > $number_of_columns) {$number_of_columns=$number_of_columns_page;} 
     $texversion =~ s/\\end{document}\d*/\\end{document}/;      $texversion =~ s/\\end{document}\d*/\\end{document}/;
Line 2050  ENDPART Line 2106  ENDPART
  $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;   $texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
     } else {      } else {
  if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {   if ($urlp=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
       &Apache::lonnet::logthis("problem printing");
     $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});      $texversion=&print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
     $texversion =~ s/\\begin{document}//;      $texversion =~ s/\\begin{document}//;
     my $title = &Apache::lonnet::gettitle($master_seq[$i]);      my $title = &Apache::lonnet::gettitle($master_seq[$i]);
Line 2095  ENDPART Line 2152  ENDPART
     }      }
  }   }
  $result .= $texversion;   $result .= $texversion;
    &Apache::lonnet::logthis("About to set rem header true with $result");
  $flag_latex_header_remove = 'YES';      $flag_latex_header_remove = 'YES';   
     } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {       } elsif ($urlp=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) { 
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
Line 2927  sub printHelper { Line 2985  sub printHelper {
         $subdir = substr($helper->{VARS}->{'filename'},          $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);                           0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
     } else {      } else {
    # From course space:
   
  if ($symb ne '') {   if ($symb ne '') {
     ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);      ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
     $helper->{VARS}->{'postdata'} =       $helper->{VARS}->{'postdata'} = 
Line 2934  sub printHelper { Line 2994  sub printHelper {
  } else {   } else {
     $url = $helper->{VARS}->{'postdata'};      $url = $helper->{VARS}->{'postdata'};
     $is_published=1; # From resource space.      $is_published=1; # From resource space.
       &Apache::lonnet::logthis("Resource url $url");
  }   }
  $url = &Apache::lonnet::clutter($url);   $url = &Apache::lonnet::clutter($url);
   
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename          if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};              my $postdata = $helper->{VARS}->{'postdata'};
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);              $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
Line 2996  sub printHelper { Line 3056  sub printHelper {
     "' variable='FINISHPAGE' />";      "' variable='FINISHPAGE' />";
     }      }
   
       # If not construction space user can print the components of a page:
   
       my $page_ispage;
       my $page_title;
       if (!$helper->{VARS}->{'construction'}) {
    my $varspostdata = $helper->{VARS}->{'postdata'};
    my $varsassignment = $helper->{VARS}->{'assignment'};
    my $page_navmap         = Apache::lonnavmaps::navmap->new();
    my @page_resources      = $page_navmap->retrieveResources($url);
    if(defined($page_resources[0])) {
    $page_ispage       = $page_resources[0]->is_page();
    $page_title     = $page_resources[0]->title();
    my $resourcesymb   = $page_resources[0]->symb();
    my ($pagemap, $pageid, $pageurl) = &Apache::lonnet::decode_symb($symb);
    if ($page_ispage) {
       push @{$printChoices}, 
       [&mt('Selected [_1]Problems[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'), 
        'map_problems_in_page', 
        'CHOOSE_PROBLEMS_PAGE'];
       push @{$printChoices}, 
            [&mt('Selected [_1]Resources[_2] from page [_3]', '<b>', '</b>', '<b><i>'.$page_title.'</i></b>'), 
     'map_resources_in_page', 
     'CHOOSE_RESOURCES_PAGE'];
    }
           my $helperFragment = <<HELPERFRAGMENT;
    <state name="CHOOSE_PROBLEMS_PAGE" title="Select Problem(s) to print">
       <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                 closeallpages="1">
    <nextstate>PAGESIZE</nextstate>
         <filterfunc>return $isProblem;</filterfunc>
         <mapurl>$url</mapurl>
         <valuefunc>return $symbFilter;</valuefunc>
         $start_new_option
         </resource>
       </state>
   
     <state name="CHOOSE_RESOURCES_PAGE" title="Select Resource(s) to print">
       <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
                 closeallpages="1">
         <nextstate>PAGESIZE</nextstate>
         <filterfunc>return $isNotMap;</filterfunc>
         <mapurl>$url</mapurl>
         <valuefunc>return $symbFilter;</valuefunc>
         $start_new_option
         </resource>
       </state>
   HELPERFRAGMENT
   
    &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
   
       }
       }
   
     if (($helper->{'VARS'}->{'construction'} ne '1' ) &&      if (($helper->{'VARS'}->{'construction'} ne '1' ) &&
  $helper->{VARS}->{'postdata'} &&   $helper->{VARS}->{'postdata'} &&
  $helper->{VARS}->{'assignment'}) {   $helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence          # Allow problems from sequence
         push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems', 'CHOOSE_PROBLEMS'];          push @{$printChoices}, 
       [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
        'map_problems', 
        'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence          # Allow all resources from sequence
         push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];          push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 
    'map_problems_pages', 
    'CHOOSE_PROBLEMS_HTML'];
    &Apache::lonnet::logthis("Map url : $map");
         my $helperFragment = <<HELPERFRAGMENT;          my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">    <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"      <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
Line 3033  HELPERFRAGMENT Line 3151  HELPERFRAGMENT
   
     # If the user has pfo (print for others) allow them to print all       # If the user has pfo (print for others) allow them to print all 
     # problems and resources  in the entire course, optionally for selected students      # problems and resources  in the entire course, optionally for selected students
       my $post_data = $helper->{VARS}->{'postdata'};
     if ($perm{'pfo'} &&  !$is_published  &&      if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {           ($post_data=~/\/res\// || $post_data =~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
   
         push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];          push @{$printChoices}, [&mtn('Selected <b>Problems</b> from <b>entire course</b>'), 'all_problems', 'ALL_PROBLEMS'];
  push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];   push @{$printChoices}, [&mtn('Selected <b>Resources</b> from <b>entire course</b>'), 'all_resources', 'ALL_RESOURCES'];
Line 3082  HELPERFRAGMENT Line 3201  HELPERFRAGMENT
 ALL_PROBLEMS  ALL_PROBLEMS
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_students', 'CHOOSE_STUDENTS'];  
     push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_anon', 'CHOOSE_ANON1'];      # If we were looking at a page, allow a selection of problems from the page
       # either for selected students or for coded assignments.
   
       if ($page_ispage) {
    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]selected people[_5]',
       '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
    'problems_for_students', 'CHOOSE_STUDENTS'];
    push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from page [_3] for [_4]CODEd assignments[_5]',
       '<b>', '</b>', '<b><i>'.$page_title.'</i></b>', '<b>', '</b>'),
    'problems_for_anon', 'CHOOSE_ANON1'];
       }
       push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]',
    '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 
       'problems_for_students', 'CHOOSE_STUDENTS'];
       push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]',
    '<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 
       'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
  my $randomly_ordered_warning =    my $randomly_ordered_warning = 
Line 3132  ALL_PROBLEMS Line 3267  ALL_PROBLEMS
     </state>      </state>
 RESOURCE_SELECTOR  RESOURCE_SELECTOR
   
         &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);  # Generate student choosers.
   <state name="CHOOSE_STUDENTS" title="Select Students and Resources">  
       <message><b>Select sorting order of printout</b> </message>  
     <choices variable='student_sort'>  
       <choice computer='0'>Sort by section then student</choice>  #        &Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
       <choice computer='1'>Sort by students across sections.</choice>  #  <state name="CHOOSE_STUDENTS" title="Select Students and Resources">
     </choices>  #      <message><b>Select sorting order of printout</b> </message>
       <message><br /><hr /><br /> </message>  #    <choices variable='student_sort'>
       <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>  #
   </state>  #
     $resource_selector  #      <choice computer='0'>Sort by section then student</choice>
 CHOOSE_STUDENTS  #      <choice computer='1'>Sort by students across sections.</choice>
   #    </choices>
   #      <message><br /><hr /><br /> </message>
   #      <student multichoice='1' variable="STUDENTS" nextstate="SELECT_PROBLEMS" coursepersonnel="1"/>
   #  </state>
    &Apache::lonxml::xmlparse($r, 'helper', 
     &generate_student_chooser('CHOOSE_STUDENTS',
       'student_sort',
       'STUDENTS',
       'SELECT_PROBLEMS'));
    &Apache::lonxml::xmlparse($r, 'helper', $resource_selector);
   #    $resource_selector
   #    CHOOSE_STUDENTS
   
  my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};   my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};   my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
Removed from v.1.560  
changed lines
  Added in v.1.560.2.2

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