Changeset 6

Timestamp:

11/14/08 10:54:41 (8 weeks ago)

Author:

fcavazza

Message:

a

Location:

gnrpy/gnr

Files:

• core/gnrbag.py (modified) (1 diff)
• sql/gnrsql.py (modified) (2 diffs)
• sql/gnrsqltable.py (modified) (4 diffs)

gnrpy/gnr/core/gnrbag.py

@@ -936 +936 @@
     
 #-------------------- deepcopy ------------------------------- 
+    
     def deepcopy(self):
         """
         This method returns a deep copy of the Bag.
         @return: a deep copy of the Bag.
-        @deprecated: IT DOESN'T WORK
-        """
-        return copy.deepcopy(self)
+        """
+        result = Bag()
+        for node in self:
+            value = node.getStaticValue()
+            if isinstance(value, Bag):
+                value = value.deepcopy()
+            result.setItem(node.label, value, dict(node.getAttr()))
+        return result
     
 #-------------------- getNodeByAttr --------------------------------        

gnrpy/gnr/sql/gnrsql.py

@@ -188 +188 @@
         tblobj.trigger_onInserted(record)
 
-    def update(self, tblobj, record):
+    def update(self, tblobj, record, old_record=old_record):
         """Update a record of the table.
         @param tblobj: the table object
@@ -194 +194 @@
         """
         tblobj._doFieldTriggers('onUpdating', record)
-        tblobj.trigger_onUpdating(record)
+        tblobj.trigger_onUpdating(record, old_record=old_record)
         self.adapter.update(tblobj, record)
-        tblobj.trigger_onUpdated(record)
+        tblobj.trigger_onUpdated(record, old_record=old_record)
         
     def delete(self, tblobj, record):

gnrpy/gnr/sql/gnrsqltable.py

@@ -435 +435 @@
                             relatedTable.delete(relatedTable.record(row['pkey'], mode='bag'))
                     
-    def update(self, record):
+    def update(self, record, old_record=None):
         """This method updates a single record.
         @param record_data: a dictionary that represent the record that must be updated
         """
-        self.db.update(self, record)
+        self.db.update(self, record, old_record=old_record)
 
 
@@ -458 +458 @@
             main_record = main_changeSet
         else:
-            main_record = self.record(pkey, for_update=True, mode='bag')
+            old_record = self.record(pkey, for_update=True, mode='bag')
+            main_record = old_record.deepcopy()
             lastTs = changeSet.getAttr('lastTS')
             changed_TS = lastTs and (lastTs != str(main_record[self.lastTS]))
@@ -494 +495 @@
             self.insert(main_record)
         else:
-            self.update(main_record)
+            self.update(main_record, old_record=old_record)
         
         for rel_name, rel_changeSet in relatedMany.items():
@@ -570 +571 @@
         self.trigger_onUpdated(record)
 
-    def trigger_onUpdating(self, record):
+    def trigger_onUpdating(self, record, old_record=None):
         pass
 
-    def trigger_onUpdated(self, record):
+    def trigger_onUpdated(self, record, old_record=None):
         pass