diff --git a/gracedb/api.py b/gracedb/api.py index d0cb5089b33573f7fa3ecb16e5a4e488dfab72e5..ced47a2a8191d10ad59f12551832f5b63b4b43c1 100644 --- a/gracedb/api.py +++ b/gracedb/api.py @@ -601,16 +601,18 @@ def tagToDict(tag, columns=None, request=None, event=None, n=None): request=request) } else: - # Links to all events that have this tag. - rv['links'] = { - "events" : [reverse("event-detail", - args=[event.graceid()], - request=request) - for event in tag.getEvents()], - "self" : reverse("tag-detail", - args=[tag.name], - request=request) - } + # XXX Unclear what the tag detail resource should be at this level. + # For now, return an empty list. + pass +# rv['links'] = { +# "events" : [reverse("event-detail", +# args=[event.graceid()], +# request=request) +# for event in tag.getEvents()], +# "self" : reverse("tag-detail", +# args=[tag.name], +# request=request) +# } return rv class TagList(APIView): @@ -628,19 +630,20 @@ class TagList(APIView): } return Response(rv) -class TagDetail(APIView): - """Tag Detail Resource - """ - authentication_classes = (LigoAuthentication,) - permission_classes = (IsAuthenticated,) - - def get(self, request, tagname): - try: - tag = Tag.objects.filter(name=tagname)[0] - except Tag.DoesNotExist: - return Response("Tag not found.", - status=status.HTTP_404_NOT_FOUND) - return Response(tagToDict(tag,request=request)) +# XXX Unclear what the tag detail resource should be. +# class TagDetail(APIView): +# """Tag Detail Resource +# """ +# authentication_classes = (LigoAuthentication,) +# permission_classes = (IsAuthenticated,) +# +# def get(self, request, tagname): +# try: +# tag = Tag.objects.filter(name=tagname)[0] +# except Tag.DoesNotExist: +# return Response("Tag not found.", +# status=status.HTTP_404_NOT_FOUND) +# return Response(tagToDict(tag,request=request)) class EventTagList(APIView): """Event Tag List Resource diff --git a/gracedb/models.py b/gracedb/models.py index 2e33a9737f536c5dacffb40b32727cda0e6054ca..31329835c838526d0f20e2c003230c167d3fea28 100644 --- a/gracedb/models.py +++ b/gracedb/models.py @@ -283,13 +283,13 @@ class Tag(models.Model): else: return self.name - def getEvents(self): - # XXX Any way of doing this with filters? - # We would need to filter for a non-null intersection of the - # set of log messages in the event with the set of log - # messages in the tag. - eventlist = [log.event for log in self.eventlogs.all()] - return list(set(eventlist)) +# def getEvents(self): +# # XXX Any way of doing this with filters? +# # We would need to filter for a non-null intersection of the +# # set of log messages in the event with the set of log +# # messages in the tag. +# eventlist = [log.event for log in self.eventlogs.all()] +# return list(set(eventlist)) ## XXX Get rid of the slots. Probably. diff --git a/gracedb/urls_rest.py b/gracedb/urls_rest.py index 804298351e7b16103bc3c5c0f7ed78caa5fc00c0..ed981d906a133408b73da02f36f5d677d477614a 100644 --- a/gracedb/urls_rest.py +++ b/gracedb/urls_rest.py @@ -33,8 +33,9 @@ urlpatterns = patterns('gracedb.api', # Tag Resources url (r'^tag/$', TagList.as_view(), name='tag-list'), - url (r'^tag/(?P<tagname>\w+)$', - TagDetail.as_view(), name='tag-detail'), + # XXX unclear what the tag detail resource should be. + #url (r'^tag/(?P<tagname>\w+)$', + # TagDetail.as_view(), name='tag-detail'), url (r'events/(?P<graceid>[GEHT]\d+)/tag/$', EventTagList.as_view(), name='eventtag-list'), url (r'events/(?P<graceid>[GEHT]\d+)/tag/(?P<tagname>\w+)$',