Merge branch 'rfc' into rpc-py25

bzr revid: p_christ@hol.gr-20090910082439-zpch1tpf3sutw9f5

bin/addons/base/ir/ir.xml

@@ -114,6 +114,8 @@
                         <field name="padding"/>
                         <field name="number_increment"/>
                         <field name="number_next"/>
+			<field name="weight" />
+			<field name="condition" colspan="4" />
                         <separator colspan="4" string="Legend (for prefix, suffix)"/>
                         <group col="8" colspan="4">
                             <group>

bin/addons/base/ir/ir_sequence.py

@@ -22,6 +22,7 @@
 
 import time
 from osv import fields,osv
+from tools.safe_eval import safe_eval
 import pooler
 
 class ir_sequence_type(osv.osv):
@@ -47,12 +48,15 @@ class ir_sequence(osv.osv):
         'number_next': fields.integer('Next Number', required=True),
         'number_increment': fields.integer('Increment Number', required=True),
         'padding' : fields.integer('Number padding', required=True),
+	'condition': fields.char('Condition', size=250, help="If set, sequence will only be used in case this python expression matches, and will precede other sequences."),
+	'weight': fields.integer('Weight',required=True, help="If two sequences match, the highest weight will be used.")
     }
     _defaults = {
         'active': lambda *a: True,
         'number_increment': lambda *a: 1,
         'number_next': lambda *a: 1,
         'padding' : lambda *a : 0,
+	'weight' : lambda *a: 10,
     }
 
     def _process(self, s):
@@ -71,10 +75,29 @@ class ir_sequence(osv.osv):
         }
 
     def get_id(self, cr, uid, sequence_id, test='id=%s', context=None):
+	if not context:
+		context = {}
         try:
-            cr.execute('SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE '+test+' AND active=%s FOR UPDATE', (sequence_id, True))
-            res = cr.dictfetchone()
-            if res:
+            cr.execute('SELECT id, number_next, prefix, suffix, padding, condition \
+		FROM ir_sequence \
+		WHERE '+test+' AND active=%s ORDER BY weight DESC, length(COALESCE(condition,\'\')) DESC \
+		FOR UPDATE', (sequence_id, True))
+            for res in cr.dictfetchall():
+		if res['condition']:
+			print "ir_seq: %s has condition:" %res['id'], res['condition'], 
+			try:
+			    bo = safe_eval(res['condition'],context)
+			    if not bo:
+				print "not matched"
+				continue
+			except Exception,e:
+				# it would be normal to have exceptions, because
+				# the domain may contain errors
+				print "Exception.\ne:",e
+				print "Context:", context
+				continue
+			print "Matched!"
+
                 cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=%s', (res['id'], True))
                 if res['number_next']:
                     return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
@@ -84,8 +107,8 @@ class ir_sequence(osv.osv):
             cr.commit()
         return False
 
-    def get(self, cr, uid, code):
-        return self.get_id(cr, uid, code, test='code=%s')
+    def get(self, cr, uid, code, context = None):
+        return self.get_id(cr, uid, code, test='code=%s',context=context)
 ir_sequence()
 
 

bin/tools/safe_eval.py

@@ -0,0 +1,66 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
+#
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+###############################################################################
+
+__export_bis = {}
+import sys
+
+def __init_ebis():
+	global __export_bis
+	
+	_evars = [ 'abs', 'all', 'any', 'basestring' , 'bool', 
+		'chr', 'cmp','complex', 'dict', 'divmod', 'enumerate',
+		'float', 'frozenset', 'getattr', 'hasattr', 'hash',
+		'hex', 'id','int', 'iter', 'len', 'list', 'long', 'map', 'max',
+		'min', 'oct', 'ord','pow', 'range', 'reduce', 'repr',
+		'reversed', 'round', 'set', 'setattr', 'slice','sorted', 'str',
+		'sum', 'tuple','type', 'unichr','unicode', 'xrange',
+		'True','False', 'None', 'NotImplemented', 'Ellipsis', ]
+		
+	if sys.version_info[0:2] >= (2,6):
+		_evars.extend(['bin', 'format', 'next'])
+	for v in _evars:
+		__export_bis[v] = __builtins__[v]
+	
+
+__init_ebis()
+
+
+def safe_eval(expr,sglobals,slocals = None):
+	""" A little safer version of eval().
+	    This one, will use fewer builtin functions, so that only
+	    arithmetic and logic expressions can really work """
+	
+	global __export_bis
+
+	if not sglobals.has_key('__builtins__'):
+		# we copy, because we wouldn't want successive calls to safe_eval
+		# to be able to alter the builtins.
+		sglobals['__builtins__'] = __export_bis.copy()
+		
+	return eval(expr,sglobals,slocals)
+	
+#eof