keyword field and link instead of button

diff --git a/Main.hs b/Main.hs
index 05414b4f3ec15786ccd05f14d094f5ce63b5287a..a52b038feac63fd30f837288f8ef7dee9be66449 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -15,7 +15,7 @@ testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
 
 main = do 
        db <- testDB
-       runWithHook [] (\(key:act) -> sp db key act ) $ sp db "MainPage" [] 
+       runWithHook [] (\(key:act) -> sp db key) $ sp db "MainPage"
 
 ps a = standardQuery "Hello" a
 
@@ -36,7 +36,7 @@ editPage db key = do
                p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
                --submit0 (sp db key []) (attr "value" "Send1")
 
-sp db key _ = do
+sp db key = do
        s <- io $ getCurrent db key 
        standardQuery key $ showPage db key s
 
@@ -65,7 +65,9 @@ showPage db key s = do
 
 footer db key = do
        hr empty
-       submit0 (editPage db key) (attr "value" "Edit")
+       submitLink0 (editPage db key) (text "Edit this page")
+       text " Keyword: "
+       activate (sp db) textInputField empty
        --address (hlink (URL {unURL = ("wiki?"++key++"+edit")}) (text "Edit this page") 
 
 ex [] = return ()

diff --git a/Wiki.hs b/Wiki.hs
index dee41a10e38dbba467d315c164f5f7aff81b0885..337d715eb9160b83cd94e2fa2549de67e09fd6da 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -63,46 +63,22 @@ pLinkLong = do
        string "[["
        l <- many1 $ noneOf ['|']
        char '|'
-       d <- many1 $ noneOf [']'] 
+       d <- many1 $ noneOf "]" 
        string "]]"
        return (Link l d)
 pLink = do
        string "[["
-       l <- many1 $ noneOf ['|','[',']']
+       l <- many1 $ noneOf "]"
        string "]]"
        return (Link l l)
 pOtherChar = do
-       c <- satisfy validChar
+       c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
        return (Text (c:[]))
 
 pText = do
        t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
        return (Text t)
 
-validChar ',' = True
-validChar ';' = True
-validChar '.' = True
-validChar ':' = True
-validChar '!' = True
-validChar '?' = True
-validChar '[' = True
-validChar ']' = True
-validChar '(' = True
-validChar ')' = True
-validChar '\'' = True
-validChar '"' = True
-validChar '=' = True
-validChar '-' = True
-validChar '%' = True
-validChar '$' = True
-validChar '£' = True
-validChar '<' = True
-validChar '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
 
 newtype PGB = PGB DBService