Diff for /loncom/metadata_database/parse_activity_log.pl between versions 1.18 and 1.19

version 1.18, 2005/09/20 16:50:40 version 1.19, 2005/09/20 17:49:51
Line 144  if ($log) { Line 144  if ($log) {
 my $sourcefilename;   # activity log data  my $sourcefilename;   # activity log data
 my $newfilename;      # $sourcefilename will be renamed to this  my $newfilename;      # $sourcefilename will be renamed to this
 my $error_filename;   # Errors in parsing the activity log will be written here  my $error_filename;   # Errors in parsing the activity log will be written here
   my $chunk_filename;   # where we save data we are not going to write to db
 if ($srcfile) {  if ($srcfile) {
     $sourcefilename = $srcfile;      $sourcefilename = $srcfile;
 } else {  } else {
Line 153  my $sql_filename = $sourcefilename; Line 154  my $sql_filename = $sourcefilename;
 $sql_filename =~ s|[^/]*$|activity.log.sql|;  $sql_filename =~ s|[^/]*$|activity.log.sql|;
 my $gz_sql_filename = $sql_filename.'.gz';  my $gz_sql_filename = $sql_filename.'.gz';
 #  #
   $chunk_filename = $sourcefilename.".unprocessed_chunks";
   #
 my $xml_filename = $sourcefilename;  my $xml_filename = $sourcefilename;
 my $gz_xml_filename = $xml_filename.'.gz';  my $gz_xml_filename = $xml_filename.'.gz';
 if (defined($xmlfile)) {  if (defined($xmlfile)) {
Line 486  sub process_courselog { Line 489  sub process_courselog {
         if (! defined($host)) { $host = 'unknown'; }          if (! defined($host)) { $host = 'unknown'; }
         my $prevchunk = 'none';          my $prevchunk = 'none';
         foreach my $chunk (split(/\&\&\&/,$log)) {          foreach my $chunk (split(/\&\&\&/,$log)) {
             my $warningflag = '';              if (length($chunk) > 20000) {
     my ($time,$res,$uname,$udom,$action,@values)= split(/:/,$chunk);                  # avoid putting too much data into the database
             #                   # (usually an uploaded file or something similar)
             # Sometimes we get a file pasted into the activity.log from                  $chunk = &escape($chunk);
             # an upload form.  Here we try to detect it and avoid inserting                  if (! open(CHUNKFILE,">>$chunk_filename") ||
             # it into the database to avoid the quiet death of the database                      ! print CHUNKFILE $timestamp.':'.$host.':'.$chunk.$/) {
             # connection                      # abort
             my $i;                      close(CHUNKFILE);
             for ($i=0;$i<$#values;$i++) {                      close(IN);
                 if ($values[$i] =~ /^HWVAL/) {                      return undef;
                     $#values = $i;  
                     last;  
                 }                  }
                   close(CHUNKFILE);
                   next;
             }              }
               my $warningflag = '';
       my ($time,$res,$uname,$udom,$action,@values)= split(/:/,$chunk);
             #              #
             if (! defined($res) || $res =~ /^\s*$/) {              if (! defined($res) || $res =~ /^\s*$/) {
                 $res = '/adm/roles';                  $res = '/adm/roles';

Removed from v.1.18  
changed lines
  Added in v.1.19


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