Re-enable SPARQL query.

lakesuperior/endpoints/query.py

@@ -1,8 +1,9 @@
-from flask import Blueprint, request, render_template
+from flask import Blueprint, current_app, request, render_template
 from rdflib.plugin import PluginException
 
 from lakesuperior.dictionaries.namespaces import ns_mgr as nsm
 from lakesuperior.query import QueryEngine
+from lakesuperior.store_layouts.ldp_rs.lmdb_store import LmdbStore, TxnManager
 
 # Query endpoint. raw SPARQL queries exposing the underlying layout can be made
 # available. Also convenience methods that allow simple lookups based on simple
@@ -47,17 +48,21 @@ def sparql():
     if request.method == 'GET':
         return render_template('sparql_query.html', nsm=nsm)
     else:
-        qres = QueryEngine().sparql_query(request.form['query'])
-        match = request.accept_mimetypes.best_match(accept_mimetypes.keys())
-        if match:
-            enc = accept_mimetypes[match]
-        else:
-            enc = request.accept_mimetypes.best
-
-        try:
-            out = qres.serialize(format=enc)
-        except PluginException:
-            return ('Unable to serialize results into format {}'.format(enc),
+        store = current_app.rdfly.store
+        with TxnManager(store) as txn:
+            qres = QueryEngine().sparql_query(request.form['query'])
+
+            match = request.accept_mimetypes.best_match(accept_mimetypes.keys())
+            if match:
+                enc = accept_mimetypes[match]
+            else:
+                enc = request.accept_mimetypes.best
+
+            try:
+                out = qres.serialize(format=enc)
+            except PluginException:
+                return (
+                    'Unable to serialize results into format {}'.format(enc),
                     406)
 
     return out, 200

lakesuperior/store_layouts/ldp_rs/rsrc_centric_layout.py

@@ -178,16 +178,16 @@ class RsrcCentricLayout:
         '''
         self._logger.info('Deleting all data from the graph store.')
         store = self.ds.store
-        if store.is_txn_open:
+        if getattr(store, 'is_txn_open', False):
             store.rollback()
         store.destroy(store.path)
 
         self._logger.info('Initializing the graph store with system data.')
-        #self.ds.default_context.parse(
-        #        source='data/bootstrap/rsrc_centric_layout.nq', format='nquads')
-        with open('data/bootstrap/rsrc_centric_layout.sparql', 'r') as f:
-            with TxnManager(store, True):
+        store.open(store.path)
+        with TxnManager(store, True):
+            with open('data/bootstrap/rsrc_centric_layout.sparql', 'r') as f:
                 self.ds.update(f.read())
+        store.close()
 
 
     def get_raw(self, uri, ctx):
@@ -248,6 +248,7 @@ class RsrcCentricLayout:
           GRAPH ?g { ?s ?p ?o . }
         ''' + incl_child_qry + '\n}'
 
+        import pdb; pdb.set_trace()
         gr = self._parse_construct(qry, init_bindings={
             'rsrc': nsc['fcres'][uid],
             'ag': nsc['fcadmin'][uid],