Ignore retired members in dynamic geographic location pages

diff --git a/location.sml b/location.sml
index 616fd6c..f59059a 100644 (file)
--- a/location.sml
+++ b/location.sml
@@ -102,7 +102,7 @@ fun countResidents () =
                addToParents (#loc lives, count)
            end
     in
-       C.fold db folder NM.empty ($`SELECT loc, usr FROM Lives`)
+       C.fold db folder NM.empty ($`SELECT loc, usr FROM Lives JOIN WebUserActive ON usr = id`)
     end
 
 fun recordResidents () =
@@ -136,7 +136,7 @@ fun recordResidents () =
            end
     in
        C.fold db folder NM.empty ($`SELECT loc, id, name, rname, bal, joined, app, shares, paypal, checkout
-                                    FROM Lives JOIN WebUser ON usr = id`)
+                                    FROM Lives JOIN WebUserActive ON usr = id`)
     end
 
 fun residents loc =
@@ -294,7 +294,7 @@ fun removeFromLocation (lives : lives) =
 
 fun residentsOneLevel loc =
     C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout
-                                 FROM Lives, WebUser
+                                 FROM Lives, WebUserActive
                                  WHERE loc = ^(C.intToSql loc)
                                    AND usr = id
                                  ORDER BY name`)