Commits

Owen Nelson committed badfef4

adds campaign id to urls allowing us to set target id to 0 (for testing). Refs #2

Comments (0)

Files changed (2)

src/trawler/urls.py

 
 
 urlpatterns = patterns('trawler.views',
-    url(r'l/(?P<target_id>\d+)/(.*)$', 'link_hits',
+    url(r'l/(?P<campaign_id>\d+)/(?P<target_id>\d+)/(.*)$', 'link_hits',
         name='link_hits'),
-    url(r'i/(?P<target_id>\d+)/(.*)$', 'img_hits',
+
+    url(r'i/(?P<campaign_id>\d+)/(?P<target_id>\d+)/(.*)$', 'img_hits',
         name='img_hits'),
+
     url(r'campaign/(?P<pk>\d+)/$',
         CampaignDetailView.as_view(), name='campaign_detail')
 )

src/trawler/views.py

 from trawler.models import Target, Campaign
 import mimetypes
 
-def link_hits(request, target_id):
-    mark = Target.objects.get(pk=target_id)
-    mark.link_followed = True
-    mark.save()
+def link_hits(request, campaign_id, target_id=0):
+    target_id = int(target_id)
+    campaign_id = int(campaign_id)
+    if target_id != 0:
+        mark = Target.objects.get(pk=target_id)
+        mark.link_followed = True
+        mark.save()
     raise Http404()
 
-def img_hits(request, target_id):
-    mark = Target.objects.get(pk=target_id)
-    mark.image_viewed = True
-    mark.save()
+def img_hits(request, campaign_id, target_id=0):
+    target_id = int(target_id)
+    campaign_id = int(campaign_id)
+    if target_id != 0:
+        mark = Target.objects.get(pk=target_id)
+        mark.image_viewed = True
+        mark.save()
+        img = mark.campaign.img
+    else:
+        img = Campaign.objects.get(pk=campaign_id).img
     try:
-        img = mark.campaign.img
         return HttpResponse(open(img.path, 'rb'),
                             mimetype=mimetypes.guess_type(img.path))
     except:
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.