various fixes

[unfold.git] / trash / sliceview.py

diff --git a/trash/sliceview.py b/trash/sliceview.py
index ee03045..2bec955 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -34,26 +34,23 @@ debug = True
 def slice_view (request, slicename=tmp_default_slice):
     
     page = Page(request)
+    page.expose_js_metadata()
+
 
     # TODO The query to run is embedded in the URL
-    main_query = Query({'action': 'get', 'object': 'slice'}).filter_by('slice_hrn', '=', slicename)
+    main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
 
     # Get default fields from metadata unless specified
     if not main_query.fields:
         md_fields = page.get_metadata()
-        md_fields = md_fields.details_by_subject('slice')
+        md_fields = md_fields.details_by_object('slice')
         if debug:
             print "METADATA", md_fields
         # TODO Get default fields
         main_query.fields = ['slice_hrn', 'resource.hrn', 'resource.hostname', 'resource.type', 'resource.authority']
 
-#old#    main_query = ManifoldQuery (action='get',
-#old#                                subject='resource',
-#old#                                timestamp='latest',
-#old#                                fields=['network','type','hrn','hostname'],
-#old#                                filters= [ [ 'slice_hrn', '=', slicename, ] ],
-#old#                                )
-    page.enqueue_query(main_query)
+    aq = AnalyzedQuery(main_query)
+    page.enqueue_query(main_query, analyzed_query=aq)
 
     # Prepare the display according to all metadata
     # (some parts will be pending, others can be triggered by users).
@@ -86,7 +83,6 @@ def slice_view (request, slicename=tmp_default_slice):
 
     # ... and for the relations
     # XXX Let's hardcode resources for now
-    aq = AnalyzedQuery(main_query)
     sq = aq.subquery('resource')
     
     tab_resources = Tabs (
@@ -98,6 +94,10 @@ def slice_view (request, slicename=tmp_default_slice):
     )
     main_plugin.insert(tab_resources)
 
+    jj = aq.to_json()
+    print "="*80
+    print "AQ=", jj
+    print "="*80
     tab_resources.insert(
         Hazelnut ( 
             page        = page,