--- loncom/misc/refresh_courseids_db.pl 2010/07/24 00:01:12 1.4 +++ loncom/misc/refresh_courseids_db.pl 2010/08/22 21:14:54 1.8 @@ -1,7 +1,7 @@ #!/usr/bin/perl # The LearningOnline Network # -# $Id: refresh_courseids_db.pl,v 1.4 2010/07/24 00:01:12 raeburn Exp $ +# $Id: refresh_courseids_db.pl,v 1.8 2010/08/22 21:14:54 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,7 +61,7 @@ use LONCAPA qw(:DEFAULT :match); exit if ($Apache::lonnet::perlvar{'lonRole'} ne 'library'); -use vars qw( %needsrelease %checkparms %checkresponsetypes %checkcrstypes); +use vars qw( %checkparms %checkresponsetypes %checkcrstypes %anonsurvey ); # Make sure this process is running from user=www my $wwwid=getpwnam('www'); @@ -78,18 +78,19 @@ open(my $fh,'>>'.$Apache::lonnet::perlva print $fh "==== refresh_courseids_db.pl Run ".localtime()."====\n"; my @domains = sort(&Apache::lonnet::current_machine_domains()); +my @ids=&Apache::lonnet::current_machine_ids(); -&parse_releases_xml(); +&build_release_hashes(); $env{'allowed.bre'} = 'F'; foreach my $dom (@domains) { my %courseshash; - my @ids=&Apache::lonnet::current_machine_ids(); my %currhash = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.',1,\@ids,'.'); + my %lastaccess = &Apache::lonnet::courselastaccess($dom,undef,\@ids); my $dir = $Apache::lonnet::perlvar{lonUsersDir}.'/'.$dom; my %domdesign = &Apache::loncommon::get_domainconf($dom); my $autoassign = $domdesign{$dom.'.autoassign.co-owners'}; - &recurse_courses($dom,$dir,0,\%courseshash,\%currhash,$autoassign,$fh); + &recurse_courses($dom,$dir,0,\%courseshash,\%currhash,\%lastaccess,$autoassign,$fh); foreach my $lonhost (keys(%courseshash)) { if (ref($courseshash{$lonhost}) eq 'HASH') { if (&Apache::lonnet::courseidput($dom,$courseshash{$lonhost},$lonhost,'notime') eq 'ok') { @@ -108,7 +109,7 @@ print $fh "==== refresh_courseids.db com close($fh); sub recurse_courses { - my ($cdom,$dir,$depth,$courseshash,$currhash,$autoassign,$fh) = @_; + my ($cdom,$dir,$depth,$courseshash,$currhash,$lastaccess,$autoassign,$fh) = @_; next unless (ref($currhash) eq 'HASH'); if (-d $dir) { opendir(DIR,$dir); @@ -118,7 +119,7 @@ sub recurse_courses { foreach my $item (@contents) { if ($depth < 4) { &recurse_courses($cdom,$dir.'/'.$item,$depth,$courseshash, - $currhash,$autoassign,$fh); + $currhash,$lastaccess,$autoassign,$fh); } elsif ($item =~ /^$match_courseid$/) { my $cnum = $item; my $cid = $cdom.'_'.$cnum; @@ -151,6 +152,7 @@ sub recurse_courses { } my $chome = &Apache::lonnet::homeserver($cnum,$cdom); my $owner = $courseinfo{'internal.courseowner'}; + my $twodaysago = time - 172800; my (%roleshash,$gotcc,$reqdmajor,$reqdminor); if ($owner eq '') { %roleshash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,['cc'],undef,undef,1); @@ -176,6 +178,7 @@ sub recurse_courses { my $creator = $courseinfo{'internal.creator'}; my $creationcontext = $courseinfo{'internal.creationcontext'}; my $inst_code = $courseinfo{'internal.coursecode'}; + my $releaserequired = $courseinfo{'internal.releaserequired'}; $inst_code = '' if (!defined($inst_code)); $owner = '' if (!defined($owner)); if ($created eq '') { @@ -198,13 +201,11 @@ sub recurse_courses { my @stats = stat("$dir/$cnum/passwd"); $created = $stats[9]; } - my %lastaccess = - &Apache::lonnet::courselastaccess($cdom,$cnum); - if ($lastaccess{$cid}) { + if ($lastaccess->{$cid}) { if ($created eq '') { - $created = $lastaccess{$cid}; - } elsif ($lastaccess{$cid} < $created) { - $created = $lastaccess{$cid}; + $created = $lastaccess->{$cid}; + } elsif ($lastaccess->{$cid} < $created) { + $created = $lastaccess->{$cid}; } } unless ($created eq '') { @@ -212,24 +213,28 @@ sub recurse_courses { } } } - - $env{'request.course.id'} = $cdom.'_'.$cnum; - $env{'request.role'} = 'cc./'.$cdom.'/'.$cnum; - &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - - # check all parameters - ($reqdmajor,$reqdminor) = ¶meter_constraints($cnum,$cdom); - - # check course type - ($reqdmajor,$reqdminor) = &coursetype_constraints($cnum,$cdom,$crstype, - $reqdmajor, - $reqdminor); - # check course contents - ($reqdmajor,$reqdminor) = &coursecontent_constraints($cnum,$cdom, - $reqdmajor, - $reqdminor); - delete($env{'request.course.id'}); - delete($env{'request.role'}); + + if (($chome ne '') && ($lastaccess->{$cid} > $twodaysago)) { + $env{'request.course.id'} = $cdom.'_'.$cnum; + $env{'request.role'} = 'cc./'.$cdom.'/'.$cnum; + &Apache::lonuserstate::readmap($cdom.'/'.$cnum); + + # check all parameters + ($reqdmajor,$reqdminor) = ¶meter_constraints($cnum,$cdom); + + # check course type + ($reqdmajor,$reqdminor) = &coursetype_constraints($cnum,$cdom,$crstype, + $reqdmajor, + $reqdminor); + # check course contents + ($reqdmajor,$reqdminor) = &coursecontent_constraints($cnum,$cdom, + $reqdmajor, + $reqdminor); + delete($env{'request.course.id'}); + delete($env{'request.role'}); + } elsif ($releaserequired) { + ($reqdmajor,$reqdminor) = split(/\./,$releaserequired); + } unless ($chome eq 'no_host') { $courseshash->{$chome}{$cid} = { @@ -304,11 +309,21 @@ sub recurse_courses { $courseinfo{'internal.'.$item}; } } - if ($reqdmajor ne '' && $reqdminor ne '') { - $courseshash->{$chome}{$cid}{'releaserequired'} = $reqdmajor.'.'.$reqdminor; - } - if ($courseinfo{'internal.releaserequired'} ne $reqdmajor.'.'.$reqdminor) { - $changes{'internal.releaserequired'} = $reqdmajor.'.'.$reqdminor; + if ($reqdmajor eq '' && $reqdminor eq '') { + if ($courseinfo{'internal.releaserequired'} ne '') { + $changes{'internal.releaserequired'} = ''; + } + } else { + my $releasereq = $reqdmajor.'.'.$reqdminor; + $courseshash->{$chome}{$cid}{'releaserequired'} = $releasereq; + if ($courseinfo{'internal.releaserequired'} eq '') { + $changes{'internal.releaserequired'} = $releasereq; + } else { + if ($courseinfo{'internal.releaserequired'} ne $releasereq) { + + $changes{'internal.releaserequired'} = $releasereq; + } + } } if (keys(%changes)) { if (&Apache::lonnet::put('environment',\%changes,$cdom,$cnum) eq 'ok') { @@ -339,7 +354,7 @@ sub parameter_constraints { if (ref($checkparms{$item}) eq 'ARRAY') { my $value = $resourcedata->{$key}; if (grep(/^\Q$value\E$/,@{$checkparms{$item}})) { - my ($major,$minor) = split(/\./,$needsrelease{'parameter'}{$item}{$value}); + my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value}); ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); } @@ -365,18 +380,32 @@ sub coursecontent_constraints { my ($cnum,$cdom,$reqdmajor,$reqdminor) = @_; my $navmap = Apache::lonnavmaps::navmap->new(); if (defined($navmap)) { + my %anonsubmissions = &Apache::lonnet::dump('nohist_anonsurveys', + $cdom,$cnum); my %allresponses; + my $anonsurv_subm; foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) { my %responses = $res->responseTypes(); foreach my $key (keys(%responses)) { next unless(exists($checkresponsetypes{$key})); $allresponses{$key} += $responses{$key}; } + my @parts = @{$res->parts()}; + my $symb = $res->symb(); + foreach my $part (@parts) { + if (exists($anonsubmissions{$symb."\0".$part})) { + $anonsurv_subm = 1; + } + } } foreach my $key (keys(%allresponses)) { my ($major,$minor) = split(/\./,$checkresponsetypes{$key}); ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor); } + if ($anonsurv_subm) { + ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($anonsurvey{major}, + $anonsurvey{minor},$reqdmajor,$reqdminor); + } } return ($reqdmajor,$reqdminor); } @@ -416,40 +445,28 @@ sub read_paramdata { return $resourcedata; } -sub parse_releases_xml { - my $file = $Apache::lonnet::perlvar{'lonTabDir'}.'/releaseslist.xml'; - if (-e $file) { - my $parser = HTML::LCParser->new($file); - while (my $token = $parser->get_token()) { - if ($token->[0] eq 'S') { - my $item = $token->[1]; - my $name = $token->[2]{'name'}; - my $value = $token->[2]{'value'}; - if ($item ne '' && $name ne '' && $value ne '') { - my $release = $parser->get_text(); - $release =~ s/(^\s*|\s*$ )//gx; - $needsrelease{$item}{$name}{$value} = $release; - if ($item eq 'parameter') { - if (ref($checkparms{$name}) eq 'ARRAY') { - unless(grep(/^\Q$name\E$/,@{$checkparms{$name}})) { - push(@{$checkparms{$name}},$value); - } - } else { - push(@{$checkparms{$name}},$value); - } - } elsif ($item eq 'resourcetag') { - if ($name eq 'responsetype') { - $checkresponsetypes{$value} = $release; - } - } elsif ($item eq 'course') { - if ($name eq 'crstype') { - $checkcrstypes{$value} = $release; - } - } +sub build_release_hashes { + foreach my $key (keys(%Apache::lonnet::needsrelease)) { + my ($item,$name,$value) = split(/:/,$key); + if ($item eq 'parameter') { + if (ref($checkparms{$name}) eq 'ARRAY') { + unless(grep(/^\Q$name\E$/,@{$checkparms{$name}})) { + push(@{$checkparms{$name}},$value); } + } else { + push(@{$checkparms{$name}},$value); + } + } elsif ($item eq 'resourcetag') { + if ($name eq 'responsetype') { + $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key} + } + } elsif ($item eq 'course') { + if ($name eq 'crstype') { + $checkcrstypes{$value} = $Apache::lonnet::needsrelease{$key}; } } } + ($anonsurvey{major},$anonsurvey{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'}); return; }