Changeset 92

Timestamp:

02/04/08 23:12:05 (4 years ago)

Author:

phil

Message:

fixed rdfObject->rdfSubject change in orm.py
added another unit test

Location:

rdfalchemy/trunk/rdfalchemy

Files:

• orm.py (modified) (3 diffs)
• rdfalchemy.py (modified) (1 diff)
• samples/foaf.py (modified) (2 diffs)
• sesame2.py (modified) (1 diff)

rdfalchemy/trunk/rdfalchemy/orm.py

@@ -8 +8 @@
 """
 
-from rdfalchemy import rdfObject, rdflibAbstract
+from rdfalchemy import rdfSubject
+from descriptors import rdflibAbstract
 
 import logging
 log=logging.getLogger('rdfAlchemy')
 
-def allsub(cl):
+def allsub(cl, beenthere = set([])):
     "return all subclasses of the given class"
-    sub = set(cl.__subclasses__())
-    for onesub in cl.__subclasses__():
-        sub |= allsub(onesub)
+    sub = set(cl.__subclasses__()) | beenthere
+    newsubs = set(cl.__subclasses__()) - beenthere
+    for onesub in newsubs:
+        sub |= allsub(onesub, sub)
     return sub
     
@@ -23 +25 @@
 def mapper(*classes):
     """Map the classes given to allow descriptors with ranges to the proper Class of that type
-    default if no args is to map all subclasses(recursivly) of rdfObject
+    default if no args is to map all subclasses(recursivly) of rdfSubject
     
     preforms the mapping
@@ -29 +31 @@
     returns a dict of {rdf_type: mapped_class} for further processing"""
     if not classes:
-        classes = allsub(rdfObject)
+        classes = allsub(rdfSubject)
     class_dict = dict([(str(cl.rdf_type), cl) for cl in classes])
     for cl in classes:  # for each class

rdfalchemy/trunk/rdfalchemy/rdfalchemy.py

@@ -251 +251 @@
             #finally if the object in the triple was a bnode 
             #cascade delete the thing it referenced
-            if isinstance(o,BNode):
+            # ?? FIXME Do we really want to cascade if it's an rdfSubject??
+            if isinstance(o,BNode) or isinstance(o,rdfSubject) and o.node_type == 'bnode':
                 rdfSubject(o)._remove(db=self.db,cascade='bnode')
         

rdfalchemy/trunk/rdfalchemy/samples/foaf.py

@@ -18 +18 @@
     openid = rdflibSingle(FOAF.openid)    
 
+
 class Person(Agent):
     rdf_type = FOAF.Person
@@ -24 +25 @@
     givenname = rdflibSingle(FOAF.givenname,'first')
     surname = rdflibSingle(FOAF.surname,'last')
-    

rdfalchemy/trunk/rdfalchemy/sesame2.py

@@ -1 +1 @@
 from sparql import SPARQLGraph
 
-from rdflib import Graph, Literal, BNode, Namespace, URIRef
+from rdflib import Literal, BNode, Namespace, URIRef
 from rdflib.syntax.parsers.ntriples import NTriplesParser