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

sakharuk lon-capa-cvs@mail.lon-capa.org
Fri, 09 Aug 2002 18:06:46 -0000


sakharuk		Fri Aug  9 14:06:46 2002 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
   Added co-author on the same foot as author.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.47 loncom/interface/lonprintout.pm:1.48
--- loncom/interface/lonprintout.pm:1.47	Mon Aug  5 15:18:43 2002
+++ loncom/interface/lonprintout.pm	Fri Aug  9 14:06:46 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.47 2002/08/05 19:18:43 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.48 2002/08/09 18:06:46 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@
 <input type="radio" name="choice" value="Standard LaTeX output for current document" checked>  Current document
 (you will print what you see on the screen)<br />
 ENDMENUOUT1
-    if (not $ENV{'request.role'}=~m/^au\./) {
+    if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
     $r->print(<<ENDMENUOUT2);
 <input type="radio" name="choice" value="Standard LaTeX output for the primary sequence">  All problems from the primary sequence<br />
 <input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence">  The whole primary sequence (problems plus all html and xml files)<br />
@@ -140,12 +140,15 @@
     my $laystyle = 'book';
     my $result = '';
     my $number_of_columns = 1;
+#    my $number_of_columns = $ENV{'form.numberofcolumns'};    
  
     if ($choice eq 'Standard LaTeX output for current document') {
       #-- single document - problem, page, html, xml  
       my %moreenv;
       $moreenv{'form.grade_target'}='tex';
-      if ($ENV{'request.role'}=~m/^au\./) {$ENV{'form.url'}=~s/http:\/\/[^\/]+//;}
+      if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
+	  $ENV{'form.url'}=~s/http:\/\/[^\/]+//;
+      }
       $moreenv{'request.filename'}=$ENV{'form.url'};
       &Apache::lonnet::appenv(%moreenv);
       my $texversion=&Apache::lonnet::ssi($ENV{'form.url'});
@@ -200,19 +203,49 @@
 	my $file=&Apache::lonnet::filelocation("",$main_seq);
 	my $filecontents=&Apache::lonnet::getfile($file);
 	my @file_seq = &content_map($filecontents);
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    $file_seq[$iu]=~s/^"//;
+	    $file_seq[$iu]=~s/"$//;
+	    $file_seq[$iu]=&Apache::lonnet::filelocation("",$file_seq[$iu]);
+#remove	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
+	}
+	my $i=0;
+        while ($i<=$#file_seq) {
+	    unless ($file_seq[$i]=~m/\.(problem|page)/) {
+		if ($file_seq[$i]=~m/\.sequence/) {
+		    my $filecontents=&Apache::lonnet::getfile($file_seq[$i]);
+		    my @newfile_seq = &content_map($filecontents);
+		    $result .=' START '.$i.'   LOOK  '.$filecontents.' FINISH  ';
+#		    splice @file_seq,$1,1,@newfile_seq;
+#		    $i=-1;
+		} else {
+		    splice @file_seq,$1,1;
+		}
+	    }
+
+
+
+
+	    $i++;
+	}
+	for (my $iu=0;$iu<=$#file_seq;$iu++) {
+	    $result .= ' SSS '.$file_seq[$iu].' FFF   ';
+	}
+
+
         # do we have any other sequence inside?
 #	$result.=$#file_seq.'   ';
-	my $i=1;
-	while ($i<=$#file_seq) {
+##	my $i=1;
+##	while ($i<=$#file_seq) {
 #	    $result.='      '.$file_seq[$i].'    ';
-	    $file_seq[$i]=~s/^"//;
-	    $file_seq[$i]=~s/"$//;
-	    if ($file_seq[$i]=~m/\.sequence\s*$/) {
-		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
+##	    $file_seq[$i]=~s/^"//;
+##	    $file_seq[$i]=~s/"$//;
+##	    if ($file_seq[$i]=~m/\.sequence\s*$/) {
+##		$file = &Apache::lonnet::filelocation("",$file_seq[$i]);
 #		$result.='  location    '.$file.'   ';
 #		$result .= 'FFFFFFFFF'.$file.'  ';
-		$filecontents=&Apache::lonnet::getfile($file);
-		@add_file_seq = &content_map($filecontents);
+##		$filecontents=&Apache::lonnet::getfile($file);
+##		@add_file_seq = &content_map($filecontents);
 
 #
 #	for (my $iu=0;$iu<=$#add_file_seq;$iu++) {
@@ -221,14 +254,14 @@
 #
 
 
-		splice(@file_seq,$i,1,@add_file_seq);
-		@add_file_seq = ();
-		$i = -1;
-	    }
-	    $i++;
-	    last; #do not forget to remove 
-	}
-	@master_seq = @file_seq;	
+##		splice(@file_seq,$i,1,@add_file_seq);
+##		@add_file_seq = ();
+##		$i = -1;
+##	    }
+##	    $i++;
+##	    last; #do not forget to remove 
+##	}
+##	@master_seq = @file_seq;	
 
 #
 #	for (my $iu=0;$iu<=$#file_seq;$iu++) {
@@ -237,32 +270,32 @@
 #
 
 #-- produce an output string
-	for (my $i=0;$i<=$#master_seq;$i++) {
-	    $_ = $master_seq[$i];
-	    m/\"(.*)\"/;
-            $_ = $1;
-            my $urlp = $1;
-            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
-		my %moreenv;
-		$moreenv{'form.grade_target'}='tex';
-		&Apache::lonnet::appenv(%moreenv);
-		my $texversion=&Apache::lonnet::ssi($urlp);
-		&Apache::lonnet::delenv('form.grade_target');
-		$result .= $texversion;        
-	    }
-	}	    
-	$result = &additional_cleanup($result);
+###	for (my $i=0;$i<=$#master_seq;$i++) {
+###	    $_ = $master_seq[$i];
+###	    m/\"(.*)\"/;
+###         $_ = $1;
+###            my $urlp = $1;
+###            if (/\.(problem|exam|quiz|assess|survey|form|library)/) {
+###		my %moreenv;
+###		$moreenv{'form.grade_target'}='tex';
+###		&Apache::lonnet::appenv(%moreenv);
+###		my $texversion=&Apache::lonnet::ssi($urlp);
+###		&Apache::lonnet::delenv('form.grade_target');
+###		$result .= $texversion;        
+###	    }
+###	}	    
+###	$result = &additional_cleanup($result);
     } elsif ($choice eq 'Subdirectory print') {      
 	my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
 	$subdirtoprint =~ s/\/[^\/]+$//;
 	my @list_of_files = ();
-	if ($ENV{'request.role'}=~m/^au\./) {
+	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
 	    $subdirtoprint =~ s/^[^~]*~(\w+)\//\/home\/$1\/public_html\//;
 	} else {
 	    $subdirtoprint =~ s/.*(\/res\/)/$1/;
 	}
 	my @content_directory = ();
-	if ($ENV{'request.role'}=~m/^au\./) {
+	if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) {
 	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint,$ENV{'user.domain'}, $ENV{'user.name'},'');
 	} else {
 	    @content_directory = &Apache::lonnet::dirlist($subdirtoprint);
@@ -279,7 +312,9 @@
 	    my %moreenv;
 	    $moreenv{'form.grade_target'}='tex';
 	    &Apache::lonnet::appenv(%moreenv);
-	    if ($ENV{'request.role'}=~m/^au\./) { $urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; }
+	    if ($ENV{'request.role'}=~m/^au\./ or $ENV{'request.role'}=~m/^ca\./) { 
+		$urlp =~ s/\/home\/([^\/]*)\/public_html/\/~$1/; 
+	    }
 	    my $texversion=&Apache::lonnet::ssi($urlp);
 	    &Apache::lonnet::delenv('form.grade_target');
 	    $texversion =~ s/(\\begin{document})/$1 {\\tiny\\begin{verbatim}$urlp\\end{verbatim}}/;
@@ -326,7 +361,6 @@
     $result =~ s/\s%/\\%/g;   #corrects %
     $result =~ s/(\s)+/$1/g; #removes more than one empty space
     $result =~ s/\\\\\s*\\vskip/\\vskip/gm;
-#    $result =~ s/ (<|>|) / \$$1\$ /g; #corrects < or >
     $result =~ s/\\\\\s*\\noindent\s*(\\\\)+/\\\\\\noindent /g;
     $result =~ s/{\\par }\s*\\\\/\\\\/gm;
 	$result =~ s/\\\\\s+\[/ \[/g;