--- loncom/interface/lonrelrequtils.pm	2015/04/28 13:20:41	1.3
+++ loncom/interface/lonrelrequtils.pm	2015/09/13 21:48:05	1.4
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # The LearningOnline Network
 #
-# $Id: lonrelrequtils.pm,v 1.3 2015/04/28 13:20:41 raeburn Exp $
+# $Id: lonrelrequtils.pm,v 1.4 2015/09/13 21:48:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,9 +302,9 @@ sub init_global_hashes {
         }
     }
     ($Apache::lonrelrequtils::anonsurvey{major},$Apache::lonrelrequtils::anonsurvey{minor}) =
-        split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey'});
+        split(/\./,$Apache::lonnet::needsrelease{'parameter:type:anonsurvey:'});
     ($Apache::lonrelrequtils::randomizetry{major},$Apache::lonrelrequtils::randomizetry{minor}) =
-        split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry'});
+        split(/\./,$Apache::lonnet::needsrelease{'parameter:type:randomizetry:'});
     return;
 }
 
@@ -371,14 +371,16 @@ sub parameter_constraints {
             }
             foreach my $item (keys(%Apache::lonrelrequtils::checkparmsmatch)) { 
                 if ($key =~ /(\Q$item\E)$/) {
-                    if (ref($Apache::lonrelrequtils::checkparms{$item}) eq 'ARRAY') {
+                    if (ref($Apache::lonrelrequtils::checkparmsmatch{$item}) eq 'ARRAY') {
                         my $value = $resourcedata->{$key};
-                        foreach my $entry (@{$Apache::lonrelrequtils::checkparms{$item}}) {
+                        foreach my $entry (@{$Apache::lonrelrequtils::checkparmsmatch{$item}}) {
                             my $regexp;
                             if (($item eq 'lenient') && ($entry eq 'weighted')) {
                                 $regexp = '^[\-\.\d]+,[\-\.\d]+,[\-\.\d]+,[\-\.\d]+$';      
                             } elsif (($item eq 'acc') && ($entry eq '_denyfrom_')) {
                                 $regexp = '\!';
+                            } elsif (($item eq 'interval') && ($entry eq 'done')) {
+                                $regexp = '^\d+_done$';
                             }
                             if ($regexp ne '') {
                                 if ($value =~ /$regexp/) {
@@ -415,7 +417,7 @@ sub commblock_constraints {
     if (keys(%comm_blocks) > 0) {
         foreach my $block (keys(%comm_blocks)) {
             if ($block =~ /^firstaccess____(.+)$/) {
-                my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:timer'});
+                my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:timer:'});
                 ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                 last;
             } elsif ($block =~ /^(\d+)____(\d+)$/) {
@@ -426,13 +428,13 @@ sub commblock_constraints {
                 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'});
+                            my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:docs:'});
                             ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                             last;
                         }
                     }
                     if ($comm_blocks{$block}{'blocks'}{'printout'} eq 'on') {
-                        my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:printout'});
+                        my ($major,$minor) = split(/\./,$Apache::lonnet::needsrelease{'course:commblock:printout:'});
                         ($reqdmajor,$reqdminor) = &update_reqd_loncaparev($major,$minor,$reqdmajor,$reqdminor);
                         last;
                     }