--- loncom/interface/lonprintout.pm	2003/09/09 13:31:08	1.232
+++ loncom/interface/lonprintout.pm	2003/09/16 20:03:12	1.235
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.232 2003/09/09 13:31:08 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.235 2003/09/16 20:03:12 bowersj2 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}};
@@ -846,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');
@@ -1080,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'}) {
@@ -1118,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
@@ -1132,6 +1132,9 @@ sub printHelper {
     }
 
     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();
 
@@ -1157,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;
@@ -1179,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>
@@ -1189,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>
@@ -1203,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;
@@ -1215,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>
@@ -1226,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>