Skip to content

Fix the error of lang context was not passed in read/search operations #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrsarm wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix the error of lang context was not passed in read/search operations #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a35e4db
[IMP] New features OOOP:
Jul 11, 2011
a96d9ba
[FIX] README crash browser navigators
Dec 17, 2011
b120482
[FIX] If type datetime, we get str, not datetime. Convert str to date…
Jan 11, 2012
5a2f63d
Merge branch 'master' of github.com:zikzakmedia/ooop
Jan 11, 2012
58d4f2e
[FIX] Error on default data form M2O when come with false
Jan 11, 2012
3ad4983
[FIX] m2o name in object
Jan 12, 2012
f6cd98c
[IMP] Create and write context lang (translated fields)
Jan 19, 2012
9ce38bc
[FIX] Write method check ids if list or not
Jan 20, 2012
009e562
[FIX] many2one if not save in dicc
Mar 8, 2012
f05d644
[IMP] Revert last commit
Mar 9, 2012
f7459b5
[FIX] write/unlink if ids is int, change to list
May 4, 2012
f853cfd
Fix lang context was not passed in read/search operations
mrsarm Aug 30, 2012
2bff512
Merge pull request #1 from eoconsulting/master
Sep 18, 2012
4831377
Performance improvements (20% - 80% faster)
mrsarm Dec 3, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Pedro A. Gracia Fajardo <pedro.gracia@impulzia.com>
Gamaliel Toro <argami@impulzia.com>
Raimon Esteve Cusiné <resteve@zikzakmedia.com>
15 changes: 10 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ Connecting to server
>>> o = OOOP(dbname='demo')
</code></pre>

Pyro Protocol
--------------------
1. Install PyRO library (openerp-server and web client).
http://www.xs4all.nl/~irmen/pyro3/
2. Install PyRO Module OpenERP from Nan (thanks this contribution!)
https://launchpad.net/openobject-client-kde
<pre><code>
>>> o = OOOP(user='admin',pwd='admin',dbname='zikzakmedia',uri='localhost',port=8071,protocol='pyro')
</code></pre>


Retrieving all from model
-------------------------
Expand Down Expand Up @@ -185,9 +195,4 @@ but if you want to get deep in the tables just need:
o.ResPartner.export(deep=1)
</code></pre>


The deep param its relative to the model param, deep means how far you want to get with the relations.



<img src="http://github.com/lasarux/ooop/raw/master/artwork/openerp.png" width="350px" height="150px" />
4 changes: 3 additions & 1 deletion examples/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from ooop import OOOP

o = OOOP(dbname="testv6")
#Pyro Demo
#o = OOOP(user='admin',pwd='admin',dbname='zikzakmedia',uri='localhost',port=8071,protocol='pyro')
partners = o.ResPartner.all()
for partner in partners:
print "id: %d, name: %s" % ( partner._ref, partner.name )
print "id: %d, name: %s" % ( partner._ref, partner.name )
119 changes: 96 additions & 23 deletions ooop.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- encoding: utf-8 -*-
# -*- coding: utf-8 -*-
########################################################################
#
# OOOP, OpenObject On Python
Expand Down Expand Up @@ -32,9 +32,15 @@
except:
pydot = False

# check if pyro is installed
try:
import Pyro.core
except:
pyro = False

__author__ = "Pedro Gracia <pedro.gracia@impulzia.com>"
__license__ = "GPLv3+"
__version__ = "0.2.3"
__version__ = "0.2.4"


OOOPMODELS = 'ir.model'
Expand Down Expand Up @@ -111,13 +117,14 @@ def execute(self, *args, **kargs):
class OOOP:
""" Main class to manage xml-rpc comunitacion with openerp-server """
def __init__(self, user='admin', pwd='admin', dbname='openerp',
uri='http://localhost', port=8069, debug=False,
exe=False, active=True, **kwargs):
uri='http://localhost', port=8069, protocol='xmlrpc', debug=False,
exe=False, active=True, lang='en_US', **kwargs):
self.user = user # default: 'admin'
self.pwd = pwd # default: 'admin'
self.dbname = dbname # default: 'openerp'
self.uri = uri
self.port = port
self.protocol = protocol # default: 'xmlrpc'
self.debug = debug
self.exe = exe
self.active = active
Expand All @@ -127,13 +134,18 @@ def __init__(self, user='admin', pwd='admin', dbname='openerp',
self.uid = None
self.models = {}
self.fields = {}
self.proxy = False
self.lang = lang

#has to be uid, cr, parent (the openerp model to get the pool)
if len(kwargs) == 3:
self.uid = kwargs['uid']
self.objectsock = objectsock_mock(kwargs['parent'], kwargs['cr'])
else:
self.connect()
if protocol == 'pyro':
self.connect_pyro()
else:
self.connect()

self.load_models()

Expand All @@ -147,46 +159,92 @@ def login(self, dbname, user, pwd):
self.commonsock = xmlrpclib.ServerProxy('%s:%i/xmlrpc/common' % (self.uri, self.port))
return self.commonsock.login(dbname, user, pwd)

def connect_pyro(self):
"""login and sockets to pyro services: common, object and report"""
url = 'PYROLOC://%s:%s/rpc' % (self.uri,self.port)
self.proxy = Pyro.core.getProxyForURI(url)
self.uid = self.proxy.dispatch( 'common', 'login', self.dbname, self.user, self.pwd)
self.reportsock = False

def execute(self, model, *args):
if self.debug:
print "DEBUG [execute]:", model, args
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, *args)
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, *args)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, *args)
return result

