Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / storage / record.py

diff --git a/sfa/storage/record.py b/sfa/storage/record.py
index 5c5238e..812efde 100644 (file)
--- a/sfa/storage/record.py
+++ b/sfa/storage/record.py
@@ -14,6 +14,10 @@ class Record:
             xml_dict = xml_record.todict()
             self.load_from_dict(xml_dict)  
 
+
+    def get_field(self, field):
+        return self.__dict__.get(field, None)
+
     # xxx fixme
     # turns out the date_created field is received by the client as a 'created' int
     # (and 'last_updated' does not make it at all)
@@ -29,9 +33,17 @@ class Record:
         # fallback
         return "** undef_datetime **"
     
-    def todict (self):
+    # it may be important to exclude relationships, which fortunately
+    # 
+    def todict (self, exclude_types=[]):
         d=self.__dict__
-        keys=[k for k in d.keys() if not k.startswith('_')]
+        def exclude (k,v):
+            if k.startswith('_'): return True
+            if exclude_types:
+                for exclude_type in exclude_types:
+                    if isinstance (v,exclude_type): return True
+            return False
+        keys=[k for (k,v) in d.items() if not exclude(k,v)]
         return dict ( [ (k,d[k]) for k in keys ] )
     
     def toxml(self):
@@ -47,55 +59,51 @@ class Record:
     # 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
     # a list or a dictionary
-    def xml_fields (self):
+    def fields (self):
         fields = self.__dict__.keys()
         return fields
 
     def save_as_xml (self):
         # xxx not sure about the scope here
-        input_dict = dict( [ (key, getattr(self,key)) for key in self.xml_fields() if getattr(self,key,None) ] )
+        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)
         return xml_record.toxml()
 
-    def dump(self, format=None, dump_parents=False):
+    def dump(self, format=None, dump_parents=False, sort=False):
         if not format:
             format = 'text'
         else:
             format = format.lower()
         if format == 'text':
-            self.dump_text(dump_parents)
+            self.dump_text(dump_parents,sort=sort)
         elif format == 'xml':
-            print self.save_to_string()
+            print self.save_as_xml()
         elif format == 'simple':
             print self.dump_simple()
         else:
             raise Exception, "Invalid format %s" % format
 
-    def dump_text(self, dump_parents=False):
-        # print core fields in this order
-        core_fields = [ 'hrn', 'type', 'authority', 'date_created', 'created', 'last_updated', 'gid',  ]
-        print "".join(['=' for i in range(40)])
+    def dump_text(self, dump_parents=False, sort=False):
+        print 40*'='
         print "RECORD"
-        print "    hrn:", self.hrn
-        print "    type:", self.type
-        print "    authority:", self.authority
-        print "    date created:", self.date_repr( ['date_created','created'] )
-        print "    last updated:", self.date_repr('last_updated')
-        print "    gid:"
-        if self.gid:
-            print GID(self.gid).dump_string(8, dump_parents)    
-
         # print remaining fields
-        for attrib_name in dir(self):
+        fields=self.fields()
+        if sort: fields.sort()
+        for attrib_name in fields:
             attrib = getattr(self, attrib_name)
             # skip internals
             if attrib_name.startswith('_'):     continue
-            # skip core fields
-            if attrib_name in core_fields:      continue
             # skip callables
             if callable (attrib):               continue
-            print "     %s: %s" % (attrib_name, attrib)
+            # handle gid 
+            if attrib_name == 'gid':
+                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))
+            else:
+                print "    %s: %s" % (attrib_name, attrib)
 
     def dump_simple(self):
         return "%s"%self