mason: update table style

[factor.git] / extra / webapps / calculator / calculator.factor

diff --git a/extra/webapps/calculator/calculator.factor b/extra/webapps/calculator/calculator.factor
index 95f48109b1210489f181e02c0de503917887908a..0b5667c3cf4b2ddf2d5fb75d785b9c53cd41700a 100644 (file)
--- a/extra/webapps/calculator/calculator.factor
+++ b/extra/webapps/calculator/calculator.factor
@@ -1,8 +1,9 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: furnace furnace.actions furnace.redirection
-http.server.dispatchers html.forms validators urls accessors
-math kernel ;
+! See https://factorcode.org/license.txt for BSD license.
+USING: accessors furnace.actions furnace.alloy
+furnace.redirection html.forms http.server
+http.server.dispatchers kernel math namespaces urls validators
+webapps.utils ;
 IN: webapps.calculator
 
 TUPLE: calculator < dispatcher ;
@@ -22,7 +23,7 @@ TUPLE: calculator < dispatcher ;
             { "y" [ v-number ] }
         } validate-params
 
-        URL" $calculator" "x" value "y" value + "z" set-query-param
+        URL" $calculator" clone "x" value "y" value + "z" set-query-param
         <redirect>
     ] >>submit ;
 
@@ -31,14 +32,14 @@ TUPLE: calculator < dispatcher ;
         <calculator-action> >>default ;
 
 ! Deployment example
-USING: db.sqlite furnace.alloy namespaces http.server ;
+: calculator-db ( -- db ) "calculator.db" <temp-sqlite-db> ;
 
-: calculator-db ( -- db ) "calculator.db" <sqlite-db> ;
+: <calculator-app> ( -- dispatcher )
+    <calculator> calculator-db <alloy> ;
 
+! Calculator runs at port 8081 and 8431
 : run-calculator ( -- )
-    <calculator>
-        calculator-db <alloy>
-        main-responder set-global
-    8080 httpd drop ;
+    <calculator-app> main-responder set-global
+    run-test-httpd ;
 
 MAIN: run-calculator