added hosttable stuff

[moira.git] / incremental / afs_utils.pl

diff --git a/incremental/afs_utils.pl b/incremental/afs_utils.pl
index 1c97ecd173a0863e45d64ebe5468d603dffe2691..f64579b0f1dbb5be8bca5c7b02f4416bf9ccafd1 100644 (file)
--- a/incremental/afs_utils.pl
+++ b/incremental/afs_utils.pl
@@ -1,3 +1,5 @@
+# $Header$
+
 $afsbin="/moira/bin";
 $vos="$afsbin/vos";
 $pts="$afsbin/pts";
@@ -16,6 +18,7 @@ $LOCK_UN=8;
      "CONTRIB", "contrib",
      "COURSE", "course",
      "HOMEDIR", "user",
+     "LEASE", "dept",
      "PROJECT", "project",
      "REF", "ref",
      "SW", "sw",
@@ -68,16 +71,20 @@ sub afs_unlock
 
 sub afs_find
 {
-    local($cell,$type,$quota) = @_;
-    local($j);
-    local(@max) = '';
+    local($cell,$type,$quota,@except) = @_;
+    local($j,$k);
+    local(@max) = ("", "", -10000000);
 
     &afs_lock;
     chop(@afs_data);
 
+  sloop:
     for (@afs_data) {
        local ($a, $asrv, $apart, $t, $total, $used, $alloc) = split(/\s+/,$_);
        next if ($a ne $cell || !$total || $type !~ /$t/);
+       for $j (@except) {
+           next sloop if ($j eq $asrv);
+       }
        $alloc = $used if ($alloc < $used);
        $j = 2*$total - $used - $alloc;
        @max = ($asrv,$apart,$j) if (! @max || $j > $max[2]);