--- doc/loncapafiles/update_queue_slots.piml	2006/06/05 23:18:45	1.1
+++ doc/loncapafiles/update_queue_slots.piml	2015/03/16 05:25:47	1.5
@@ -3,7 +3,7 @@
 <!-- accesscount_seed.piml -->
 <!-- Matthew Hall -->
 
-<!-- $Id: update_queue_slots.piml,v 1.1 2006/06/05 23:18:45 albertel Exp $ -->
+<!-- $Id: update_queue_slots.piml,v 1.5 2015/03/16 05:25:47 raeburn Exp $ -->
 
 <!--
 
@@ -54,8 +54,20 @@ sub update_value {
     return $value;
 }
 
-my $updated;
+my $updated=0;
+my %dirs;
+my $last;
+my $total;
 sub process_gradingqueue_file {
+    my $which = (split('/',$_))[5];
+    $dirs{$which} = 1;
+    my $count2 = length("$last");
+    my $count = length("$updated");
+    my $backup = "\b"x(8+$count2+14+$count+6);
+    if (scalar(keys(%dirs)) > $last) {
+         $last = scalar(keys(%dirs));
+         print($backup."Updated $last directories, $updated files");
+    }
     return if ($_!~m/(gradingqueue|reviewqueue|slots|slot_reservations)\.db$/);
     my $type='queue';
     if ($1 eq 'slots') {
@@ -63,13 +75,12 @@ sub process_gradingqueue_file {
     } elsif ($1 eq 'slot_reservations') {
 	$type = 'reservation';
     }
+    my $count2 = length("$last");
     my $count = length("$updated");
+    my $backup = "\b"x(8+$count2+14+$count+6);
     $updated++;
-    print("\b"x(14+$count));
-    print("Updated $updated files");
-    my $prefix = $_;
-    $prefix =~s/\.db$//;
-    my $db = &amp;LONCAPA::_locking_hash_tie($prefix,'nohist_',&amp;GDBM_WRCREAT());
+    print($backup."Updated $last directories, $updated files");
+    my $db = &amp;LONCAPA::locking_hash_tie($_,&amp;GDBM_WRCREAT());
     if ($type eq 'queue') {
 	foreach my $key (keys(%{$db})) {
 	    my $real_key = &amp;unescape($key);
@@ -115,21 +126,43 @@ sub process_gradingqueue_file {
     } else {
 	print("$type unsupported\n");
     }
-    &amp;untie_user_hash($db);
+    &amp;LONCAPA::locking_hash_untie($db);
 
 }
 
 
 sub main {
-     print("Updating grading queue and slot definitions\n");
-     my $perlvar=LONCAPA::Configuration::read_conf('loncapa.conf');
-     find(
-         {
-	     no_chdir   =&gt; 1,
-	     wanted     =&gt; \&amp;process_gradingqueue_file,
-	 }, 
-         '/home/www/lonUsers/');
-     print("\n");
+    my $doupdate;
+    if (-e '/etc/loncapa-release') {
+        if (open(PIPE,"cat /etc/loncapa-release.prev |grep '^LON-CAPA release' |")) {
+            if (&lt;PIPE&gt; =~ /^\QLON-CAPA release \E(CVS_HEAD|\d+\.\d+\.\d+\.?\w*)\-\d+$/) {
+                my $previous = $1;
+                unless ($previous eq 'CVS_HEAD') {
+                    my ($major,$minor) = ($previous =~ /^(\d+)\.(\d+)\./);
+                    if (($major ne '') && ($minor ne '')) {
+                        if (($major == 2) && ($minor &lt; 10)) {
+                            $doupdate = 1;
+                        }
+                    }
+                }
+            }
+            close(PIPE);
+        }
+     }
+
+     if ($doupdate) {
+         print("Updating grading queue and slot definitions\n");
+         my $perlvar=LONCAPA::Configuration::read_conf('loncapa.conf');
+         find(
+             {
+	         no_chdir   =&gt; 1,
+	         wanted     =&gt; \&amp;process_gradingqueue_file,
+	     },
+             $perlvar->{'lonUsersDir'});
+         print("\n");
+     } else {
+         print("Update of grading queue and slot definitions not required.\n"); 
+     }
 }
 
 &amp;main();