--- loncom/interface/printout.pl 2013/08/14 00:26:29 1.156
+++ loncom/interface/printout.pl 2014/02/28 19:20:06 1.159
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
#
-# $Id: printout.pl,v 1.156 2013/08/14 00:26:29 raeburn Exp $
+# $Id: printout.pl,v 1.159 2014/02/28 19:20:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -309,11 +309,20 @@ foreach $texfile (@texfile) {
my $name_range='';
# $name -> Either user's full name or username:domain
- # $name_range -> Either user's last name or usrname.
+ # $name_range -> Either user's last name or username.
if ($tempo_array[3]) {
$name=$tempo_array[3];
- ($name_range) = split(/,/,$name, 2);
+ $name =~ s{^\s+|\s+$}{}g;
+ if ($name =~ /,/) {
+ ($name_range) = split(/,/,$name, 2);
+ } elsif ($name =~ /\s/) {
+ $name_range = $name;
+ $name_range =~ s/\s+/_/;
+ } else {
+ $name_range = $name;
+ }
+ $name_range =~ s/[^\w\:\-]+//g;
} else {
$name=$tempo_array[0].':'.$tempo_array[1];
$name_range = $tempo_array[0];
@@ -336,8 +345,18 @@ foreach $texfile (@texfile) {
@tempo_array=split(/:/,$stud_info[-1]);
if ($tempo_array[3]) {
$name=$tempo_array[3];
- my ($lastname) = split(/,/, $name,2);
+ $name =~ s{^\s+|\s+$}{}g;
+ my $lastname;
+ if ($name =~ /,/) {
+ ($lastname) = split(/,/, $name,2);
+ } elsif ($name =~ /\s/) {
+ $lastname = $name;
+ $lastname =~ s/\s+/_/;
+ } else {
+ $lastname = $name;
+ }
$name_range .= "-".$lastname;
+ $name_range =~ s/[^\w\:\-]+//g;
} else {
$name=$tempo_array[0].':'.$tempo_array[1];
$name_range .= '-'.$tempo_array[0];
@@ -1141,7 +1160,7 @@ sub analyze_logfile {
my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
print "
"
.&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"
")."\n";
- print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement neccessary corrections by yourself.')."\n";
+ print &mt('Usually this correction is valid but you probably need to check the indicated resource one more time and implement necessary corrections by yourself.')."\n";
$whereitbegins = index $body_log_file,'',$tempobegin+10;
}