X-Git-Url: https://ruin.nu/git/index.pl?a=blobdiff_plain;f=Main.hs;h=05414b4f3ec15786ccd05f14d094f5ce63b5287a;hb=a7c0523b9e2d6fcc0ff25f1fac48aba435599a8a;hp=93a56168c0c75507a639ba35b78eb3816f43e645;hpb=38f06e9262e9b2dd14906492539006602225d49e;p=yawbih.git

diff --git a/Main.hs b/Main.hs
index 93a5616..05414b4 100644
--- a/Main.hs
+++ b/Main.hs
@@ -1,21 +1,92 @@
 module Main where 
 
-import CGI hiding (div, head, map, span)
+import CGI hiding (div, head, map, span, Text)
 import RawCGIInternal
 import CGIOutput
+import CGITypes
+import System
+import Wiki
 
-main = start [] cgi
-
-cgi CGIInfo {cgiUrl = url, cgiPathInfo = pi, cgiContentType = ct, cgiContents = c, cgiCookies = co, cgiArgs = as, cgiHandle = h} parms = do 
-	putStr "content-type: text/html\n\n"
-	print parms
-	print url
-	print pi
-	print ct
-	print co
-	print co
-	print as
-	print h
-	case assocParm "test" parms of
-		Nothing -> putStr "Parameter 'test' not provided"
-		Just x -> putStr $ "Value of test = "++x
+import Text.ParserCombinators.Parsec
+
+testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
+
+--main = start [] cgi
+
+main = do 
+	db <- testDB
+	runWithHook [] (\(key:act) -> sp db key act ) $ sp db "MainPage" [] 
+
+ps a = standardQuery "Hello" a
+
+editPage db key = do 
+	s <- io $ getCurrent db key 
+	s' <- case s of
+		Nothing -> return ""
+		Just (x,_) -> return x
+	standardQuery key $ do
+		t <- p $ makeTextarea s' (attr_SS "rows" "10" ## attr_SS "cols" "75" ## attr_SS "colspan" "2")
+		p empty
+		text "Author: "
+		a <- textInputField (fieldSIZE 20)
+		p empty
+		text "Comment: "
+		c <- textInputField (fieldSIZE 20)
+		--p $ submit (F2 t a) testing (attr "value" "Send")
+		p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
+		--submit0 (sp db key []) (attr "value" "Send1")
+
+sp db key _ = do
+	s <- io $ getCurrent db key 
+	standardQuery key $ showPage db key s
+
+savePage db key (F3 t a c) = do
+	io $ update db key fulltext author comment
+	s <- io $ getCurrent db key 
+	standardQuery key $ do
+		showPage db key s
+  where
+  	fulltext = value t
+	author = value a
+	comment = value c 
+
+showPage db key s = do
+		case s of
+			Nothing -> text "No text added for this keyword"
+			Just (full, date) -> do
+				case parse wikiParser "" full of
+					Right n -> ex n	
+					Left e -> do
+						text "PARSE ERROR: "
+						text (show e)
+						p $ text full
+				p $ text $ "Last edited: "++date
+		footer db key
+
+footer db key = do
+	hr empty
+	submit0 (editPage db key) (attr "value" "Edit")
+	--address (hlink (URL {unURL = ("wiki?"++key++"+edit")}) (text "Edit this page") 
+
+ex [] = return ()
+ex ((Paragraph):xs) = do
+	p empty
+	ex xs
+ex ((Text s):xs) = do
+	text s
+	ex xs
+ex ((Link l d):xs) = do
+	hlink (URL {unURL = ("wiki?"++l)}) (text d)
+	ex xs
+
+ex2 [] = []
+ex2 ((Paragraph):xs) = "<p>"++ex2 xs
+ex2 ((Text s):xs) = s++ex2 xs
+ex2 ((Link l d):xs) = "<link: "++l++" desc: "++d++">"++ex2 xs
+
+
+test s = case parse wikiParser "" s of
+					Right n -> do 
+						print (ex2 n)
+					Left e -> do
+						print e