In configure we do not need to set_config()

[cascardo/ipsilon.git] / ipsilon / util / trans.py

diff --git a/ipsilon/util/trans.py b/ipsilon/util/trans.py
index 4d2f887..05d538e 100755 (executable)
--- a/ipsilon/util/trans.py
+++ b/ipsilon/util/trans.py
@@ -15,7 +15,6 @@ TRANSID = "ipsilon_transaction_id"
 class Transaction(Log):
 
     def __init__(self, provider, **kwargs):
-        self.debug('Transaction: %s' % repr(kwargs))
         self.provider = provider
         self.transaction_id = None
         self._ts = TranStore()
@@ -23,14 +22,17 @@ class Transaction(Log):
         tid = kwargs.get(TRANSID)
         if tid:
             self.transaction_id = tid
-            data = self._ts.get_unique_data(TRANSTABLE, tid)
-            self._get_cookie()
+            data = self.retrieve()
+            if data and 'provider' in data:
+                self.provider = data['provider']
+            self._get_cookie(data)
         else:
             data = {'provider': self.provider,
                     'origintime': str(datetime.now())}
             self.transaction_id = self._ts.new_unique_data(TRANSTABLE, data)
             self._set_cookie()
-        self.debug('Transaction id: %s' % self.transaction_id)
+        self.debug('Transaction: %s %s' % (self.provider,
+                                           self.transaction_id))
 
     def _set_cookie(self):
         self.cookie = SecureCookie(name=None, value=self.provider)
@@ -39,9 +41,10 @@ class Transaction(Log):
         data = {self.transaction_id: cookiedata}
         self._ts.save_unique_data(TRANSTABLE, data)
 
-    def _get_cookie(self):
-        data = self.retrieve()
-        if 'cookie' not in data:
+    def _get_cookie(self, data=None):
+        if data is None:
+            data = self.retrieve()
+        if data is None or 'cookie' not in data:
             raise ValueError('Cookie name not available')
         self.cookie = SecureCookie(data['cookie'])
         self.cookie.receive()
@@ -49,7 +52,8 @@ class Transaction(Log):
             raise ValueError('Missing or invalid cookie')
 
     def _del_cookie(self):
-        self.cookie.delete()
+        if self.cookie:
+            self.cookie.delete()
 
     def wipe(self):
         if not self.transaction_id:
@@ -65,7 +69,7 @@ class Transaction(Log):
     def retrieve(self):
         data = self._ts.get_unique_data(TRANSTABLE,
                                         uuidval=self.transaction_id)
-        return data.get(self.transaction_id)
+        return data.get(self.transaction_id) or dict()
 
     def get_GET_arg(self):
         return "%s=%s" % (TRANSID, self.transaction_id)