def create(self, model, data):
""" create a new register """
context = {'lang':self.lang}
if self.debug:
print "DEBUG [create]:", model, data
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'create', data)
if 'id' in data:
del data['id']
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'create', data, context)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'create', data, context)
return result

def unlink(self, model, ids):
""" remove register """
if self.debug:
print "DEBUG [unlink]:", model, ids
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'unlink', ids)
if isinstance(ids, int):
ids = [ids]
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'unlink', ids)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'unlink', ids)
return result

def write(self, model, ids, value):
""" update register """
context = {'lang':self.lang}
if self.debug:
print "DEBUG [write]:", model, ids, value
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'write', ids, value)
if isinstance(ids, int):
ids = [ids]
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'write', ids, value, context)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'write', ids, value, context)
return result

def read(self, model, ids, fields=[]):
""" update register """
context = {'lang':self.lang}
if self.debug:
print "DEBUG [read]:", model, ids, fields
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'read', ids, fields)
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'read', ids, fields, context)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'read', ids, fields, context)
return result

def read_all(self, model, fields=[]):
""" update register """
context = {'lang':self.lang}
if self.debug:
print "DEBUG [read_all]:", model, fields
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'read', self.all(model), fields)
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'read', self.all(model), fields, context)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'read', self.all(model), fields, context)
return result

def search(self, model, query):
def search(self, model, query, offset=0, limit=999, order=''):
""" return ids that match with 'query' """
context = {'lang':self.lang}
if self.debug:
print "DEBUG [search]:", model, query
return self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'search', query)
print "DEBUG [search]:", model, query, offset, limit, order
if self.protocol == 'pyro':
result = self.proxy.dispatch( 'object', 'execute', self.dbname, self.uid, self.pwd, model, 'search', query, offset, limit, order, context)
else:
result = self.objectsock.execute(self.dbname, self.uid, self.pwd, model, 'search', query, offset, limit, order, context)
return result

# TODO: verify if remove this
def custom_execute(self, model, ids, remote_method, data):
Expand All @@ -211,7 +269,7 @@ def insert_items(self, model, data):
print 'Warning: %s already in %s model: %s' % (item, model)

def load_models(self):
models = self.read_all(OOOPMODELS)
models = self.read_all(OOOPMODELS, fields=['model'])
for model in models:
self.models[model['model']] = model
self.__dict__[self.normalize_model_name(model['model'])] = Manager(model['model'], self)
Expand Down Expand Up @@ -451,15 +509,27 @@ def all(self, fields=[], offset=0, limit=999999, as_list=False):

def filter(self, fields=[], as_list=False, **kargs):
q = [] # query dict
offset = 0
limit = 999
order = ''
for key, value in kargs.items():
if not '__' in key:
op = '='
else:
if key == 'offset':
if int(value):
offset = value
elif key == 'limit':
if int(value):
limit = value
elif key == 'order':
order = value
elif '__' in key:
i = key.find('__')
op = OPERATORS[key[i+2:]]
key = key[:i]
q.append(('%s' % key, op, value))
ids = self._ooop.search(self._model, q)
q.append(('%s' % key, op, value))
else:
op = '='
q.append(('%s' % key, op, value))
ids = self._ooop.search(self._model, q, offset, limit, order)
if as_list:
return self.read(ids, fields)
return List(self, ids)
Expand Down Expand Up @@ -520,7 +590,10 @@ def __init__(self, manager, ref=None, model=None, copy=False, data=None, fields=
# convert DateTime instance to datetime.datetime object
for i in default_values:
if self.fields[i]['ttype'] == 'datetime':
t = default_values[i].timetuple()
if isinstance(default_values[i], str):
t = datetime.strptime(default_values[i], "%Y-%m-%d %H:%M:%S").timetuple()
else:
t = default_values[i].timetuple()
default_values[i] = datetime(t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec)
# active by default ?
if self._ooop.active:
Expand All @@ -539,7 +612,7 @@ def init_values(self, *args, **kargs):
else:
self.__dict__[name] = List(Manager(relation, self._ooop), data=self, model=relation)
elif ttype == 'many2one':
if name in keys:
if name in keys and kargs[name]:
# manager, ref=None, model=None, copy=False
instance = Data(Manager(relation, self._ooop), kargs[name], relation)
self.INSTANCES['%s:%s' % (relation, kargs[name])] = instance
Expand Down Expand Up @@ -674,7 +747,7 @@ def save(self):
for i in self.__dict__[name]:
self.INSTANCES['%s:%s' % (relation, i._ref)] = i
elif ttype == 'many2one':
if self.__dict__[name]:
if self.__dict__[name] and 'name' in dir(self.__dict__[name]):
data[name] = self.__dict__[name]._ref
# update __name and INSTANCES (cache)
self.__dict__['__%s' % name] = [self.__dict__[name]._ref, self.__dict__[name].name]
Expand Down