Source

django-trawler / trawler / urls.py

Diff from to

trawler/urls.py

 from django.conf.urls.defaults import patterns, include, url
-from trawler.views import CampaignDetail
-urlpatterns = patterns('',
-    url(r'^l/(?P<target_id>\d)/(.*)$', 'trawler.views.link_hits',
+from trawler.views import CampaignDetailView
+
+
+urlpatterns = patterns('trawler.views',
+    url(r'campaign/(?P<pk>\d+)/$',
+        CampaignDetailView.as_view(), name='campaign_detail'),
+    # note that these two patterns match anything following the last slash... 
+    url(r'l/(?P<campaign_id>\d+)/(?P<target_id>\d+)/', 'link_hits',
         name='link_hits'),
-    url(r'^i/(?P<target_id>\d)/(.*)$', 'trawler.views.img_hits',
+    url(r'i/(?P<campaign_id>\d+)/(?P<target_id>\d+)/', 'img_hits',
         name='img_hits'),
-    url(r'^campaign/(?P<pk>\d)/$',
-        CampaignDetail.as_view(), name='campaign_detail')
 )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.