apt: new process for package install on puppet nodes

[hcoop/portal.git] / init.sml

diff --git a/init.sml b/init.sml
index 789fcbc..f6f5e7c 100644 (file)
--- a/init.sml
+++ b/init.sml
@@ -208,6 +208,7 @@ fun mkNodeRow [id, name, descr, debian] =
 fun listNodes () =
     C.map (getDb ()) mkNodeRow ($`SELECT id, name, descr, debian
                                  FROM WebNode
+                                  WHERE id IN (SELECT id FROM ActiveWebNode)
                                  ORDER BY name`)
 
 fun nodeName id =
@@ -314,7 +315,7 @@ fun searchCheckout checkout =
 fun searchRealName realname =
     C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout
                                  FROM WebUser
-                                 WHERE rname ILIKE ^(C.stringToSql ("%" ^ realname ^ "%"))
+                                 WHERE rname ILIKE (^(C.stringToSql "%") || trim (both ^(C.stringToSql " ") from ^(C.stringToSql realname)) || ^(C.stringToSql "%")) 
                                  ORDER BY name`)
 
 end