--- loncom/interface/printout.pl 2013/08/14 00:26:29 1.156 +++ loncom/interface/printout.pl 2014/02/06 21:28:09 1.157 @@ -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.157 2014/02/06 21:28:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -313,7 +313,16 @@ foreach $texfile (@texfile) { 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];