Merge lp:~syleam/wms/5.0-multi-scanner into lp:wms

[Christophe CHAUVET]

[Christophe CHAUVET (christophe-chauvet)]

Ok

review: Approve

=== modified file 'wms_scanner/object/scanner.py'
--- wms_scanner/object/scanner.py	2011-08-25 09:01:52 +0000
+++ wms_scanner/object/scanner.py	2011-08-30 15:49:16 +0000
@@ -28,6 +28,7 @@
 import uuid
 import netsvc
 from tools import config
+from threading import Semaphore
 
 logger = netsvc.Logger()
 
@@ -46,8 +47,11 @@
         'title': fields.char('Title', size=256, help='Title for this scenario'),
         'note': fields.text('Note', help='Store different note, date and title for modification, etc...'),
         'resid': fields.char('Reference id', size=64, readonly=True, help="Use by import/export Scenario"),
+        'shared_custom': fields.boolean('Shared Chustom', help="Allows to shared the custom values with a shared scanner in the same warehouse"),
     }
 
+    _order = 'sequence'
+
     _defaults = {
         'title': lambda *a: False,
     }
@@ -56,6 +60,9 @@
         ('resid_uniq', 'unique (resid)', 'The resid of the Step must be unique !'),
     ]
 
+    ## dict to save current semarophe {scenario: {warehouse: {refdoc: instance of semaphore}}}
+    _semaphore = {}
+
     def create(self, cr, uid, values, context=None):
         """
         if the resid not in value, we will create with uuid1
@@ -64,6 +71,28 @@
             values['resid'] = uuid.uuid1()
         return super(ScannerScenario, self).create(cr, uid, values, context=context)
 
+    def _semaphore_acquire(self, cr, uid, id, warehouse_id, ref_doc, context=None):
+        """
+        make an acquire on a semaphore to take one jeton
+        the semaphore is use like a mutex one on one
+        """
+        sem = self._semaphore.get(id, {}).get(warehouse_id, {}).get(ref_doc, None)
+        if not sem:
+            sem = Semaphore()
+            if not self._semaphore.get(id):
+                self._semaphore[id] = {}
+            if not self._semaphore[id].get(warehouse_id):
+                self._semaphore[id][warehouse_id] = {}
+            self._semaphore[id][warehouse_id][ref_doc] = sem
+        sem.acquire()
+
+    def _semaphore_release(self, cr, uid, id, warehouse_id, ref_doc, context=None):
+        """
+        make a release on a semaphore to take one jeton
+        the semaphore is use like a mutex one on one
+        """
+        self._semaphore[id][warehouse_id][ref_doc].release()
+
 ScannerScenario()
 
 
@@ -115,22 +144,29 @@
          'text_val': lambda *a: '',
     }
 
-    def _get_values(self, cr, uid, scenario_id, scanner_id, model='', res_id=None, domain=None, context=None):
+    def _get_domain(self, cr, uid, scenario, scanner, context=None):
+        """
+        create a domain to found custom values.
+        use the fields shared_custom of scenario and scanner
+        """
+        if scenario.shared_custom == True:
+            return [('scenario_id', '=', scenario.id), ('scanner_id.ref_doc', '=', scanner.ref_doc), ('scanner_id.warehouse_id', '=', scanner.warehouse_id.id)]
+        return [('scenario_id', '=', scenario.id), ('scanner_id', '=', scanner.id)]
+
+    def _get_values(self, cr, uid, scenario, scanner, model='', res_id=None, domain=None, context=None):
         """
         return read customs line
         @param domain : list of tuple for search method
         """
         if domain is None:
-            domain = [('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)]
+            domain = self._get_domain(cr, uid, scenario, scanner, context=context)
         else:
-            domain.extend([('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)])
+            domain.extend(self._get_domain(cr, uid, scenario, scanner, context=context))
         if model:
             domain.append(('model', '=', model))
         if res_id:
             domain.append(('res_id', '=', res_id))
-        print domain
         ids = self.search(cr, uid, domain, context=context)
-        print ids
         if ids:
             return self.read(cr, uid, ids, [], context=context)
         return []
@@ -151,15 +187,21 @@
             pass
         return self.write(cr, uid, ids, vals, context=context)
 
-    def _remove_values(self, cr, uid, scenario_id, scanner_id, context=None):
+    def _remove_values(self, cr, uid, scenario, scanner, context=None):
         """
         Unlink all the line link we one scenarii and one scanner
         """
-        domain = [('scenario_id', '=', scenario_id), ('scanner_id', '=', scanner_id)]
+        domain = []
+        scanner_ids = []
+        if scenario.shared_custom == True:
+            scanner_ids = self.pool.get('scanner.hardware').search(cr, uid, [('scenario_id', '=', scenario.id), ('warehouse_id', '=', scanner.warehouse_id.id), ('ref_doc', '=', scanner.ref_doc), ('id', '!=', scanner.id)], context=context)
+        domain = [('scenario_id', '=', scenario.id), ('scanner_id', '=', scanner.id)]
         ids = self.search(cr, uid, domain, context=context)
-        if ids:
+        if scanner_ids:
+            return self.write(cr, uid, ids, {'scanner_id': scanner_ids[0]}, context=context)
+        else:
             return self.unlink(cr, uid, ids, context=context)
-        return True
+
 
 ScannerScenarioCustom()
 
@@ -311,7 +353,6 @@
             r = self._scenario_save(cr, uid, term.id, message, etype)
             return r
         elif action == 'action' and term.scenario_id:
-            logger.notifyChannel('wms_scanner', netsvc.LOG_INFO, '[%s] Action : %s (%s)' % (numterm, message, term.scenario_id.name))
             r = self._scenario_save(cr, uid, term.id, message, etype, term.scenario_id.id, term.step_id.id, term.ref_doc)
             return r
 
@@ -329,9 +370,9 @@
         because if we want reset term when error we must use sql querry, it is bad in production
         """
         custom_obj = self.pool.get('scanner.scenario.custom')
