Merge branch 'master' of git://factorcode.org/git/factor

db4
Joe Groff 2010-02-10 11:24:58 -08:00
commit 940d787c03
1 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,4 @@
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: namespaces assocs kernel sequences accessors hashtables USING: namespaces assocs kernel sequences accessors hashtables
urls db.types db.tuples math.parser fry logging combinators urls db.types db.tuples math.parser fry logging combinators
@ -51,7 +51,7 @@ SYMBOL: aside-id
set-aside ; set-aside ;
M: asides call-responder* M: asides call-responder*
[ init-asides ] [ asides set ] [ call-next-method ] tri ; [ init-asides ] [ call-next-method ] bi ;
: touch-aside ( aside -- ) : touch-aside ( aside -- )
asides get touch-state ; asides get touch-state ;
@ -65,14 +65,13 @@ M: asides call-responder*
[ touch-aside ] [ insert-tuple ] [ set-aside ] tri ; [ touch-aside ] [ insert-tuple ] [ set-aside ] tri ;
: end-aside-post ( aside -- response ) : end-aside-post ( aside -- response )
[ url>> ] [ post-data>> ] bi
request [ request [
clone clone
swap >>post-data over post-data>> >>post-data
over >>url over url>> >>url
] change ] change
[ url set ] [ path>> split-path ] bi [ [ post-data>> params>> params set ] [ url>> url set ] bi ]
asides get responder>> call-responder ; [ url>> path>> split-path asides get responder>> call-responder ] bi ;
\ end-aside-post DEBUG add-input-logging \ end-aside-post DEBUG add-input-logging