X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Frecord.py;h=9622268273d11906aa444efc79518bc293d9b337;hb=ecc85e0b923922cf7117d29b380f5284edb88f21;hp=f3aa8ee9b620f668e0e5939f9f76845f09092cb2;hpb=cedf37c8661ec0b05349274962bf2db9cfa6a24d;p=sfa.git

diff --git a/sfa/storage/record.py b/sfa/storage/record.py
index f3aa8ee9..96222682 100644
--- a/sfa/storage/record.py
+++ b/sfa/storage/record.py
@@ -1,20 +1,23 @@
+from __future__ import print_function
+
 from sfa.util.sfatime import utcparse, datetime_to_string
 from types import StringTypes
 from datetime import datetime
 from sfa.util.xml import XML
 from sfa.trust.gid import GID
 
+from sfa.util.sfalogging import logger
+
 class Record:
 
-    def __init__(self, dict=None, xml=None):
+    def __init__(self, dict=None, xml_str=None):
         if dict:
             self.load_from_dict(dict)
-        elif xml:
-            xml_record = XML(xml)
-            xml_dict = xml_record.todict()
+        elif xml_str:
+            xml = XML(xml_str)
+            xml_dict = xml.todict()
             self.load_from_dict(xml_dict)  
 
-
     def get_field(self, field):
         return self.__dict__.get(field, None)
 
@@ -23,9 +26,10 @@ class Record:
     # (and 'last_updated' does not make it at all)
     # let's be flexible
     def date_repr (self,fields):
-        if not isinstance(fields,list): fields=[fields]
+        if not isinstance(fields,list):
+            fields = [fields]
         for field in fields:
-            value=getattr(self,field,None)
+            value = getattr(self,field,None)
             if isinstance (value,datetime):
                 return datetime_to_string (value)
             elif isinstance (value,(int,float)):
@@ -33,10 +37,18 @@ class Record:
         # fallback
         return "** undef_datetime **"
     
-    def todict (self):
-        d=self.__dict__
-        keys=[k for k in d.keys() if not k.startswith('_')]
-        return dict ( [ (k,d[k]) for k in keys ] )
+    #
+    # need to filter out results, esp. wrt relationships
+    # exclude_types must be a tuple so we can use isinstance
+    # 
+    def record_to_dict (self, exclude_types=None):
+        if exclude_types is None:
+            exclude_types = ()
+        d = self.__dict__
+        def exclude (k, v):
+            return k.startswith('_') or isinstance (v, exclude_types)
+        keys = [ k for k, v in d.items() if not exclude(k, v) ]
+        return { k : d[k] for k in keys }
     
     def toxml(self):
         return self.save_as_xml()
@@ -44,9 +56,11 @@ class Record:
     def load_from_dict (self, d):
         for (k,v) in d.iteritems():
             # experimental
-            if isinstance(v, StringTypes) and v.lower() in ['true']: v=True
-            if isinstance(v, StringTypes) and v.lower() in ['false']: v=False
-            setattr(self,k,v)
+            if isinstance(v, StringTypes) and v.lower() in ['true']:
+                v = True
+            if isinstance(v, StringTypes) and v.lower() in ['false']:
+                v = False
+            setattr(self, k, v)
 
     # in addition we provide convenience for converting to and from xml records
     # for this purpose only, we need the subclasses to define 'fields' as either
@@ -58,8 +72,8 @@ class Record:
     def save_as_xml (self):
         # xxx not sure about the scope here
         input_dict = dict( [ (key, getattr(self,key)) for key in self.fields() if getattr(self,key,None) ] )
-        xml_record=XML("<record />")
-        xml_record.parse_dict (input_dict)
+        xml_record = XML("<record />")
+        xml_record.parse_dict(input_dict)
         return xml_record.toxml()
 
     def dump(self, format=None, dump_parents=False, sort=False):
@@ -70,17 +84,17 @@ class Record:
         if format == 'text':
             self.dump_text(dump_parents,sort=sort)
         elif format == 'xml':
-            print self.save_as_xml()
+            print(self.save_as_xml())
         elif format == 'simple':
-            print self.dump_simple()
+            print(self.dump_simple())
         else:
-            raise Exception, "Invalid format %s" % format
+            raise Exception("Invalid format %s" % format)
 
     def dump_text(self, dump_parents=False, sort=False):
-        print 40*'='
-        print "RECORD"
+        print(40*'=')
+        print("RECORD")
         # print remaining fields
-        fields=self.fields()
+        fields = self.fields()
         if sort: fields.sort()
         for attrib_name in fields:
             attrib = getattr(self, attrib_name)
@@ -90,12 +104,12 @@ class Record:
             if callable (attrib):               continue
             # handle gid 
             if attrib_name == 'gid':
-                print "    gid:"      
-                print GID(attrib).dump_string(8, dump_parents)
+                print("    gid:")      
+                print(GID(string=attrib).dump_string(8, dump_parents))
             elif attrib_name in ['date created', 'last updated']:
-                print "    %s: %s" % (attrib_name, self.date_repr(attrib_name))
+                print("    %s: %s" % (attrib_name, self.date_repr(attrib_name)))
             else:
-                print "    %s: %s" % (attrib_name, attrib)
+                print("    %s: %s" % (attrib_name, attrib))
 
     def dump_simple(self):
         return "%s"%self