From ba1b602053300d982e973f446e44bd7a436c157d Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Thu, 26 Nov 2009 14:43:31 +0000
Subject: change PGF.categories to return list of identifiers instead of types

---
 src/server/PGFService.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/server')

diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index c4290b7da..0a457395f 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -69,9 +69,8 @@ pgfMain pgf command =
             Nothing -> return Nothing
             Just "" -> return Nothing
             Just cat -> case PGF.readType cat of
-                          Nothing -> throwCGIError 400 "Bad category" ["Bad category: " ++ cat]
-                          Just typ | typ `elem` PGF.categories pgf -> return $ Just typ
-                                   | otherwise -> throwCGIError 400 "Unknown category" ["Unknown category: " ++ PGF.showType [] typ]
+                          Nothing  -> throwCGIError 400 "Bad category" ["Bad category: " ++ cat]
+                          Just typ -> return $ Just typ  -- typecheck the category
 
     getFrom :: CGI (Maybe PGF.Language)
     getFrom = getLang "from"
@@ -146,7 +145,7 @@ doGrammar pgf macc = showJSON $ toJSObject
                       ("languageCode", showJSON $ fromMaybe "" (PGF.languageCode pgf l)),
                       ("canParse",     showJSON $ PGF.canParse pgf l)]
                      | l <- PGF.languages pgf]
-        categories = map toJSObject [[("cat", PGF.showType [] cat)] | cat <- PGF.categories pgf]
+        categories = map toJSObject [[("name", PGF.showCId cat)] | cat <- PGF.categories pgf]
 
 doGraphvizAbstrTree pgf tree = do
   let dot = PGF.graphvizAbstractTree pgf (True,True) tree
-- 
cgit v1.2.3