Changeset 326:46fe057f2605 for pdw/pd/__init__.py

Timestamp:

03/10/10 12:32:00 (6 months ago)

Author:

acracia

Branch:

default

Message:

[api]to_dict method on the model, tailored to use as input of the api

Files:

• pdw/pd/__init__.py (modified) (5 diffs)

pdw/pd/__init__.py

@@ -58 +58 @@
 
 now = datetime.datetime.now()
+
 def float_date(year, month=0, day=0):
+    '''to convert a date in a float type'''
     return swiss.date.FlexiDate(year, month, day).as_float()
 
@@ -64 +66 @@
     # now dispatch on jurisdiction (+ work type?)
     # note two letter country codes based on ISO 3166
-    # 
+    # need to add 'when' parameter here and deeper 
     if jurisdiction == 'us':
         pd_calculator = CalculatorUnitedStates
@@ -80 +82 @@
     To create a Work object and analize its pd status from a 
     python or json dict
+    @param  params: json formatted string
+    @type   params: string
     '''
-
     params = json.loads(json_data)
     jur = params['jurisdiction'] 
@@ -108 +111 @@
         return "date_pd=%s pd_prob=%s log=%s" % (self.date_pd, self.pd_prob, self.log)
 
+    @classmethod
+    def to_dict(cls, self):
+        '''Creates a dict result to give back as json in the api
+        '''
+        out_dict = { 'confidence': 1-self.uncertainty,
+                    'pd probability': self.pd_prob,
+                    'date pd': self.date_pd,
+                    'log': self.log,
+                   }
+        return out_dict
+#TODO
+
 class CalculatorBase(object):
     """A Public Domain Calculator
@@ -114 +129 @@
     def __init__(self, when):
         self.author_list = None
+        self.death_dates = []
+        self.names = []
         if when:
-          self._now = when
+            self._now = when
         else:
             self._now = float_date(datetime.date.today().year)