Update static page generation; display locations in alphabetical order in the portal

diff --git a/location.sml b/location.sml
index e4464d1..616fd6c 100644 (file)
--- a/location.sml
+++ b/location.sml
@@ -172,7 +172,7 @@ fun locationTree (root, lim) =
            in
                C.fold db folder acc ($`SELECT id, parent, name FROM Location
                                        WHERE parent ^(intOptToSqlCompare root)
-                                       ORDER BY name`)
+                                       ORDER BY name DESC`)
            end
     in
        locationTree' (root, lim, [])
@@ -207,7 +207,7 @@ fun locationTreeWithUser (root, lim, usr) =
                C.fold db folder acc ($`SELECT loc, id, parent, name
                                        FROM Location LEFT OUTER JOIN Lives ON (id = loc AND usr = ^(C.intToSql usr))
                                        WHERE parent ^(intOptToSqlCompare root)
-                                       ORDER BY name`)
+                                       ORDER BY name DESC`)
            end
     in
        locationTree' (root, lim, [])
@@ -244,7 +244,7 @@ fun locationTreeWithCounts (root, lim) =
                C.fold db folder acc ($`SELECT id, parent, name
                                        FROM Location
                                        WHERE parent ^(intOptToSqlCompare root)
-                                       ORDER BY name`)
+                                       ORDER BY name DESC`)
            end
     in
        locationTree' (root, lim, [])

diff --git a/static/gen.sml b/static/gen.sml
index 2d595c4..1e409df 100644 (file)
--- a/static/gen.sml
+++ b/static/gen.sml
@@ -10,7 +10,7 @@ end
 
 structure NM = BinaryMapFn(IntKey)
 
-val outputDir = "/var/www/dyn/"
+val outputDir = "/home/hcoop/public_html/dyn/"
 
 fun generate () =
     let
@@ -236,7 +236,7 @@ fun generate () =
                                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 id = usr"
                    end
 
                val res = countResidents ()