Diff for /loncom/interface/lonprintout.pm between versions 1.506 and 1.512

version 1.506, 2007/07/25 23:20:38 version 1.512, 2008/01/21 10:24:23
Line 1 Line 1
 #  
 # The LearningOnline Network  # The LearningOnline Network
 # Printout  # Printout
 #  #
Line 38  use Apache::grades; Line 37  use Apache::grades;
 use Apache::edit;  use Apache::edit;
 use Apache::File();  use Apache::File();
 use Apache::lonnavmaps;  use Apache::lonnavmaps;
   use Apache::admannotations;
   
 use LONCAPA::map();  use LONCAPA::map();
 use POSIX qw(strftime);  use POSIX qw(strftime);
 use Apache::lonlocal;  use Apache::lonlocal;
Line 70  sub fetch_raw_resource { Line 71  sub fetch_raw_resource {
           
 }  }
   
   #  Fetch the annotations associated with a URL and 
   #  put a centered 'annotations:' title.
   #  This is all suppressed if the annotations are empty.
   #
   sub annotate {
       my ($symb) = @_;
   
       my $annotation_text = &Apache::admannotations::get_annotation($symb, 1);
   
   
       my $result = "";
   
       if (length($annotation_text) > 0) {
    $result .= '\\hspace*{\\fill} \\\\[\\baselineskip] \textbf{Annotations:} \\\\ ';
    $result .= "\n";
    $result .= &Apache::lonxml::latex_special_symbols($annotation_text,""); # Escape latex.
    $result .= "\n\n";
       }
       return $result;
   }
   
 #  #
 #   printf_style_subst  item format_string repl  #   printf_style_subst  item format_string repl
 #    #  
Line 1319  sub output_data { Line 1341  sub output_data {
 </script>  </script>
 ENDPART  ENDPART
   
   
   
     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);      my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);
     my $msg = &mt('Please stand by while processing your print request, this may take some time ...');      my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
   
Line 1352  ENDPART Line 1376  ENDPART
     my @print_array=();      my @print_array=();
     my @student_names=();      my @student_names=();
   
        
     #  Common settings for the %form has:      #  Common settings for the %form has:
     # In some cases these settings get overriddent by specific cases, but the      # In some cases these settings get overriddent by specific cases, but the
     # settings are common enough to make it worthwhile factoring them out      # settings are common enough to make it worthwhile factoring them out
Line 1389  ENDPART Line 1414  ENDPART
     $currentURL=$helper->{'VARS'}->{'postdata'};      $currentURL=$helper->{'VARS'}->{'postdata'};
     $cleanURL=&Apache::lonenc::check_decrypt($currentURL);      $cleanURL=&Apache::lonenc::check_decrypt($currentURL);
  } else {   } else {
   
             #prints resource from the construction space              #prints resource from the construction space
     $currentURL='/'.$helper->{'VARS'}->{'filename'};      $currentURL='/'.$helper->{'VARS'}->{'filename'};
     if ($currentURL=~/([^?]+)/) {$currentURL=$1;}      if ($currentURL=~/([^?]+)/) {$currentURL=$1;}
Line 1407  ENDPART Line 1433  ENDPART
  $form{'suppress_tries'}=$parmhash{'suppress_tries'};   $form{'suppress_tries'}=$parmhash{'suppress_tries'};
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}   $form{'print_annotations'}=$helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') ||
       ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
       $form{'problem_split'}='yes';
    }
  if ($helper->{'VARS'}->{'curseed'}) {   if ($helper->{'VARS'}->{'curseed'}) {
     $rndseed=$helper->{'VARS'}->{'curseed'};      $rndseed=$helper->{'VARS'}->{'curseed'};
  }   }
Line 1419  ENDPART Line 1449  ENDPART
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  $texversion.=&Apache::lonnet::ssi($currentURL,%form);   $texversion.=&Apache::lonnet::ssi($currentURL,%form);
   
    #  Add annotations if required:
       
  &Apache::lonxml::clear_problem_counter();   &Apache::lonxml::clear_problem_counter();
   
  &Apache::lonnet::delenv('request.filename');   &Apache::lonnet::delenv('request.filename');
Line 1437  ENDPART Line 1469  ENDPART
  }   }
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  my $answer=&Apache::lonnet::ssi($currentURL,%form);   my $answer=&Apache::lonnet::ssi($currentURL,%form);
   
   
  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 {
Line 1454  ENDPART Line 1488  ENDPART
     }      }
     $texversion.='\vskip 1 mm '.$answer.'\end{document}';      $texversion.='\vskip 1 mm '.$answer.'\end{document}';
  }   }
   
   
   
   
     }      }
       # Print annotations.
   
   
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $annotation .= &annotate($currentURL);
    $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
       }
   
   
     if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {      if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
  $texversion=&IndexCreation($texversion,$currentURL);   $texversion=&IndexCreation($texversion,$currentURL);
     }      }
