--- a/urls.py	Sun Feb 08 04:59:22 2009 +0200
+++ b/urls.py	Mon Feb 09 00:24:13 2009 +0200
@@ -4,35 +4,32 @@
 """
 
 # urltree stuff
-from qmsk.web.urltree import URLConfig, URL, URLTree
+from qmsk.web import urltree
 
 # our own handlers
 import handlers
 
 # for types
-import channels 
+import channels, log_formatter, utils
 
 # our URLConfig
-url_config = URLConfig(
+urls = url = urltree.URLConfig(
     type_dict   = { 
         # lookup LogChannel
-        'cid': channels.channel_list.lookup 
+        'cid':  channels.channel_list.lookup,
+        'fmt':  log_formatter.by_name,
+        'date': utils.Date(None, '%Y-%m-%d'),
     }
 )
 
-# shortcut for building an URL with our url_config
-def url (*args, **kwargs) :
-    return URL(url_config, *args, **kwargs)
-
 # urls
 index           = url('/',                                                              handlers.index                  )
 channel_select  = url('/channel_select/?channel:cid',                                   handlers.channel_select         )
-channel_view    = url('/channels/{channel:cid}/?count:str=10',                          handlers.channel_view           )
+channel_view    = url('/channels/{channel:cid}/?count:int=10&formatter:fmt=irssi',      handlers.channel_view           )
 channel_last    = url('/channels/{channel:cid}/last/{count:int=100}/{format=html}',     handlers.channel_last           )
-channel_search  = url('/channels/{channel:cid}/search/?q',                               handlers.channel_search         )
+channel_date    = url('/channels/{channel:cid}/date/{date:date}/?formatter:fmt=irssi',  handlers.channel_date           )
+channel_search  = url('/channels/{channel:cid}/search/?q',                              handlers.channel_search         )
 
 # mapper
-mapper = URLTree(
-    [index, channel_select, channel_view, channel_last, channel_search]
-)
+mapper = urltree.URLTree(urls)