-        for read in self.read(cr, uid, ids, ['scenario_id'], context=context):
-            if read.get('scenario_id'):
-                custom_obj._remove_values(cr, uid, read['scenario_id'][0], read['id'], context=context)
+        for scanner in self.browse(cr, uid, ids, context=context):
+            if scanner.scenario_id and scanner.scenario_id.id:
+                custom_obj._remove_values(cr, uid, scanner.scenario_id, scanner, context=context)
         self.write(cr, uid, ids, {'scenario_id': False, 'step_id': False, 'ref_doc': 0, 'tmp_val1': '', 'tmp_val2': '', 'tmp_val3': '', 'tmp_val4': '', 'tmp_val5': ''}, context=context)
         return True
 
@@ -432,7 +473,9 @@
                 return ('U', ['Please contact', 'your', 'administrator'], 0)
 
         self._memorize(cr, uid, term_id, scenario_id, step_id, cur_obj, context)
-
+        # MUTEXT
+        t = term.browse(cr, uid, term_id, context=context)
+        scenario._semaphore_acquire(cr, uid, t.scenario_id.id, t.warehouse_id.id, t.ref_doc, context=context)
         # execute the step and return the result
         stp = step.browse(cr, uid, step_id, context=context)
         logger.notifyChannel('wms_scanner', netsvc.LOG_INFO, 'Model: %s' % stp.scenario_id.model_id.model)
@@ -445,7 +488,7 @@
             'term': term,
             'context': context,
             'm': message,
-            't': term.browse(cr, uid, term_id, context=context),
+            't': t,
             'tracer': tracer,
             'wkf': netsvc.LocalService('workflow'),
             'scenario': self.pool.get('scanner.scenario').browse(cr, uid, scenario_id, context=context),
@@ -456,11 +499,12 @@
                 self.empty_scanner_values(cr, uid, [term_id], context=context)
         except osv.except_osv, e:
             logger.notifyChannel('wms_scanner', netsvc.LOG_WARNING, 'OSV Exception: %s' % str(e))
-            return ('U', ['Please contact', 'your', 'administrator'], 0)
+            ld.update({'act': 'U', 'res': ['Please contact', 'your', 'administrator'], 'val': 0})
         except Exception, e:
             logger.notifyChannel('wms_scanner', netsvc.LOG_WARNING, 'Exception: %s' % str(e))
-            return ('U', ['Please contact', 'your', 'administrator'], 0)
-
+            ld.update({'act': 'U', 'res': ['Please contact', 'your', 'administrator'], 'val': 0})
+        finally:
+            scenario._semaphore_release(cr, uid, t.scenario_id.id, t.warehouse_id.id, t.ref_doc, context=context)
         return (ld.get('act', 'M'), ld.get('res', ['nothing']), ld.get('val', 0))
 
     def _scenario_list(self, cr, uid, warehouse_id):

=== modified file 'wms_scanner/scripts/import_scenario.py'
--- wms_scanner/scripts/import_scenario.py	2011-07-28 07:51:17 +0000
+++ wms_scanner/scripts/import_scenario.py	2011-08-30 15:49:16 +0000
@@ -100,6 +100,8 @@
         warehouse_ids = warehouse_obj.search([('name', '=', node.text)], 0, None, None, {'active_test': False})
         if warehouse_ids:
             scen_vals['warehouse_ids'].append((4, warehouse_ids[0]))
+    elif node.tag == 'shared_custom':
+        scen_vals[node.tag] = eval(node.text) or False
     else:
         scen_vals[node.tag] = node.text or False
 scen_vals['model_id'] = model_obj.search([('model', '=', scen_vals['model_id'])], 0, None, None, {'active_test': False}) or False

=== modified file 'wms_scanner/view/scanner.xml'
--- wms_scanner/view/scanner.xml	2011-08-23 07:27:37 +0000
+++ wms_scanner/view/scanner.xml	2011-08-30 15:49:16 +0000
@@ -111,6 +111,7 @@
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="title"/>
+                    <field name="shared_custom"/>
                 </tree>
             </field>
         </record>
@@ -126,7 +127,10 @@
                     <field name="active" select="2"/>
                     <field name="sequence"/>
                     <field name="model_id"/>
-                    <field name="title" colspan="4"/>
+                    <group colspan="4">
+                    <field name="title" colspan="3"/>
+                    <field name="shared_custom" colspan="1" select="2"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Steps">
                             <field name="step_ids" nolabel="1" mode="tree,form">