[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Mon, 06 Jan 2003 15:19:21 -0000


sakharuk		Mon Jan  6 10:19:21 2003 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  1. List of files for the sequence created in docs now is shown on the screen (this is small change in lines 159-160).
  2. Every particular resourse and a set of them can be now printed (the underscore symbol in the header of the page is changed on empty space - according Gerd's desire - problem relevant only to sequences created in docs).
  
  Working on other tests.  
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.100 loncom/interface/lonprintout.pm:1.101
--- loncom/interface/lonprintout.pm:1.100	Mon Dec 23 14:11:33 2002
+++ loncom/interface/lonprintout.pm	Mon Jan  6 10:19:21 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.100 2002/12/23 19:11:33 albertel Exp $
+# $Id: lonprintout.pm,v 1.101 2003/01/06 15:19:21 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -153,9 +153,11 @@
 
 sub sequence_content_menu {
     my ($key_to,$r) = @_;
+    my $primary_sequence;
     my $symbolic = &Apache::lonnet::symbread($ENV{'form.url'});
     my @sequence = split('___',$symbolic);
-    my $primary_sequence = '/res/'.$sequence[0];   
+    if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} 
+      else {$primary_sequence = '/res/'.$sequence[0];} 
     my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]);
     my @master_seq_view = @master_seq;
     for (my $i=0;$i<=$#master_seq_view;$i++) {
@@ -1187,6 +1189,7 @@
 
 sub page_format_transformation {
 	my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_; 
+	$assignment=~s/_/ /g;
 	my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
 	my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};	
 	if ($layout eq 'CBI') {