Fix ResultAnalyzerView

diff --git a/tests/test_AnalyzerResult.py b/tests/test_AnalyzerResult.py
index e0dd58dd8cdf347566940e7bce49cf15e4ea33d7..341a7b5e5b8b40417e6d03ab403e7f1bd0089b5f 100755 (executable)
--- a/tests/test_AnalyzerResult.py
+++ b/tests/test_AnalyzerResult.py
@@ -220,7 +220,7 @@ class TestAnalyzerResultJson(TestAnalyzerResult):
         d_json = results.from_json(r_json)
         if verbose:
             print d_json
-            print '%15s' % 'from yaml:',
+            print '%15s' % 'from json:',
 
         #for i in range(len(d_json)):
         self.assertEqual(d_json, results)

diff --git a/timeside/urls.py b/timeside/urls.py
index 6fde09f05ef4a0c46530689af565b1f67840dd83..3f76c3592c014f662bc1564feaf393588c08c41c 100644 (file)
--- a/timeside/urls.py
+++ b/timeside/urls.py
@@ -18,7 +18,8 @@ api_router.register(r'tasks', views.TaskViewSet)
 api_router.register(r'users', views.UserViewSet)
 
 urlpatterns = patterns('',
-    url(r'^$', views.IndexView.as_view(), name="timeside-index"),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include(api_router.urls)),
+    url(r'^$', views.IndexView.as_view(), name="timeside-index"),
+    url(r'^results/(?P<pk>.*)/json/$', views.ResultAnalyzerView.as_view(), name="timeside-result-json"),
 )

diff --git a/timeside/views.py b/timeside/views.py
index 8dd80196adbc9b406cab0810ed23e60932e7978c..e6d0c49ef4bc3fd5afe9e1da7d007d76147bf969 100644 (file)
--- a/timeside/views.py
+++ b/timeside/views.py
@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
+from django.views.generic import *
+from django.http import HttpResponse, HttpResponseRedirect
+
+from rest_framework import viewsets
+
 import timeside
 from timeside.models import *
-from rest_framework import viewsets
-from django.views.generic import *
 from timeside.serializers import *
 
 
-
 class SelectionViewSet(viewsets.ModelViewSet):
     
     model = Selection
@@ -81,15 +83,12 @@ class IndexView(ListView):
         return super(IndexView, self).dispatch(*args, **kwargs)
 
 
-class ResultAnalyzerView(DetailView):
+class ResultAnalyzerView(View):
     
     model = Result
 
-    def results(self):
-        result = self.get_object()
-        results = AnalyzerResult()
-        return results.from_hdf5(result.hdf5).to_json()
-    
-    def get_context_data(self, **kwargs):
-        context = super(ItemJsonAnalyzerView, self).get_context_data(**kwargs)
-        return context
+    def get(self, request, *args, **kwargs):
+        result = Result.objects.get(pk=kwargs['pk'])
+        container = AnalyzerResultContainer()
+        return HttpResponse(container.from_hdf5(result.hdf5.path).to_json(), mimetype='application/json')
+    
\ No newline at end of file