X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/12adf55a902b1d9bde677e4636530e5753857e05..1824f573f7f8720514af1dc94d7cfb1de5b15fef:/src/acl.sml

diff --git a/src/acl.sml b/src/acl.sml
index d0b41fe..be30fdf 100644
--- a/src/acl.sml
+++ b/src/acl.sml
@@ -37,6 +37,25 @@ fun query {user, class, value} =
 	    NONE => false
 	  | SOME values => SS.member (values, value)
 
+fun queryAll user =
+    case SM.find (!acl, user) of
+	NONE => []
+      | SOME classes => SM.foldri (fn (class, values, out) =>
+				      (class, SS.foldr (op::) [] values) :: out)
+				  [] classes
+
+fun users () = SM.foldri (fn (user, _, ls) => user :: ls) [] (!acl)
+
+fun whoHas {class, value} =
+    SM.foldri (fn (user, classes, users) =>
+		  case SM.find (classes, class) of
+		      NONE => users
+		    | SOME values =>
+		      if SS.member (values, value) then
+			  user :: users
+		      else
+			  users) [] (!acl)
+
 fun class {user, class} =
     case SM.find (!acl, user) of
 	NONE => SS.empty
@@ -108,15 +127,21 @@ fun write fname =
 				      TextIO.output (outf, value)))
 
 	val writeClasses = SM.appi (fn (class, values) =>
-				       (TextIO.output (outf, class);
-					writeValues values;
-					TextIO.output (outf, "\n")))
+				       if SS.isEmpty values then
+					   ()
+				       else
+					   (TextIO.output (outf, class);
+					    writeValues values;
+					    TextIO.output (outf, "\n")))
 
 	val writeUsers = SM.appi (fn (user, classes) =>
-				     (TextIO.output (outf, user);
-				      TextIO.output (outf, "\n");
-				      writeClasses classes;
-				      TextIO.output (outf, "\n")))
+				     if SM.numItems classes = 0 then
+					 ()
+				     else
+					 (TextIO.output (outf, user);
+					  TextIO.output (outf, "\n");
+					  writeClasses classes;
+					  TextIO.output (outf, "\n")))
     in
 	writeUsers (!acl);
 	TextIO.closeOut outf