diff -r 5ade0288f2ec -r 5a7188bf2894 urls.py --- a/urls.py Mon Feb 09 22:17:10 2009 +0200 +++ b/urls.py Mon Feb 09 23:49:57 2009 +0200 @@ -13,15 +13,15 @@ import utils # for configuration -import channels +import config # our URLTypes types = dict( # LogChannel - cid = utils.URLChannelName(channels.channel_list.dict()), + cid = utils.URLChannelName(config.LOG_CHANNELS.dict()), # datetime - date = utils.URLDateType('%Y-%m-%d'), + date = utils.URLDateType(config.URL_DATE_FMT), # UTC timestamp ts = utils.URLTimestampType(), @@ -39,7 +39,7 @@ channel_link = url('/channels/{channel:cid}/link/{timestamp:ts}', handlers.channel_link ) channel_calendar = url('/channels/{channel:cid}/calendar/{year:int=0}/{month:int=0}', handlers.channel_calendar ) channel_date = url('/channels/{channel:cid}/date/{date:date}', handlers.channel_date ) -channel_search = url('/channels/{channel:cid}/search/?q=&count:int=&skip:int=', handlers.channel_search ) +channel_search = url('/channels/{channel:cid}/search/?q=&skip:int=0&max:int=', handlers.channel_search ) # mapper mapper = urltree.URLTree(urls)