From 0b71166a9ee1c915ed04bfae92c9393e4ab215cf Mon Sep 17 00:00:00 2001
From: shrlnm <mshkn@inbox.ru>
Date: Tue, 24 Sep 2019 22:32:19 +0300
Subject: [PATCH] dfg fix

---
 pyren/doc_maker.py | 23 ++++++++++++++++-------
 pyren/mod_dfg.py   |  7 ++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/pyren/doc_maker.py b/pyren/doc_maker.py
index 2d0b6f3..95c15bc 100755
--- a/pyren/doc_maker.py
+++ b/pyren/doc_maker.py
@@ -703,7 +703,7 @@ def main():
   '''Main function
   
 1) if ../BVMEXTRACTION doesn't exist then  mod_globals.opt_demo=True which means that we would not guide with MTC 
-   and woudl show all aptions
+   and will show all options
 2) if not demo mode and savedVIN.txt exists and not scan then check savedVIN.txt 
    else getVIN 
 3) if len(vin)==0 then demo mode  
@@ -829,17 +829,26 @@ def main():
   #choose and load DFG
   dfg = class_dfg( platform )
 
-  if os.path.isfile(dfg.cacheFile):                   #if cache exists
-    dfg = pickle.load( open( dfg.cacheFile, "rb" ) )    #load it
-  else:                                               #else
-    dfg.loadDFG()                                       #load file
-    #pickle.dump( dfg, open( dfg.cacheFile, "wb" ) )     #and save cache
+  if dfg.tcom == '146':
+    dfg.tcom = '159'
+    dfg.dfgFile = dfg.dfgFile.replace('DFG_146', 'DFG_159')
+  elif dfg.tcom == '135':
+    dfg.tcom = '147'
+    dfg.dfgFile = dfg.dfgFile.replace('DFG_135', 'DFG_147')
+
+  dfg.loadDFG()
+
+  #if os.path.isfile(dfg.cacheFile):                   #if cache exists
+  #  dfg = pickle.load( open( dfg.cacheFile, "rb" ) )    #load it
+  #else:                                               #else
+  #  dfg.loadDFG()                                       #load file
+  #  pickle.dump( dfg, open( dfg.cacheFile, "wb" ) )     #and save cache
     
   dfg_ds = dfg.dataSet  
     
   #dfg.showMenu(zipf) 
   #try:
-  if dfg.tcom == '135' : dfg.tcom = '147'
+  #if dfg.tcom == '135' : dfg.tcom = '147'
   generateHTML( "../DocDB_"+mod_globals.opt_lang+"/DocDb"+dfg.tcom+"/SIE/", mtcdata.split(';'), VIN, dfg, date_madc)
   #except:
   #  pass
diff --git a/pyren/mod_dfg.py b/pyren/mod_dfg.py
index c1f7fe2..03a253e 100755
--- a/pyren/mod_dfg.py
+++ b/pyren/mod_dfg.py
@@ -65,7 +65,7 @@ class class_dfg:
           vehTypeCode = vh.getAttribute("vehTypeCode")
           if vehTypeCode.upper()==platform.upper():
             self.tcom = TCOM
-            break;
+            break
       self.dfgFile = '../Vehicles/DFG/DFG_'+self.tcom+'.Xml'
     else:
       vhcls = []
@@ -95,8 +95,9 @@ class class_dfg:
     try:
       DOMTree = xml.dom.minidom.parse(self.dfgFile)
     except:
-      if 'DFG_135' in self.dfgFile:
-        self.dfgFile = self.dfgFile.replace('DFG_135', 'DFG_147')
+      print "ERROR loading dfg-file"
+      #if 'DFG_135' in self.dfgFile:
+      #  self.dfgFile = self.dfgFile.replace('DFG_135', 'DFG_147')
 
     fs = DOMTree.documentElement #functionsStructure