Working education query

adamConnerSax · Jun 20, 2019 · 8747759 · 8747759
1 parent a07b21c
commit 8747759
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/census-servant/census-downloader/Main.hs b/census-servant/census-downloader/Main.hs
@@ -94,7 +94,7 @@ main = do
         >> (fmap (fmap (fmap (addYear x))) $ getOneYearLong
              runServant
              stateKeysFrame
-             Census.acsGRAKeys
+             Census.acsGAEKeys
              Census.AllStatesAndDistricts
              x
            )
@@ -181,7 +181,7 @@ getOneYearLong
            )
        )
 getOneYearLong runServant stateKeysFrame requestedDataKeys geoCode year = do
-  let acsQuery = Census.getACSCountsLong Census.acsGRARequestDictionary
+  let acsQuery = Census.getACSCountsLong Census.acsGAERequestDictionary
                                          requestedDataKeys
                                          year
                                          Census.ACS1

diff --git a/census-servant/src/Census/Fields.hs b/census-servant/src/Census/Fields.hs
@@ -134,6 +134,11 @@ acsGRARequestDictionary =
 
 acsGRAKeys = allWNHKeys ++ allGAKeys
 
+acsGAERequestDictionary =
+  CF.addRequests allGAERequests CF.emptyRequestDictionary
+
+acsGAEKeys = allGAEKeys
+
 data GenderT = Female | Male deriving (Enum,Bounded,Eq,Ord,Show)
 data RaceT = Black | Hispanic | Asian | Native | Pacific | WhiteAlone | WhiteNonHispanic  deriving (Enum,Bounded,Eq,Ord,Show)
 data AgeRT = A18To24 | A25To44 | A45To64 | A65To74 | A75AndOver deriving (Enum,Bounded,Eq,Ord,Show)