Changeset 3462 for framework

Timestamp:

04/27/10 11:46:53 (2 years ago)

Author:

elemoine

Message:

allow providing a before_delete callback to Protocol, r=aabt (closes #566)

Files:

• framework/server/trunk/mapfish/lib/protocol.py (modified) (5 diffs)

framework/server/trunk/mapfish/lib/protocol.py

@@ -188 +188 @@
           before_create
             a callback function called before a feature is inserted
-            in the database table, the function receives the request
-            and the feature about to be inserted.
+            in the database table, the function receives the request,
+            the feature read from the GeoJSON document sent in the
+            request, and the database object to be updated. The
+            latter is None if this is is an actual insertion.
 
           before_update
             a callback function called before a feature is updated
+            in the database table, the function receives the request,
+            the feature read from the GeoJSON document sent in the
+            request, and the database object to be updated.
+
+          before_delete
+            a callback function called before a feature is deleted
             in the database table, the function receives the request
-            and the feature about to be updated.
+            and the database object about to be deleted.
     """
 
@@ -208 +216 @@
         if kwargs.has_key('before_update'):
             self.before_update = kwargs['before_update']
+        self.before_delete = None
+        if kwargs.has_key('before_delete'):
+            self.before_delete = kwargs['before_delete']
 
     def _encode(self, objects, request, response):
@@ -343 +354 @@
             create = False
             obj = None
-            if self.before_create is not None:
-                self.before_create(request, feature)
             if isinstance(feature.id, int):
                 obj = self.Session.query(self.mapped_class).get(feature.id)
+            if self.before_create is not None:
+                self.before_create(request, feature, obj)
             if obj is None:
                 obj = self.mapped_class()
@@ -377 +388 @@
             abort(400)
         if self.before_update is not None:
-            self.before_update(request, feature)
+            self.before_update(request, feature, obj)
         obj.geometry = asShape(feature.geometry)
         for key in feature.properties:
@@ -392 +403 @@
         if obj is None:
             abort(404)
+        if self.before_delete is not None:
+            self.before_delete(request, obj)
         self.Session.delete(obj)
         self.Session.commit()