9q fix#15

pyren/README.md

@@ -70,18 +70,21 @@ and extract next to directories EcuRenault, Location, Vehicles
 You have to get the next directory tree
 ```
 <any work directory>
+|- _pyren_launcher.py       #(universal launcher)
 |- BVMEXTRACTION            #(need for doc_maker)
 |- DocDB_xx                 #(need for doc_maker where xx=language) 
 |- EcuRenault               #(for CLIP mode)
 |- Location                 #(for CLIP mode)
 |- Vehicles                 #(for CLIP mode)
-|- ecus                     #(for DDT mode)
-|- graphics                 #(for DDT mode optional)
+|- DDT2000data              #(for DDT mode)
+|   |- ecus                 #(for DDT mode)
+|   |- graphics             #(for DDT mode)
+|   |- vehicles             #(for DDT mode)
+|
 |- pyren                    #(pyren)
 |   |- pyren.py
 ...    ...
 |   |- <other modules>
-|- _pyren_launcher.py       #(universal launcher)
 ```
 
 ## Installation on MacOS and Linux

pyren/mod_elm.py

@@ -151,7 +151,7 @@ class Port:
         self.portTimeout = portTimeout
         
         portName = portName.strip ()
-        
+
         if re.match (r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d{1,5}$", portName):
             try:
                 self.ipaddr, self.tcpprt = portName.split (':')
@@ -174,10 +174,10 @@ class Port:
                 self.droid.bluetoothConnect ('00001101-0000-1000-8000-00805F9B34FB')
             except:
                 pass
-            
+
             if len (self.droid.bluetoothActiveConnections ().result) != 0:
                 self.btcid = list (self.droid.bluetoothActiveConnections ().result.keys ())[0]
-        
+
         else:
             self.portName = portName
             self.portType = 0

pyren/mod_mtc.py

@@ -260,17 +260,56 @@ def acf_MTC_and( expr, mtc ):
     interm_res = acf_MTC_finde( ande, mtc )
     result = result and interm_res
 
-  #print "and:", expr, result
+  return result
 
-  return result    
 
-def acf_MTC_compare( expr, mtc ):
+def acf_MTC_or(expr, mtc):
+  ''' expr - expression with AND rules'''
+  ''' mtc - list of options           '''
+  ''' and-operand in MTC expression '''
+
+  result = False
+
+  or_list = expr.split(',')
+  or_list = map(lambda x: x.strip(), or_list)
+
+  for ore in or_list:
+    interm_res = acf_MTC_finde(ore, mtc)
+    result = result or interm_res
+
+    if result:
+      return result
+
+  return result
+
+
+def acf_MTC_compare(expr, mtc):
+  ''' expr - expression with rules'''
+  ''' mtc - list of options       '''
+  ''' this function match MTC-tag with MTC-expression'''
+
+  result = True
+
+  and_list = expr.split('/')
+  and_list = map(lambda x: x.strip(), and_list)
+
+  for ande in and_list:
+    if ',' in ande:
+      interm_res = acf_MTC_or(ande, mtc)
+    else:
+      interm_res = acf_MTC_finde(ande, mtc)
+    result = result and interm_res
+
+  return result
+
+
+def acf_MTC_compare_old( expr, mtc ):
   ''' expr - expression with rules'''
   ''' mtc - list of options       '''
   ''' this function match MTC-tag with MTC-expression'''
   
   result = False
-  
+
   or_list = expr.split(',')
   or_list = map(lambda x:x.strip(),or_list)
 

pyren/mod_term.py

@@ -226,7 +226,7 @@ def optParser():
       default=False,
       action="store_true")
 
-  parser.add_argument("--verbose",
+  parser.add_argument("-vv", "--verbose",
       help="show verbose output (unused)",
       dest="verb",
       default=False,