Recurse stepwise into children when purging resource.

lakesuperior/endpoints/ldp.py

@@ -66,6 +66,8 @@ vw_blacklist = {
     nsc['fcsystem'].contains,
 }
 
+
+
 @ldp.url_defaults
 def bp_url_defaults(endpoint, values):
     url_prefix = getattr(g, 'url_prefix', None)
@@ -84,7 +86,8 @@ def log_request_start():
 
 
 @ldp.before_request
-def instantiate_toolbox():
+def instantiate_req_vars():
+    g.store = current_app.rdfly.store
     g.tbox = Toolbox()
 
 
@@ -218,7 +221,6 @@ def get_resource(uid, force_rdf=False):
 @ldp.route('/<path:parent>', methods=['POST'], strict_slashes=False)
 @ldp.route('/', defaults={'parent': ''}, methods=['POST'],
         strict_slashes=False)
-@transaction(True)
 def post_resource(parent):
     '''
     Add a new resource in a new URI.
@@ -234,21 +236,20 @@ def post_resource(parent):
     stream, mimetype = bitstream_from_req()
 
     try:
-        uid = uuid_for_post(parent, slug)
-        logger.debug('Generated UID for POST: {}'.format(uid))
-        rsrc = LdpFactory.from_provided(
-                uid, content_length=request.content_length,
-                stream=stream, mimetype=mimetype, handling=handling,
-                disposition=disposition)
+        with TxnManager(g.store, True):
+            uid = uuid_for_post(parent, slug)
+            logger.debug('Generated UID for POST: {}'.format(uid))
+            rsrc = LdpFactory.from_provided(
+                    uid, content_length=request.content_length,
+                    stream=stream, mimetype=mimetype, handling=handling,
+                    disposition=disposition)
+            rsrc.post()
     except ResourceNotExistsError as e:
         return str(e), 404
     except InvalidResourceError as e:
         return str(e), 409
     except TombstoneError as e:
         return _tombstone_response(e, uid)
-
-    try:
-        rsrc.post()
     except ServerManagedTermError as e:
         return str(e), 412
 

lakesuperior/store_layouts/ldp_rs/rsrc_centric_layout.py

@@ -291,16 +291,14 @@ class RsrcCentricLayout:
         if ver_uid:
             uid = self.snapshot_uid(uid, ver_uid)
         gr = self.ds.graph(nsc['fcadmin'][uid]) | Graph()
+        uri = nsc['fcres'][uid]
         if not len(gr):
             # If no resource is found, search in pairtree graph.
-            try:
-                gr = self.ds.graph(PTREE_GR_URI).query(
-                        'CONSTRUCT WHERE {?s ?p ?o}',
-                        initBindings={'s': nsc['fcres'][uid]}).graph
-            except ResultException:
-                gr = Graph()
+            gr = Graph()
+            for p, o in self.ds.graph(PTREE_GR_URI)[uri : : ]:
+                gr.add(uri, p, o)
 
-        rsrc = Resource(gr, nsc['fcres'][uid])
+        rsrc = Resource(gr, uri)
         if strict:
             self._check_rsrc_status(rsrc)
 
@@ -364,7 +362,7 @@ class RsrcCentricLayout:
         )
 
 
-    def get_descendants(self, uid, path_segments=False):
+    def get_descendants(self, uid, recurse=True, path_segments=False):
         '''
         Get descendants (recursive children) of a resource.
 
@@ -377,20 +375,25 @@ class RsrcCentricLayout:
         ds = self.ds
         subj_uri = nsc['fcres'][uid]
         ctx_uri = nsc['fcstruct'][uid]
-        def recurse(dset, s, p, c):
+        def _recurse(dset, s, p, c):
             new_dset = set(ds.graph(c)[s : p])
             for ss in new_dset:
                 dset.add(ss)
                 cc = URIRef(ss.replace(nsc['fcres'], nsc['fcstruct']))
                 if set(ds.graph(cc)[ss : p]):
-                    recurse(dset, ss, p, cc)
+                    _recurse(dset, ss, p, cc)
             return dset
 
-        children = recurse(set(), subj_uri, nsc['ldp'].contains, ctx_uri)
+        children = (
+            _recurse(set(), subj_uri, nsc['ldp'].contains, ctx_uri)
+            if recurse
+            else ds.graph(ctx_uri)[subj_uri : nsc['ldp'].contains : ])
         if path_segments:
-            psegs = set(recurse(
-                set(), subj_uri, nsc['fcsystem'].contains, ctx_uri))
-            return set(children) | psegs
+            psegs = (
+                _recurse(set(), subj_uri, nsc['fcsystem'].contains, ctx_uri)
+                if recurse
+                else ds.graph(ctx_uri)[subj_uri : nsc['fcsystem'].contains : ])
+            return chain(children, psegs)
         else:
             return children
 
@@ -432,14 +435,13 @@ class RsrcCentricLayout:
         # remove children.
         if children:
             self._logger.debug('Purging children for /{}'.format(uid))
-            for rsrc_uri in self.get_descendants(uid, True):
+            for rsrc_uri in self.get_descendants(uid, False, True):
                 self.purge_rsrc(uid_fn(rsrc_uri), inbound, False)
             # Remove structure graph.
             self.ds.remove_graph(nsc['fcstruct'][uid])
 
         # Remove inbound references.
         if inbound:
-            #import pdb; pdb.set_trace()
             for ibs in self.get_inbound_rel(uri):
                 self.ds.remove(ibs)