--- loncom/interface/lonprintout.pm 2003/09/05 19:34:28 1.228
+++ loncom/interface/lonprintout.pm 2003/09/17 17:32:56 1.236
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.228 2003/09/05 19:34:28 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.236 2003/09/17 17:32:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -531,7 +531,7 @@ sub details_for_menu {
my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
- my ($map,$id,$resource)=split(/___/,$symbolic);
+ my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
$map=&Apache::lonnet::clutter($map);
my $name_of_sequence;
$name_of_sequence = $hash{'title_'.$hash{'ids_'.$map}};
@@ -670,6 +670,9 @@ ENDPART
$form{'problem_split'}=$parmhash{'problem_stream_switch'};
$form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
$form{'rndseed'}=$rndseed;
&Apache::lonnet::appenv(%moreenv);
&Apache::lonnet::delenv('form.counter');
@@ -700,6 +703,9 @@ ENDPART
#printing content of sequence from the construction space
my $flag_latex_header_remove = 'NO';
my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
$currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
my $errtext=&Apache::lonratedt::mapread($currentURL);
for (my $member=0;$member<=$#Apache::lonratedt::order;$member++) {
@@ -709,14 +715,17 @@ ENDPART
my %form;
$form{'grade_target'}='tex';
$form{'textwidth'}=$LaTeXwidth;
+ $form{'problem_split'}=$parmhash{'problem_stream_switch'};
+ $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
my %form;
$form{'grade_target'}='answer';
$form{'answer_output_mode'}='tex';
- $form{'latex_type'}=$helper->{'VARS'}->{'LATEX_TYPE'};
$form{'rndseed'}=$rndseed;
+ if ($urlp=~/\/res\//) {$ENV{'request.state'}='published';}
+ ####my $answer=' SSSSSS '.$ENV{'request.state'}.' FFFFFFF ';
my $answer=&Apache::lonnet::ssi($urlp,%form);
$texversion=~s/(\\keephidden{ENDOFPROBLEM})/$answer$1/;
}
@@ -728,13 +737,13 @@ ENDPART
if ($helper->{'VARS'}->{'TABLE_INDEX'} eq 'yes') {
$texversion=&IndexCreation($texversion,$urlp);
}
- if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URL'} eq 'yes') {
+ if ($helper->{'VARS'}->{'CONSTR_RESOURSE_URpL'} eq 'yes') {
$texversion=~s/(\\addcontentsline\{toc\}\{subsection\}\{[^\}]*\})/$1 URL: \\verb|$urlp| \\strut\\\\\\strut /;
}
$result.=$texversion;
$flag_latex_header_remove = 'YES';
} elsif ($urlp=~/\.(sequence|page)$/) {
- $result.='\strut\newline\noindent This is sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
+ $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
}
}
if ($helper->{VARS}->{'construction'} eq '1') {$result=~s/(\\begin{document})/$1 \\fbox\{RANDOM SEED IS $rndseed\} /;}
@@ -766,8 +775,8 @@ ENDPART
&Apache::lonnet::delenv('form.counter');
&Apache::lonxml::init_counter();
for (my $i=0;$i<=$#master_seq;$i++) {
- $master_seq[$i]=~/___\d+___(.*)$/;
- my $urlp='/res/'.$1;
+ my (undef,undef,$urlp)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ $urlp=&Apache::lonnet::declutter($urlp);
if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems') {
$selectionmade = 2;
} elsif ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'map_problems_pages') {
@@ -776,8 +785,8 @@ ENDPART
$selectionmade = 4;
}
$form{'symb'}=$master_seq[$i];
- $master_seq[$i]=~/(.*)___\d*___/;
- my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($1),'header'); #tittle of the assignment which contains this problem
+ my ($sequence)=&Apache::lonnet::decode_symb($master_seq[$i]);
+ my $assignment=&Apache::lonxml::latex_special_symbols(&Apache::lonnet::gettitle($sequence),'header'); #tittle of the assignment which contains this problem
#&Apache::lonnet::logthis("Trying to get $urlp with symb $master_seq[$i]");
my $texversion=&Apache::lonnet::ssi($urlp,%form);
if ($urlp=~/\.page$/) {
@@ -837,7 +846,7 @@ ENDPART
&Apache::lonxml::init_counter();
foreach my $curresline (@master_seq) {
if ($curresline=~ m/\.(problem|exam|quiz|assess|survey|form|library)$/) {
- my ($map,$id,$res_url) = split(/___/,$curresline);
+ my ($map,$id,$res_url) = &Apache::lonnet::decode_symb($curresline);
if (&Apache::lonnet::allowed('bre',$res_url)) {
my $rendered = &Apache::loncommon::get_student_view($curresline,$username,$userdomain,
$ENV{'request.course.id'},'tex');
@@ -884,6 +893,9 @@ ENDPART
@list_of_files=sort @list_of_files;
my $flag_latex_header_remove = 'NO';
my $rndseed=time;
+ if ($helper->{'VARS'}->{'curseed'}) {
+ $rndseed=$helper->{'VARS'}->{'curseed'};
+ }
for (my $i=0;$i<=$#list_of_files;$i++) {
my $urlp = $list_of_files[$i];
if ($urlp=~/\//) {
@@ -1059,6 +1071,7 @@ sub printHelper {
my $helper = Apache::lonhelper::helper->new("Printing Helper");
$helper->declareVar('symb');
$helper->declareVar('postdata');
+ $helper->declareVar('curseed');
$helper->declareVar('filename');
$helper->declareVar('construction');
$helper->declareVar('assignment');
@@ -1067,7 +1080,7 @@ sub printHelper {
# very first screen.
# Detect whether we're coming from construction space
if ($ENV{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
- $helper->{VARS}->{'filename'} = "/home/$1/public_html/$2";
+ $helper->{VARS}->{'filename'} = "~$1/$2";
$helper->{VARS}->{'construction'} = 1;
} else {
if ($ENV{'form.postdata'}) {
@@ -1105,7 +1118,7 @@ sub printHelper {
$subdir = substr($helper->{VARS}->{'filename'},
0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
} else {
- ($map, $id, $url) = split(/___/, $symb);
+ ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
$helper->{VARS}->{'postdata'} = Apache::lonnet::clutter($url);
if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
@@ -1114,8 +1127,14 @@ sub printHelper {
}
$subdir = &Apache::lonnet::filelocation("", $url);
}
+ if (!$helper->{VARS}->{'curseed'} && $ENV{'form.curseed'}) {
+ $helper->{VARS}->{'curseed'}=$ENV{'form.curseed'};
+ }
my $userCanSeeHidden = Apache::lonnavmaps::advancedUser();
+ my $userPriviledged = ($ENV{'request.role'}=~m/^cc\./ or
+ $ENV{'request.role'}=~m/^in\./ or
+ $ENV{'request.role'}=~m/^ta\./);
Apache::lonhelper::registerHelperTags();
@@ -1141,18 +1160,19 @@ sub printHelper {
my $printChoices = [];
my $paramHash;
- if ($resourceTitle) {
- push @{$printChoices}, ["<b>$resourceTitle</b> (prints what you just saw on the screen)", 'current_document', 'PAGESIZE'];
+ if ($resourceTitle && $helper->{VARS}->{'postdata'}) {
+ push @{$printChoices}, ["<b>$resourceTitle</b> (what you just saw on the screen)", 'current_document', 'PAGESIZE'];
}
# $r->print($helper->{VARS}->{'postdata'});
# If we're in a sequence...
- if ($helper->{'VARS'}->{'construction'} ne '1') {
+ if (($helper->{'VARS'}->{'construction'} ne '1') &&
+ $helper->{VARS}->{'postdata'}) {
# Allow problems from sequence
- push @{$printChoices}, ["Problem(s) from <b>$sequenceTitle</b>", 'map_problems', 'CHOOSE_PROBLEMS'];
+ push @{$printChoices}, ["<b>Selected problems</b> in $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
- push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from <b>$sequenceTitle</b>", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+ push @{$printChoices}, ["<b>Selected resources</b> in $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1163,7 +1183,7 @@ sub printHelper {
my $helperFragment = <<HELPERFRAGMENT;
<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
@@ -1173,7 +1193,7 @@ sub printHelper {
<state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" toponly='1'>
+ <resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
@@ -1187,9 +1207,9 @@ HELPERFRAGMENT
# If the user is priviledged, allow them to print all
# problems in the course, optionally for selected students
- if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
- push @{$printChoices}, ['<b>Problems</b> in this course', 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, ["Problems from <b>$sequenceTitle</b> for selected students", 'problems_for_students', 'CHOOSE_STUDENTS'];
+ if ($userPriviledged && ($helper->{VARS}->{'postdata'}=~/\/res\//)) {
+ push @{$printChoices}, ['Selected problems from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ["Selected problems from $sequenceTitle for <b>selected students</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
my $isProblem = '$res->is_problem()';
$isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
@@ -1199,7 +1219,8 @@ HELPERFRAGMENT
&Apache::lonxml::xmlparse($r, 'helper', <<CHOOSE_STUDENTS);
<state name="ALL_PROBLEMS" title="Select Problem(s) to print">
<message>(mark them then click "next" button) <br /></message>
- <resource variable="RESOURCES" multichoice="1" suppressEmptySequences='1'>
+ <resource variable="RESOURCES" multichoice="1"
+ suppressEmptySequences='1' addstatus="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isProblem;</choicefunc>
@@ -1210,7 +1231,7 @@ HELPERFRAGMENT
<state name="CHOOSE_STUDENTS" title="Select Students and Resources">
<student multichoice='1' variable="STUDENTS" nextstate="PAGESIZE" />
<message><br /><big><i><b>Select resources for the assignment</b></i></big><br /></message>
- <resource variable="RESOURCES" multichoice="1">
+ <resource variable="RESOURCES" multichoice="1" addstatus="1">
<filterfunc>return $isProblem</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symb</valuefunc>
@@ -1270,8 +1291,8 @@ CHOOSE_FROM_SUBDIR
$paramHash->{'variable'} = 'ANSWER_TYPE';
$helper->declareVar('ANSWER_TYPE');
$paramHash->{CHOICES} = [
- ['Yes', 'yes'],
- ['No', 'no'] ];
+ ['No', 'yes'],
+ ['Yes', 'no'] ];
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
$startedTable = 1;
@@ -1331,6 +1352,18 @@ CHOOSE_FROM_SUBDIR
Apache::lonhelper::dropdown->new();
addMessage("</td></tr>");
}
+ if ($helper->{'VARS'}->{'construction'}) {
+ my $xmlfrag .= <<'RNDSEED';
+ <message><tr><td align='right'>Use random seed: </td><td></message>
+ <string variable="curseed" size="15" maxlength="15">
+ <defaultvalue>
+ return $helper->{VARS}->{'curseed'};
+ </defaultvalue>
+ </string>
+ <message></td></tr></message>
+RNDSEED
+ &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
+ }
}
if ($startedTable) {