--- loncom/metadata_database/parse_activity_log.pl 2006/03/30 06:57:50 1.23 +++ loncom/metadata_database/parse_activity_log.pl 2014/11/24 02:36:34 1.25 @@ -2,7 +2,7 @@ # # The LearningOnline Network # -# $Id: parse_activity_log.pl,v 1.23 2006/03/30 06:57:50 albertel Exp $ +# $Id: parse_activity_log.pl,v 1.25 2014/11/24 02:36:34 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,16 +48,11 @@ # parameter is not set $logthis is set to ¬hing, which does what you # would expect. # -BEGIN { - eval "use Apache2::compat();"; -}; use strict; use DBI; -use lib '/home/httpd/lib/perl/Apache'; use lib '/home/httpd/lib/perl/'; use LONCAPA::Configuration(); use Apache::lonmysql(); -use lonmysql(); use Time::HiRes(); use Getopt::Long(); use IO::File; @@ -310,6 +305,7 @@ if (!&Apache::lonmysql::verify_sql_conne } $logthis->('SQL connection is up'); +&update_process_name($course.'@'.$domain." loading existing data"); my $missing_table = &check_for_missing_tables(values(%tables)); if (-s $gz_sql_filename && ! -s $gz_xml_filename) { my $backup_modification_time = (stat($gz_sql_filename))[9]; @@ -379,8 +375,10 @@ my $error_fh = IO::File->new(">>$error_f ## ## Parse the course log $logthis->('processing course log'); +&update_process_name($course.'@'.$domain." processing new data"); if (-s $newfilename) { my $result = &process_courselog($newfilename,$error_fh,\%tables); + &update_process_name($course.'@'.$domain." backing up new data"); if (! defined($result)) { # Something went wrong along the way... $logthis->('process_courselog returned undef'); @@ -483,6 +481,8 @@ sub process_courselog { # %3aPOST%3a(name)%3d(value)%3a(name)%3d(value) # or # %3aCSTORE%3a(name)%3d(value)%26(name)%3d(value) + # or + # %3aPUTSTORE%3a(name)%3d(value)%26(name)%3d(value) # # get delimiter between timestamped entries to be &&& $log=~s/\%26(\d{9,10})\%3a/\&\&\&$1\%3a/g; @@ -513,7 +513,7 @@ sub process_courselog { if (! defined($action) || $action eq '') { $action = 'VIEW'; } - if ($action !~ /^(LOGIN|VIEW|POST|CSTORE|STORE)$/) { + if ($action !~ /^(LOGIN|VIEW|POST|CSTORE|STORE|PUTSTORE)$/) { $warningflag .= 'action'; print $error_fh 'full log entry:'.$log.$/; print $error_fh 'error on chunk (saving)'.$/;