fix dumps (may be run client-side or server-side)

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

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 8a23f06..702c182 100644 (file)
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -10,6 +10,7 @@ from sqlalchemy.orm import validates
 from sqlalchemy.ext.declarative import declarative_base
 
 from sfa.util.sfalogging import logger
+from sfa.util.sfatime import utcparse, datetime_to_string
 from sfa.util.xml import XML 
 
 from sfa.trust.gid import GID
@@ -62,7 +63,11 @@ class AlchemyObj:
             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)
-    
+
+    def validate_datetime (self, key, incoming):
+        if isinstance (incoming, datetime):     return incoming
+        elif isinstance (incoming, (int,float)):return datetime.fromtimestamp (incoming)
+
     # 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
@@ -92,35 +97,47 @@ class AlchemyObj:
         else:
             raise Exception, "Invalid format %s" % format
    
+    # 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)
+    # let's be flexible
+    def date_repr (self,fields):
+        if not isinstance(fields,list): fields=[fields]
+        for field in fields:
+            value=getattr(self,field,None)
+            if isinstance (value,datetime): 
+                return datetime_to_string (value)
+            elif isinstance (value,(int,float)):
+                return datetime_to_string(utcparse(value))
+        # fallback
+        return "** undef_datetime **"
+
     def dump_text(self, dump_parents=False):
         # print core fields in this order
-        core_fields = ['hrn', 'type', 'authority', 'gid', 'date_created', 'last_updated']
+        core_fields = [ 'hrn', 'type', 'authority', 'date_created', 'created', 'last_updated', 'gid',  ]
         print "".join(['=' for i in range(40)])
         print "RECORD"
         print "    hrn:", self.hrn
         print "    type:", self.type
         print "    authority:", self.authority
-        date_created = utcparse(datetime_to_string(self.date_created))    
-        print "    date created:", date_created
-        last_updated = utcparse(datetime_to_string(self.last_updated))    
-        print "    last updated:", last_updated
+        print "    date created:", self.date_repr( ['date_created','created'] )
+        print "    last updated:", self.date_repr('last_updated')
         print "    gid:"
-        print "\t\t", self.get_gid_object().dump_string(8, dump_parents)  
+        print self.get_gid_object().dump_string(8, dump_parents)  
         
         # print remaining fields
         for attrib_name in dir(self):
-            # skip core fields
-            if attrib_name in core_fields:
-                continue
-            # skik callables 
             attrib = getattr(self, attrib_name)
-            if callable(attrib):
-                continue
+            # 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)
     
     def dump_simple(self):
-        return "Record(record_id=%s, hrn=%s, type=%s, authority=%s, pointer=%s)" % \
-                (self.record_id, self.hrn, self.type, self.authority, self.pointer)
+        return "%s"%self
       
 #    # only intended for debugging 
 #    def inspect (self, logger, message=""):
@@ -187,6 +204,12 @@ class RegRecord (Base,AlchemyObj):
         elif isinstance(gid, StringTypes):  return gid
         else:                               return gid.save_to_string(save_parents=True)
 
+    @validates ('date_created')
+    def validate_date_created (self, key, incoming): return self.validate_datetime (key, incoming)
+
+    @validates ('last_updated')
+    def validate_last_updated (self, key, incoming): return self.validate_datetime (key, incoming)
+
     # xxx - there might be smarter ways to handle get/set'ing gid using validation hooks 
     def get_gid_object (self):
         if not self.gid: return None