Line 1483  ENDPART Line 1530  ENDPART
  if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}   if ($currentURL=~/\/syllabus$/) {$currentURL=~s/\/res//;}
  $resources_printed .= $currentURL.':';   $resources_printed .= $currentURL.':';
  my $texversion=&Apache::lonnet::ssi($currentURL,%form);   my $texversion=&Apache::lonnet::ssi($currentURL,%form);
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation = &annotate($currentURL);
       $texversion    =~ s/(\\end{document})/$annotation$1/;
    }
  $result .= $texversion;   $result .= $texversion;
  } elsif ($cleanURL =~/.tex$/) {   } elsif ($cleanURL =~/.tex$/) {
     # For this sort of print of a single LaTeX file,      # For this sort of print of a single LaTeX file,
Line 1490  ENDPART Line 1541  ENDPART
     #      #
   
     $result = &fetch_raw_resource($currentURL);      $result = &fetch_raw_resource($currentURL);
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $annotation = &annotate($currentURL);
    $result =~ s/(\\end{document})/$annotation$1/;
       }
   
     $do_postprocessing = 0; # Don't massage the result.      $do_postprocessing = 0; # Don't massage the result.
   
  } else {   } else {
Line 1501  ENDPART Line 1557  ENDPART
              ($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
      ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) {        ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'select_sequences')) { 
   
   
         #-- produce an output string          #-- produce an output string
  if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {   if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
     $selectionmade = 2;      $selectionmade = 2;
Line 1517  ENDPART Line 1575  ENDPART
  $form{'suppress_tries'}=$parmhash{'suppress_tries'};   $form{'suppress_tries'}=$parmhash{'suppress_tries'};
  $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};   $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
  $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $form{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$form{'problem_split'}='yes';}   $form{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
    if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')   ||
       ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') ) {
       $form{'problem_split'}='yes';
    }
  my $flag_latex_header_remove = 'NO';   my $flag_latex_header_remove = 'NO';
  my $flag_page_in_sequence = 'NO';   my $flag_page_in_sequence = 'NO';
  my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};   my @master_seq=split /\|\|\|/, $helper->{'VARS'}->{'RESOURCES'};
Line 1547  ENDPART Line 1609  ENDPART
     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)$/) {
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
   
  &Apache::lonxml::remember_problem_counter();   &Apache::lonxml::remember_problem_counter();
  $texversion.=&Apache::lonnet::ssi($urlp,%form);   $texversion.=&Apache::lonnet::ssi($urlp,%form);
  if ($urlp=~/\.page$/) {   if ($urlp=~/\.page$/) {
Line 1584  ENDPART Line 1645  ENDPART
     $texversion='';      $texversion='';
  }   }
     }      }
   
  }   }
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation .= &annotate($urlp);
       $texversion =~ s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
    }
   
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 1616  ENDPART Line 1683  ENDPART
  if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}   if ($urlp=~/\/syllabus$/) {$urlp=~s/\/res//;}
  $resources_printed .= $urlp.':';   $resources_printed .= $urlp.':';
  my $texversion=&Apache::lonnet::ssi($urlp,%form);   my $texversion=&Apache::lonnet::ssi($urlp,%form);
    if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
       my $annotation = &annotate($urlp);
       $texversion =~ s/(\\end{document)/$annotation$1/;
    }
   
  if ($flag_latex_header_remove ne 'NO') {   if ($flag_latex_header_remove ne 'NO') {
     $texversion = &latex_header_footer_remove($texversion);      $texversion = &latex_header_footer_remove($texversion);
  } else {   } else {
Line 1691  ENDPART Line 1763  ENDPART
          $moreenv{'instructor_comments'}='hide';           $moreenv{'instructor_comments'}='hide';
  $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);   $moreenv{'textwidth'}=&get_textwidth($helper,$LaTeXwidth);
  $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};   $moreenv{'print_discussions'}=$helper->{'VARS'}->{'PRINT_DISCUSSIONS'};
    $moreenv{'print_annotations'} = $helper->{'VARS'}->{'PRINT_ANNOTATIONS'};
  $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};   $moreenv{'problem_split'}    = $parmhash{'problem_stream_switch'};
  $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};   $moreenv{'suppress_tries'}   = $parmhash{'suppress_tries'};
  if ($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes') {$moreenv{'problem_split'}='yes';}   if (($helper->{'VARS'}->{'PRINT_DISCUSSIONS'} eq 'yes')  ||
        ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes')) {
        $moreenv{'problem_split'}='yes';
    }
  my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');   my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Print Status','Class Print Status',$#students+1,'inline','75');
  my $student_counter=-1;   my $student_counter=-1;
  my $i = 0;   my $i = 0;
