From 1f061c2c637725bb249cb763b8490253aae3cb33 Mon Sep 17 00:00:00 2001
From: ygrek <ygrek@autistici.org>
Date: Wed, 6 May 2009 21:21:57 +0300
Subject: [PATCH] cgi output errors too

---
 cgi.f | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/cgi.f b/cgi.f
index 4f002ed..0ccfb98 100755
--- a/cgi.f
+++ b/cgi.f
@@ -75,24 +75,39 @@ ALSO XHTML
 
 : process ( a u -- ) 
   `p tag 
+  << `h2 tag S" Input" TYPE >>
   DUP limit > IF DROP limit S" Input too long, truncated" TYPE CR THEN
   << `pre tag 2DUP TYPE >>
   hrule
-  \ (( 0 )) tmpnam ASCIIZ> >STR
-  \	(( 0 )) tmpnam ASCIIZ> >STR
 	(( S" sql" DROP 0x1FF )) mkdir DROP
-	ms@ DUP " sql/{n}.in" SWAP " sql/{n}.out" { src dst }
-  \ src STR@ TYPE CR dst STR@ TYPE CR
+	ms@ { tick | src dst err }
+  tick " sql/{n}.in" -> src
+  tick " sql/{n}.out" -> dst
+  tick " sql/{n}.err" -> err
+  \ src STR@ TYPE CR dst STR@ TYPE CR err STR@ TYPE CR
   src STR@ OCCUPY
-  dst STR@ src STR@ " ./sql2cpp {s} > {s}" STR@ sys
-  dst STR@ FILE 
+  err STR@ dst STR@ src STR@ " ./sql2cpp {s} > {s} 2> {s}" STR@ sys
+  dst STR@ FILE
+  << `h2 tag S" Output" TYPE >>
   << `pre tag TYPE >>
-  hrule ;
+  hrule
+  err STR@ FILE DUP 0= IF 2DROP EXIT THEN
+  << `h2 tag S" Errors" TYPE >>
+  << `pre tag TYPE >>
+  hrule
+  ;
+
+: ask-input 
+  << `p tag
+    S" Input SQL statements terminated with semicolon (;) each. " TYPE
+    S" Use ? or @name for binding slots" TYPE
+  >>
+  S" " render-edit ;
 
 : main ( -- )
   S" SQL to C++ code generator" 2DUP <page>
 	<< `h1 tag `/p/sql_to_cpp.html link-text >>
-  `content GetParam DUP 0= IF 2DROP S" " render-edit ELSE process THEN
+  `content GetParam DUP 0= IF 2DROP ask-input ELSE process THEN
   \ S" CREATE TABLE x (z INT);" process
 ;
 
-- 
2.11.4.GIT