--- loncom/misc/refresh_courseids_db.pl	2010/12/16 17:03:48	1.9
+++ loncom/misc/refresh_courseids_db.pl	2012/03/31 22:10:16	1.11
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 #
-# $Id: refresh_courseids_db.pl,v 1.9 2010/12/16 17:03:48 raeburn Exp $
+# $Id: refresh_courseids_db.pl,v 1.11 2012/03/31 22:10:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,7 +80,8 @@ print $fh "==== refresh_courseids_db.pl
 my @domains = sort(&Apache::lonnet::current_machine_domains());
 my @ids=&Apache::lonnet::current_machine_ids();
 
-&build_release_hashes();
+&Apache::loncommon::build_release_hashes(\%checkparms,\%checkresponsetypes,
+                                         \%checkcrstypes,\%anonsurvey,\%randomizetry);
 $env{'allowed.bre'} = 'F';
 
 foreach my $dom (@domains) {
@@ -226,6 +227,10 @@ sub recurse_courses {
                     ($reqdmajor,$reqdminor) = &coursetype_constraints($cnum,$cdom,$crstype,
                                                                       $reqdmajor,
                                                                       $reqdminor);
+                    # check communication blocks 
+                    ($reqdmajor,$reqdminor) = &commblock_constraints($cnum,$cdom,
+                                                                     $reqdmajor,
+                                                                     $reqdminor);
                     # check course contents
                     ($reqdmajor,$reqdminor) = &coursecontent_constraints($cnum,$cdom,
                                                                          $reqdmajor,
@@ -376,6 +381,36 @@ sub coursetype_constraints {
     return ($reqdmajor,$reqdminor);
 }
 
+sub commblock_constraints {
+    my ($cnum,$cdom,$reqdmajor,$reqdminor) = @_;
+    my %comm_blocks =  &Apache::lonnet::dump('commblock',$cdom,$cnum);
+    my $now = time;
+    if (keys(%comm_blocks) > 0) {
+        foreach my $block (keys(%comm_blocks)) {
+            if ($block =~ /^firstaccess____(.+)$/) {
+                my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course.commblock.timer'});
+                ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
+                last;
+            } elsif ($block =~ /^(\d+)____(\d+)$) {
+                my ($start,$end) = ($1,$2);
+                next if ($end < $now); 
+            }
+            if (ref($comm_blocks{$block}) eq 'HASH') {
+                if (ref($comm_blocks{$block}{'blocks'}) eq 'HASH') {
+                    if (ref($comm_blocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
+                        if (keys(%{$comm_blocks{$block}{'blocks'}{'docs'}} > 0) {
+                            my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course.commblock.docs'});
+                            ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
+                            last;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 sub coursecontent_constraints {
     my ($cnum,$cdom,$reqdmajor,$reqdminor) = @_;
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -454,29 +489,3 @@ sub read_paramdata {
     return $resourcedata;
 }
 
-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'});
-    ($randomizetry{major},$randomizetry{minor}) = split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'});
-    return;
-}
-