Merge lp:~openerp-dev/openobject-server/trunk-improve-store-set-value-xmo into lp:openobject-server

[Xavier (Open ERP)]

Improvements/internal rejiggerings and refactorings of _store_set_values to make it slightly less unreadable.

Unmerged revisions

4896. By Xavier (Open ERP) on 2013-06-12

[IMP] reduce nesting and attempt to make _store_set_values not unreadable

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2013-06-10 15:06:57 +0000
+++ openerp/osv/orm.py	2013-06-12 14:59:03 +0000
@@ -38,6 +38,7 @@
           - functions
 
 """
+import collections
 
 import babel.dates
 import calendar
@@ -4353,7 +4354,6 @@
             else:
                 tocreate[v] = {'id': vals[self._inherits[v]]}
         (upd0, upd1, upd2) = ('', '', [])
-        upd_todo = []
         unknown_fields = []
         for v in vals.keys():
             if v in self._inherit_fields and v not in self._columns:
@@ -4432,6 +4432,7 @@
 
                 if not edit:
                     vals.pop(field)
+        upd_todo = []
         for field in vals:
             if self._columns[field]._classic_write:
                 upd0 = upd0 + ',"' + field + '"'
@@ -4599,45 +4600,32 @@
            respecting ``multi`` attributes), and stores the resulting values in the database directly."""
         if not ids:
             return True
-        field_flag = False
-        field_dict = {}
+        field_dict = collections.defaultdict(list)
         if self._log_access:
             cr.execute('select id,write_date from '+self._table+' where id IN %s', (tuple(ids),))
-            res = cr.fetchall()
-            for r in res:
-                if r[1]:
-                    field_dict.setdefault(r[0], [])
-                    res_date = time.strptime((r[1])[:19], '%Y-%m-%d %H:%M:%S')
-                    write_date = datetime.datetime.fromtimestamp(time.mktime(res_date))
-                    for i in self.pool._store_function.get(self._name, []):
-                        if i[5]:
-                            up_write_date = write_date + datetime.timedelta(hours=i[5])
-                            if datetime.datetime.now() < up_write_date:
-                                if i[1] in fields:
-                                    field_dict[r[0]].append(i[1])
-                                    if not field_flag:
-                                        field_flag = True
+            for id, write_date in cr.fetchall():
+                if not write_date: continue
+                write_datetime = datetime.datetime.strptime(
+                    write_date[:19], '%Y-%m-%d %H:%M:%S')
+                for i in self.pool._store_function.get(self._name, []):
+                    if not i[5]: continue
+                    up_write_date = write_datetime + datetime.timedelta(hours=i[5])
+                    if i[1] in fields and datetime.datetime.now() < up_write_date:
+                        field_dict[id].append(i[1])
         todo = {}
-        keys = []
         for f in fields:
-            if self._columns[f]._multi not in keys:
-                keys.append(self._columns[f]._multi)
-            todo.setdefault(self._columns[f]._multi, [])
-            todo[self._columns[f]._multi].append(f)
-        for key in keys:
-            val = todo[key]
-            if key:
+            todo.setdefault(self._columns[f]._multi, []).append(f)
+        for multi_group, group_fields in todo.iteritems():
+            if multi_group:
                 # use admin user for accessing objects having rules defined on store fields
-                result = self._columns[val[0]].get(cr, self, ids, val, SUPERUSER_ID, context=context)
+                result = self._columns[group_fields[0]].get(cr, self, ids, group_fields, SUPERUSER_ID, context=context)
                 for id, value in result.items():
-                    if field_flag:
-                        for f in value.keys():
-                            if f in field_dict[id]:
-                                value.pop(f)
+                    value = dict((f, v) for f, v in value.iteritems()
+                                 if f not in field_dict.get(id, ()))
                     upd0 = []
                     upd1 = []
                     for v in value:
-                        if v not in val:
+                        if v not in group_fields:
                             continue
                         if self._columns[v]._type == 'many2one':
                             try:
@@ -4652,22 +4640,23 @@
                             ','.join(upd0) + ' where id = %s', upd1)
 
             else:
-                for f in val:
+                for f in group_fields:
+                    column = self._columns[f]
                     # use admin user for accessing objects having rules defined on store fields
-                    result = self._columns[f].get(cr, self, ids, f, SUPERUSER_ID, context=context)
-                    for r in result.keys():
-                        if field_flag:
-                            if r in field_dict.keys():
-                                if f in field_dict[r]:
-                                    result.pop(r)
-                    for id, value in result.items():
-                        if self._columns[f]._type == 'many2one':
+                    result = column.get(cr, self, ids, f, SUPERUSER_ID, context=context)
+                    result = (
+                        (id, value) for id, value in result.iteritems()
+                        if f not in field_dict.get(id, ())
+                    )
+                    for id, value in result:
+                        if column._type == 'many2one':
                             try:
                                 value = value[0]
                             except:
                                 pass
-                        cr.execute('update "' + self._table + '" set ' + \
-                            '"'+f+'"='+self._columns[f]._symbol_set[0] + ' where id = %s', (self._columns[f]._symbol_set[1](value), id))
+                        cr.execute('UPDATE "%s" SET "%s"=%s WHERE id=%%s' % (
+                            self._table, f, column._symbol_set[0]
+                        ), (column._symbol_set[1](value), id))
         return True
 
     #