nextbus/__init__.py nextbus/urls.py @@ -48,16 +48,16 @@ def addStop(r, bmark, re=None, agency=None, route=None, return HttpResponseRedirect('/catch/%s' % (bmark)) if (direction is not None): data = nextbus.getStops(agency, route, direction) - prefix = '/addstop/nb/%s/%s/%s/%s/%s'\ + prefix = '/nb/addstop/%s/%s/%s/%s/%s'\ % (bmark, re, agency, route, direction) instructions = 'pick a stop' elif (route is not None): data = nextbus.getDirections(agency, route) - prefix = '/addstop/nb/%s/%s/%s/%s' % (bmark, re, agency, route) + prefix = '/nb/addstop/%s/%s/%s/%s' % (bmark, re, agency, route) instructions = 'pick a direction' elif (agency is not None): data = nextbus.getRoutes(agency) - prefix = '/addstop/nb/%s/%s/%s' % (bmark, re, agency) + prefix = '/nb/addstop/%s/%s/%s' % (bmark, re, agency) instructions = 'pick a route' items = [] if not (data): nextbus/views.py @@ -5,22 +5,8 @@ urlpatterns = patterns('', (r'^logout$', 'views.logout'), (r'^addbmark(?:\/)*$', 'views.addBmark'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/_dflt(?:\/)*$', 'nextbus.views.addStopDflt'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/(?P<re>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)/(?P<direction>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - (r'^addstop/nb/(?P<bmark>[\w|-]+?)/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)/(?P<direction>[\w|-]+?)/(?P<stop>[\w|-]+?)(?:\/)*$', 'nextbus.views.addStop'), - - (r'^nb/catchstop(?:\/)*$', 'nextbus.views.catchStop'), - (r'^catchstop/nb/_dflt(?:\/)*$', 'nextbus.views.catchStopDflt'), - (r'^catchstop/nb/(?P<re>[\w|-]+?)(?:\/)*$', 'nextbus.views.catchStop'), - (r'^catchstop/nb/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)(?:\/)*$', 'nextbus.views.catchStop'), - (r'^catchstop/nb/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)(?:\/)*$', 'nextbus.views.catchStop'), - (r'^catchstop/nb/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)/(?P<direction>[\w|-]+?)(?:\/)*$', 'nextbus.views.catchStop'), - (r'^catchstop/nb/(?P<re>[\w|-]+?)/(?P<agency>[\w|-]+?)/(?P<route>[\w|-]+?)/(?P<direction>[\w|-]+?)/(?P<stop>[\w|-]+?)(?:\/)*$', 'nextbus.views.catchStop'), - + (r'^nb/', include('nextbus.urls') ), + (r'^catch/(?P<bmark>[\w|-]+)(?:\/)*$', 'views.catch'), (r'^delete/bmark/(?P<bmark>[\w|-]+)(?:\/)*(?P<confirm>[\w|-]*)$', 'views.deleteBmark'), urls.py @@ -63,7 +63,7 @@ def catch(r, bmark): else: error = "Some stops could not be retreived" - links = [ { 'url':'/addstop/nb/%s/_dflt' % (bmark), 'title':'add a stop' }, + links = [ { 'url':'/nb/addstop/%s/_dflt' % (bmark), 'title':'add a stop' }, { 'url':'/catch/%s' % bmark, 'title':'reload'}] params = { views.py 7c738f5876d8d459822f1977b2297e71a7fd35d0 mihasya m@mihasya.com http://github.com/mihasya/yourmuni/commit/0f58641859cfadb09245da08af5e8033fc0926dd 0f58641859cfadb09245da08af5e8033fc0926dd 2009-01-21T18:14:28-08:00 2009-01-21T18:14:28-08:00 more steps to turn nextbus into its own app eda81391fa96b1cfae8de9c5808d5893a4a6b40a mihasya m@mihasya.com