Changeset 85

Timestamp:

01/22/08 18:05:47 (4 years ago)

Author:

phil

Message:

added set with an rdfObject on the lhs

Location:

rdfalchemy/trunk/rdfalchemy

Files:

• orm.py (modified) (2 diffs)
• rdfalchemy.py (modified) (3 diffs)

rdfalchemy/trunk/rdfalchemy/orm.py

@@ -14 +14 @@
 
 def allsub(cl):
+    "return all subclasses of the given class"
     sub = set(cl.__subclasses__())
     for onesub in cl.__subclasses__():
         sub |= allsub(onesub)
     return sub
+    
 
 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 rdfObject
+    
+    preforms the mapping
+    
+    returns a dict of {rdf_type: mapped_class} for further processing"""
     if not classes:
         classes = allsub(rdfObject)
@@ -32 +38 @@
                 except KeyError:
                     log.warn("No Class Found\nFailed to map %s range of %s"%(v,v.range_type))
-                    
+    return class_dict
+
+#def mapBase(baseclass):
+#    """This maps all classes below baseclass as in mapper()
+#    AND puts the dict of {rdf_type: mapped_class}  in an baseclass.type2class attribute"""
+#    baseclass.type2class = mapper(allsub(baseclass))
+    

rdfalchemy/trunk/rdfalchemy/rdfalchemy.py

@@ -41 +41 @@
 formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
 console.setFormatter(formatter)
-log=logging.getLogger('rdfAlchemy')
+log=logging.getLogger('rdfalchemy')
 ##log.setLevel(logging.DEBUG)
 log.addHandler(console)
@@ -146 +146 @@
         if isinstance(value,Literal) or isinstance(value,URIRef) or isinstance(value,BNode):
             o = value
+        elif isinstance(value,rdfObject):
+            o = value.resUri
         elif isinstance(value,str) or isinstance(value,unicode):
             o = Literal(value,)
@@ -304 +306 @@
         
     def __repr__(self):
-        return "<%s -> %s>"%(self.__class__, self.resUri)
+        return "<%s: %s>"%(self.__class__.__name__, self.n3())
 
     def __getitem__(self, pred):