From 1edbe9e3403f8c4095bffbc800f48cc411670442 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Thu, 5 Apr 2012 20:20:08 -0500
Subject: [PATCH] db.table._archive_records()

---
 VERSION        |  2 +-
 gluon/dal.py   | 34 ++++++++++++++++++++++++++++++++++
 gluon/tools.py | 36 ++++++------------------------------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/VERSION b/VERSION
index b8f3b7d1..5a47785b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-04-05 19:09:40) dev
+Version 1.99.7 (2012-04-05 20:19:10) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index 7008ae70..d8872cc4 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6947,6 +6947,30 @@ class Table(dict):
     def update(self,*args,**kwargs):
         raise RuntimeError, "Syntax Not Supported"
 
+    def _archive_records(self,
+                         archive_db=None,
+                         archive_name = '%(tablename)_archive',
+                         current_record = 'current_record'):
+        archive_db = archive_db or self._db
+        fieldnames = self.fields()
+        archive_name = archive_name % dict(tablename=self._tablename)
+        if 'modified_by' in fieldnames and 'modified_on' in fieldnames:
+            archive_table = archive_db.define_table(
+                archive_name,
+                Field(current_record,self),
+                self)
+            self._before_update.append(
+                lambda qset,fs,at=archive_table,cn=current_record:
+                    archive_record(qset,fs,at,cn))
+        if 'is_active' in fieldnames:
+            self._before_delete.append(
+                lambda qset: qset.update(is_active=False))
+            newquery = lambda query, t=self: t.is_active == True
+            query = self._common_filter
+            if query:
+                newquery = query & newquery
+            self._common_filter = newquery
+                
     def _validate(self,**vars):
         errors = Row()
         for key,value in vars.items():
@@ -7281,6 +7305,16 @@ class Table(dict):
     def on(self, query):
         return Expression(self._db,self._db._adapter.ON,self,query)
 
+def archive_record(qset,fs,archive_table,current_record):
+    tablenames = qset.db._adapter.tables(qset.query)
+    if len(tablenames)!=1: raise RuntimeError, "cannot update join"
+    table = qset.db[tablenames[0]]
+    for row in qset.select():
+        fields = archive_table._filter_fields(row)
+        fields[current_record] = row.id
+        archive_table.insert(**fields)
+    return False
+        
 
 
 class Expression(object):
diff --git a/gluon/tools.py b/gluon/tools.py
index 4b060959..0af4f907 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1260,7 +1260,7 @@ class Auth(object):
     def enable_record_versioning(self, 
                                  tables,
                                  archive_db = None,
-                                 archive_names='%s_archive',
+                                 archive_names='%(tablename)s_archive',
                                  current_record='current_record'):
         """
         to enable full record vernionioning (including auth tables):
@@ -1288,36 +1288,12 @@ class Auth(object):
         does automatically.
 
         """
-        def archive(qset,fs,archive_table,current_name):
-            tablenames = qset.db._adapter.tables(qset.query)
-            if len(tablenames)!=1: raise RuntimeError, "cannot update join"
-            table = qset.db[tablenames[0]]
-            for row in qset.select():
-                fields = archive_table._filter_fields(row)
-                fields[current_record] = row.id
-                archive_table.insert(**fields)
-            
-        archive_db = archive_db or self.db
         tables = [table for table in tables]
-        for table in tables:
-            fieldnames = table.fields()            
-            if 'modified_by' in fieldnames and 'modified_on' in fieldnames:
-                archive_name = archive_names % table._tablename
-                archive_table = archive_db.define_table(
-                    archive_name,
-                    Field(current_record,table),
-                    table)
-                table._before_update.append(
-                    lambda qset,fs,at=archive_table,cn=current_record:
-                        archive(qset,fs,at,cn))
-            if 'is_active' in fieldnames:
-                table._before_delete.append(
-                    lambda qset: qset.update(is_active=False))
-                newquery = lambda query, t=table: t.is_active == True
-                query = table._common_filter
-                if query:
-                    newquery = query & newquery
-                table._common_filter = newquery
+        for table in tables: 
+            table._archive_records(
+                archive_db = archive_db,
+                archive_name = archive_names,
+                current_record = current_record)
                 
     def define_tables(self, username=False, signature=None, 
                       migrate=True, fake_migrate=False):