Merge lp:~vauxoo/openobject-server/7.0_field_property_searcheable-dev-hbto into lp:openobject-server

[hbto [Vauxoo] http://www.vauxoo.com]

This proposal tries to solve the problem that arise when trying to
look for property values on models that use them

When searching for property value all records are returned

Unmerged revisions

5117. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-02

[IMP][osv][fields][property] When There is no Default Value and none record
has been set to a value, a search like [('property_field','=',False)] should
return the whole universe of values

5116. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-01

[FIX][osv][fields][property] Changed variable model in the search that
was giving wrong results, mea culpa.

Some improvements have been made to avoid unneed computes

5115. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-01

[IMP][osv][fields][property]
* Operator '!=' is working for m2o fields
This operator was obvious to add

Missing operators to develop 'Set' and 'not set'

5114. By hbto [Vauxoo] http://www.vauxoo.com on 2013-11-01

[IMP][osv][fields][property]
* Operator 'not like' is working for m2o fields
* Records that use Default values are now being taken into account (Ghost Records)

5113. By hbto [Vauxoo] http://www.vauxoo.com on 2013-10-31

[FIX] Getting rid of pdb

5112. By hbto [Vauxoo] http://www.vauxoo.com on 2013-10-31

[IMP][osv][fields]
search has been implemented for this property fields.

'char': 'value_text', #
'float': 'value_float', #
'boolean' : 'value_integer', #
'integer': 'value_integer', #
'text': 'value_text', #
'many2one': 'value_reference', #
'date' : 'value_datetime', #
'datetime' : 'value_datetime', #

5111. By hbto [Vauxoo] http://www.vauxoo.com on 2013-10-30

[IMP][fields][property] We are in the process of converting the whole
property fields from non-searchable by default to searchable by default
It is not going to be easy

It could that we have to manage with a subset of features and not all the
features available as there are for the non-functional fields

As of now, only property many2one fields are searchable, with
operator ['ilike', 'in', '=']

Default values for the property fields are not taken into account

So now it is just working for those property values that are really belonging to
the records they have been assigned.

CAUTION: With this DIFF all your Property fields will become searchable, It means
that you will be able to pick them from Advance Search, Though it does not mean
that your search it's gonna work!!!

This webservice can be usefull to make a Proof of Concept about the
workability of this DIFF

Create a DB, name it 'property', set data demo to True
Copy & Paste the code below,
Change some of the accounts of your partners to an account
different than the one as Default e.g. 'Creditors (test)' or 'Debitors (test)'
run your new webservice.

I Works!!!.

=========================================================================

#!/usr/bin/python
import oerplib
DB = 'property'
oerp = oerplib.OERP(server='localhost',database=DB,port=8069,timeout=4000)
USERS = ['admin']
PSSWS = {}.fromkeys(USERS,'admin')

for USER in USERS:
    oerp.login(user=USER, passwd=PSSWS[USER], database=DB)
    am_ids = oerp.search('res.partner',[
                           '|',
                           ('property_account_payable.type','=','payable'),
                           ('property_account_receivable.type','=','receivable'),
                           ])
    print 'AM IDS ',am_ids

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2013-10-30 10:23:13 +0000
+++ openerp/osv/fields.py	2013-11-02 01:59:41 +0000
@@ -51,6 +51,9 @@
 import simplejson
 from openerp import SUPERUSER_ID
 
+TERM_OPERATORS = ('=', '!=', '<=', '<', '>', '>=', '=?', '=like', '=ilike', 
+                  'like', 'not like', 'ilike', 'not ilike', 'in', 'not in',
+                  'child_of')
 _logger = logging.getLogger(__name__)
 
 def _symbol_set(symb):
@@ -1517,13 +1520,160 @@
             self.field_id[cr.dbname] = res and res[0]
         return self.field_id[cr.dbname]
 
+<<<<<<< TREE
 
     def __init__(self, **args):
+=======
+    def _fnct_search(self, tobj, cr, uid, obj, prop_name, args, context=None):
+        context = context or {}
+        prop = obj.pool.get('ir.property')
+        # get the default values (for res_id = False) for the property fields
+        default_val = self._get_default(obj, cr, uid, prop_name, context)
+
+        res = []
+
+        property_field = obj._all_columns.get(prop_name).column
+        def_id = self._field_get(cr, uid, obj._name, prop_name)
+        company = obj.pool.get('res.company')
+        cid = company._company_default_get(cr, uid, obj._name, def_id,
+                                           context=context)
+        propdef = obj.pool.get('ir.model.fields').browse(cr, uid, def_id,
+                                                         context=context)
+        from_clause = 'ir_property'
+        where = " WHERE " + \
+                "name = '%s' AND "% propdef.name + \
+                "res_id like '%s,%%' AND "% obj._name + \
+                "company_id = %s AND "% cid + \
+                "fields_id = %s AND "% def_id + \
+                "type = '%s'"% self._type
+
+        model_ids = []
+
+        type2field = {
+            'char': 'value_text',               #
+            'float': 'value_float',             #
+            'boolean' : 'value_integer',        #
+            'integer': 'value_integer',         #
+            'text': 'value_text',               #
+            'binary': 'value_binary',
+            'many2one': 'value_reference',      #
+            'date' : 'value_datetime',          #
+            'datetime' : 'value_datetime',      #
+        }
+        ghost = False
+        where_str = ''
+
+        if property_field._type == 'many2one':
+            model_obj = obj.pool.get(property_field._obj)
+            left, operator, right = args[0]
+            args1 = []
+            if operator == '!=' and right == False:
+                args1= [(1,'=',1)]
+            elif operator == '=' and right == False and not default_val:
+                ghost = True
+            elif operator in ('ilike','not ilike','=','!='):
+                args1= [(model_obj._rec_name,operator,right)]
+            elif operator == 'in':
+                args1= [('id',operator,right)]
+            #/!\ By doing this I am forgetting the possible ghosts that could match
+            model_ids = args1 and model_obj.search(cr,uid,args1,context=context) or []
+            if model_ids:
+                ghost = True if default_val and default_val.id in model_ids else False
+                #/!\ This awful query has to be got rid, a better query should arise
+                model_ids = map(lambda x:"'%s,%s'"%(model_obj._name,x),model_ids)
+                model_ids = ",".join(model_ids)
+                where_str += ' AND value_reference IN (%s)'%model_ids
+            else:
+                #/!\ Do not return anything in case that no arguments are passed 
+                #return [('id', '=', 0)]                                                 
+                pass
+
+        elif property_field._type in ('date','datetime'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s = '%s'"%type_right%operator
+            elif operator in ('=like' '=ilike', 'like', 'not like', 'ilike', 'not ilike'):
+                #TODO: NotImplementedYet
+                pass
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+
+        elif property_field._type in ('float', 'boolean', 'integer'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s %%s %d"%type_right%operator
+            elif operator in ('=like' '=ilike', 'like', 'not like', 'ilike', 'not ilike'):
+                #TODO: NotImplementedYet
+                pass
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+        elif property_field._type in ('char', 'text'):
+            left, operator, right = args[0]
+            args1 = []
+            type_right = (type2field.get(property_field._type),right)
+            if operator in ('=','!=','<=','<','>','>=','=?'):
+                where_str += " AND %s = '%s'"%type_right%operator
+            elif operator == '=like':
+                where_str += " AND %s =like '%s%%'"%type_right
+            elif operator == '=ilike':
+                where_str += " AND %s =ilike '%s%%'"%type_right
+            elif operator == 'like':
+                where_str += " AND %s like '%s'"%type_right
+            elif operator == 'not like':
+                where_str += " AND %s not like '%s'"%type_right
+            elif operator == 'ilike':
+                where_str += " AND %s ilike '%s'"%type_right
+            elif operator == 'not ilike':
+                where_str += " AND %s not ilike '%s'"%type_right
+            elif operator in ('in', 'not in', 'child_of'):
+                #TODO: NotImplementedYet
+                pass
+        ghost_ids = []
+        if ghost:
+            # These are all the records from obj which actually have prop_name
+            # set as a real property_field, the other records of obj just have
+            # a 'ghost'
+            query = "SELECT res_id FROM %s"%from_clause + where 
+            cr.execute(query)
+            res = cr.fetchall()
+            res = set(res)
+            res = map(lambda x: int(x[1]), [x[0].split(',') for x in res])
+
+            #This ones are the ghosts
+            ghost_ids = obj.search(cr,uid,[('id','not in',res)],context=context) 
+
+        res = []
+        if where_str:
+            query = "SELECT res_id FROM %s"%from_clause + where + where_str 
+            cr.execute(query)
+            res = cr.fetchall()
+            res = set(res)
+            res = map(lambda x: int(x[1]), [x[0].split(',') for x in res])
+
+        res += ghost_ids
+        if not res:                                                                 
+            return [('id', '=', 0)]                                                 
+        return [('id', 'in', res)]
+
+    def __init__(self, obj_prop, **args):
+        # TODO remove obj_prop parameter (use many2one type)
+>>>>>>> MERGE-SOURCE
         self.field_id = {}
+<<<<<<< TREE
         if 'view_load' in args:
             _logger.warning("view_load attribute is deprecated on ir.fields. Args: %r", args)
         obj = 'relation' in args and args['relation'] or ''
         function.__init__(self, self._fnct_read, False, self._fnct_write, obj=obj, multi='properties', **args)
+=======
+        function.__init__(self, self._fnct_read, False, self._fnct_write,
+                          obj_prop, multi='properties',fnct_search=self._fnct_search, **args)
+>>>>>>> MERGE-SOURCE
 
     def restart(self):
         self.field_id = {}