--- loncom/interface/lonprintout.pm	2006/08/14 10:52:04	1.478
+++ loncom/interface/lonprintout.pm	2006/08/22 14:44:39	1.482
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.478 2006/08/14 10:52:04 foxr Exp $
+# $Id: lonprintout.pm,v 1.482 2006/08/22 14:44:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -812,6 +812,8 @@ sub details_for_menu {
     if (!$postdata) { $postdata=$helper->{VARS}{'postdata'}; }
     my $name_of_resource = &Apache::lonnet::gettitle($postdata);
     my $symbolic = &Apache::lonnet::symbread($postdata);
+    return if ( $symbolic eq '');
+
     my ($map,$id,$resource)=&Apache::lonnet::decode_symb($symbolic);
     $map=&Apache::lonnet::clutter($map);
     my $name_of_sequence = &Apache::lonnet::gettitle($map);
@@ -1110,10 +1112,7 @@ sub print_construction_sequence {
 		$answerform{'answer_output_mode'}='tex';
 		$answerform{'rndseed'}=$rndseed;
 		$answerform{'problem_split'}=$parmhash{'problem_stream_switch'};
-		if ($urlp=~/\/res\//) {
-		    $env{'request.state'}='published';
-		}
-
+		if ($urlp=~/\/res\//) {$env{'request.state'}='published';}
 		$resources_printed .= $urlp.':';
 		my $answer=&Apache::lonnet::ssi($urlp,%answerform);
 		if ($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') {
@@ -1201,8 +1200,6 @@ ENDPART
     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 ...');
 
-
-
     $r->print($start_page."\n<p>\n$msg\n</p>\n");
 
     # fetch the pagebreaks and store them in the course environment
@@ -1254,7 +1251,6 @@ ENDPART
     }
 
     if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') {
-	
       #-- single document - problem, page, html, xml, ...
 	my ($currentURL,$cleanURL);
 
@@ -2162,9 +2158,12 @@ sub printHelper {
     if ($env{'form.postdata'}=~/^(?:http:\/\/[^\/]+\/|\/|)\~([^\/]+)\/(.*)$/) {
         $helper->{VARS}->{'filename'} = "~$1/$2";
         $helper->{VARS}->{'construction'} = 1;
-    } elsif ($env{'form.postdata'}) {
+    } else {
         if ($env{'form.postdata'}) {
             $helper->{VARS}->{'symb'} = &Apache::lonnet::symbread($env{'form.postdata'});
+	    if ( $helper->{VARS}->{'symb'} eq '') {
+		$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+	    }
         }
         if ($env{'form.symb'}) {
             $helper->{VARS}->{'symb'} = $env{'form.symb'};
@@ -2174,6 +2173,7 @@ sub printHelper {
         }
 
     }
+
     if ($env{'form.symb'}) {
         $helper->{VARS}->{'symb'} = $env{'form.symb'};
     }
@@ -2185,6 +2185,7 @@ sub printHelper {
 	&Apache::lonenc::check_encrypt($helper->{VARS}->{'symb'});
     my ($resourceTitle,$sequenceTitle,$mapTitle) = &details_for_menu($helper);
     if ($sequenceTitle ne '') {$helper->{VARS}->{'assignment'}=$sequenceTitle;}
+
     
     # Extract map
     my $symb = $helper->{VARS}->{'symb'};
@@ -2192,19 +2193,21 @@ sub printHelper {
     my $subdir;
 
     # Get the resource name from construction space
-
     if ($helper->{VARS}->{'construction'}) {
         $resourceTitle = substr($helper->{VARS}->{'filename'}, 
                                 rindex($helper->{VARS}->{'filename'}, '/')+1);
         $subdir = substr($helper->{VARS}->{'filename'},
                          0, rindex($helper->{VARS}->{'filename'}, '/') + 1);
-    } elsif ($env{'form.postdata'} =~ /^\/res\//) { # Get resource name from res space.
-	$helper->{VARS}->{'postdata'} = $env{'form.postdata'};
+    } else {
+	if ($symb ne '') {
+	    ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
+	    $helper->{VARS}->{'postdata'} = 
+		&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
+	} else {
+	    $url = $helper->{VARS}->{'postdata'};
+	}
+	$url = &Apache::lonnet::clutter($url);
 
-    } elsif (!$helper->{VARS}->{'postdata'}) {
-        ($map, $id, $url) = &Apache::lonnet::decode_symb($symb);
-        $helper->{VARS}->{'postdata'} = 
-	    &Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($url));
         if (!$resourceTitle) { # if the resource doesn't have a title, use the filename
             my $postdata = $helper->{VARS}->{'postdata'};
             $resourceTitle = substr($postdata, rindex($postdata, '/') + 1);
@@ -2224,11 +2227,6 @@ sub printHelper {
 
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
-    if (not $helper->{VARS}->{'construction'}) {
-	$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
-    }
-    # "Remove all duplicate slashes."
-    $subdir =~ s|/+|/|g;
 
     # What can be printed is a very dynamic decision based on
     # lots of factors. So we need to dynamically build this list.
@@ -2620,12 +2618,20 @@ CHOOSE_ANON2
     }
 
     # FIXME: That RE should come from a library somewhere.
-    if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
-        push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+    if ($perm{'pav'} 
+	&& $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'
+	&& (defined($helper->{'VARS'}->{'construction'})
+	    ||
+	    (&Apache::lonnet::allowed('bre',$subdir) eq 'F'
+	     && 
+	     $helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)
+	    )
+	) {
 
-        my $f = '$filename';
+	my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
+        push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
-  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
+  <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
 
     <files variable="FILES" multichoice='1'>
       <nextstate>PAGESIZE</nextstate>