Line 1969  ENDPART Line 2045  ENDPART
     }      }
   
     my $URLback=''; #link to original document      my $URLback=''; #link to original document
     if ($helper->{'VARS'}->{'construction'} ne '1') {      if ($helper->{'VARS'}->{'construction'} eq '1') {
  #prints published resource  
  $URLback=&escape('/adm/flip?postdata=return:');  
     } else {  
  #prints resource from the construction space   #prints resource from the construction space
  $URLback='/'.$helper->{'VARS'}->{'filename'};   $URLback='/'.$helper->{'VARS'}->{'filename'};
  if ($URLback=~/([^?]+)/) {   if ($URLback=~/([^?]+)/) {
Line 2061  sub print_resources { Line 2134  sub print_resources {
     #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.      #   postscript.  Each ENDOFSTUDENTSTAMP will go on a line by itself.
     #      #
   
   
     foreach my $curresline (@{$master_seq})  {      foreach my $curresline (@{$master_seq})  {
  if (defined $page_breaks{$curresline}) {   if (defined $page_breaks{$curresline}) {
     if($i != 0) {      if($i != 0) {
Line 2068  sub print_resources { Line 2142  sub print_resources {
     }      }
  }   }
  $i++;   $i++;
   
  if ( !($type eq 'problems' &&    if ( !($type eq 'problems' && 
        ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {         ($curresline!~ m/\.(problem|exam|quiz|assess|survey|form|library)$/)) ) {
     my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);      my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
Line 2106  sub print_resources { Line 2181  sub print_resources {
     $rendered = $header.$body;      $rendered = $header.$body;
  }   }
     }      }
   
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $url = &Apache::lonnet::clutter($res_url);
    my $annotation = &annotate($url);
    $rendered =~  s/(\\keephidden{ENDOFPROBLEM})/$annotation$1/;
       }
     if ($remove_latex_header eq 'YES') {      if ($remove_latex_header eq 'YES') {
  $rendered = &latex_header_footer_remove($rendered);   $rendered = &latex_header_footer_remove($rendered);
     } else {      } else {
Line 2115  sub print_resources { Line 2196  sub print_resources {
  } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {   } elsif ($res_url=~/\/(smppg|syllabus|aboutme|bulletinboard)$/) {
     $printed .= $curresline.':';      $printed .= $curresline.':';
     my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);      my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,$env{'request.course.id'},'tex',$moreenv);
       if ($helper->{'VARS'}->{'PRINT_ANNOTATIONS'} eq 'yes') {
    my $url = &Apache::lonnet::clutter($res_url);
    my $annotation = &annotate($url);
    $annotation    =~ s/(\\end{document})/$annotation$1/;
       }
     if ($remove_latex_header eq 'YES') {      if ($remove_latex_header eq 'YES') {
  $rendered = &latex_header_footer_remove($rendered);   $rendered = &latex_header_footer_remove($rendered);
     } else {      } else {
Line 2222  sub init_perm { Line 2307  sub init_perm {
     }      }
 }  }
   
   sub get_randomly_ordered_warning {
       my ($helper,$map) = @_;
   
       my $message;
   
       my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
       my $navmap = Apache::lonnavmaps::navmap->new();
       my $res = $navmap->getResourceByUrl($map);
       if ($res) {
    my $func = 
       sub { return ($_[0]->is_map() && $_[0]->randomorder); };
    my @matches = $navmap->retrieveResources($res, $func,1,1,1);
    if (@matches) {
       $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
    }
       }
       if ($message) {
    return '<message type="warning">'.$message.'</message>';
       }
       return;
   }
   
 sub printHelper {  sub printHelper {
     my $r = shift;      my $r = shift;
   
Line 2358  sub printHelper { Line 2465  sub printHelper {
  $helper->{VARS}->{'curseed'}=$env{'form.curseed'};   $helper->{VARS}->{'curseed'}=$env{'form.curseed'};
     }      }
     if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {      if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
  $helper->{VARS}->{'probstatus'}=$env{'form.problemtype'};   $helper->{VARS}->{'probstatus'}=$env{'form.problemstatus'};
     }      }
   
     my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();      my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
Line 2448  HELPERFRAGMENT Line 2555  HELPERFRAGMENT
     if ($perm{'pfo'} &&  !$is_published  &&      if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {           ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
   
         push @{$printChoices}, ['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}, ['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'];
          &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);           &Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
   <state name="ALL_PROBLEMS" title="Select Problem(s) to print">    <state name="ALL_PROBLEMS" title="Select Problem(s) to print">
     <resource variable="RESOURCES" toponly='0' multichoice="1"      <resource variable="RESOURCES" toponly='0' multichoice="1"
Line 2477  ALL_PROBLEMS Line 2584  ALL_PROBLEMS
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];      push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
    my $randomly_ordered_warning = 
       &get_randomly_ordered_warning($helper,$map);
   
  # resource_selector will hold a few states that:   # resource_selector will hold a few states that:
  #   - Allow resources to be selected for printing.   #   - Allow resources to be selected for printing.
  #   - Determine pagination between assignments.   #   - Determine pagination between assignments.
Line 2488  ALL_PROBLEMS Line 2598  ALL_PROBLEMS
  #   #
  my $resource_selector=<<RESOURCE_SELECTOR;   my $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_PROBLEMS" title="Select resources to print">      <state name="SELECT_PROBLEMS" title="Select resources to print">
       $randomly_ordered_warning
   
    <nextstate>PRINT_FORMATTING</nextstate>      <nextstate>PRINT_FORMATTING</nextstate> 
    <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1"       <resource variable="RESOURCES" multichoice="1" addstatus="1" 
Line 2655  CHOOSE_ANON1 Line 2767  CHOOSE_ANON1
   
  $resource_selector=<<RESOURCE_SELECTOR;   $resource_selector=<<RESOURCE_SELECTOR;
     <state name="SELECT_RESOURCES" title="Select Resources">      <state name="SELECT_RESOURCES" title="Select Resources">
       $randomly_ordered_warning
   
     <nextstate>PRINT_FORMATTING</nextstate>      <nextstate>PRINT_FORMATTING</nextstate>
     <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>      <message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
     <resource variable="RESOURCES" multichoice="1" addstatus="1"       <resource variable="RESOURCES" multichoice="1" addstatus="1" 
Line 2794  CHOOSE_FROM_SUBDIR Line 2908  CHOOSE_FROM_SUBDIR
     # Allow the user to select any sequence in the course, feed it to      # Allow the user to select any sequence in the course, feed it to
     # another resource selector for that sequence      # another resource selector for that sequence
     if (!$helper->{VARS}->{'construction'} && !$is_published) {      if (!$helper->{VARS}->{'construction'} && !$is_published) {
  push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",   push @$printChoices, [&mtn("Selected <b>Resources</b> from <b>selected folder</b> in course"),
       'select_sequences', 'CHOOSE_SEQUENCE'];        'select_sequences', 'CHOOSE_SEQUENCE'];
  my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};   my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
  #Escape apostrophes and backslashes for Perl   #Escape apostrophes and backslashes for Perl
Line 2923  CHOOSE_FROM_ANY_SEQUENCE Line 3037  CHOOSE_FROM_ANY_SEQUENCE
     Apache::lonhelper::dropdown->new();      Apache::lonhelper::dropdown->new();
     addMessage("</td></tr>");      addMessage("</td></tr>");
   
       # Prompt for printing annotations too.
   
       addMessage("<tr><td align='right'>".
          '<label for="PRINT_ANNOTATIONS_forminput">'.
          &mt('Print Annotations').
          "</label>:</td><td>");
       $paramHash = Apache::lonhelper::getParamHash();
       $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
       $helper->declareVar("PRINT_ANNOTATIONS");
       $paramHash->{CHOICES} = [
        ['No', 'no'],
        ['Yes', 'yes']];
       Apache::lonhelper::dropdown->new();
       addMessage("</td></tr>");
   
     addMessage("<tr><td align = 'right'>  </td><td>");      addMessage("<tr><td align = 'right'>  </td><td>");
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'multichoice'} = "true";      $paramHash->{'multichoice'} = "true";
Line 2962  CHOOSE_FROM_ANY_SEQUENCE Line 3091  CHOOSE_FROM_ANY_SEQUENCE
      <message></td></tr></message>       <message></td></tr></message>
 RNDSEED  RNDSEED
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
   
   
       addMessage("<tr><td>Problem Type:</td><td>");
       $paramHash = &Apache::lonhelper::getParamHash();
       $paramHash->{'variable'} = 'probstatus'; # Already declared:
       #
       # Initial value from construction space:
       #
       if (!$helper->{VARS}->{'probstatus'} && $env{'form.problemtype'}) {
    $helper->{VARS}->{'probstatus'} = $env{'form.problemtype'}; # initial value
       }
       $paramHash->{CHOICES} = [
        ['Homework problem',     'problem'],
        ['Exam Problem', 'exam'],
        ['Survey question',      'survey']];
       Apache::lonhelper::dropdown->new();
       addMessage("</td></tr>"); 
   
  }    } 
     }      }
   

Removed from v.1.506  
changed lines
  Added in v.1.512


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