[BACK]Return to printout.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/printout.pl between versions 1.156 and 1.159

version 1.156, 2013/08/14 00:26:29 version 1.159, 2014/02/28 19:20:06
Line 309  foreach $texfile (@texfile) { Line 309  foreach $texfile (@texfile) {
   my $name_range='';    my $name_range='';
   
   # $name       -> Either user's full name or username:domain    # $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]) {    if ($tempo_array[3]) {
       $name=$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 {    } else {
       $name=$tempo_array[0].':'.$tempo_array[1];        $name=$tempo_array[0].':'.$tempo_array[1];
       $name_range = $tempo_array[0];        $name_range = $tempo_array[0];
Line 336  foreach $texfile (@texfile) { Line 345  foreach $texfile (@texfile) {
       @tempo_array=split(/:/,$stud_info[-1]);        @tempo_array=split(/:/,$stud_info[-1]);
       if ($tempo_array[3]) {        if ($tempo_array[3]) {
   $name=$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 .= "-".$lastname;
             $name_range =~ s/[^\w\:\-]+//g;
       } else {        } else {
   $name=$tempo_array[0].':'.$tempo_array[1];    $name=$tempo_array[0].':'.$tempo_array[1];
   $name_range .= '-'.$tempo_array[0];    $name_range .= '-'.$tempo_array[0];
Line 1141  sub analyze_logfile { Line 1160  sub analyze_logfile {
     my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;      my $whereitends = index $body_log_file,'STAMPOFPASSEDRESOURCEEND',$whereitbegins;
     print "<br />"      print "<br />"
                  .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\n";                   .&mt('It has found an error in [_1][_2]and corrected it.',substr($body_log_file,$whereitbegins+26,$whereitends-$whereitbegins-26),"<br />")."\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,'<inserted text>',$tempobegin+10;      $whereitbegins = index $body_log_file,'<inserted text>',$tempobegin+10;
  }   }
   
Removed from v.1.156  
changed lines
  Added in v.1.159

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>