tza/pyren
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dfg fix

Browse Source
This commit is contained in:
shrlnm 2019-09-24 22:32:19 +03:00
parent aae01f6ac5
commit 0b71166a9e
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pyren/doc_maker.py
View File

@ -703,7 +703,7 @@ def main():
'''Main function '''Main function
1) if ../BVMEXTRACTION doesn't exist then mod_globals.opt_demo=True which means that we would not guide with MTC 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 2) if not demo mode and savedVIN.txt exists and not scan then check savedVIN.txt
else getVIN else getVIN
3) if len(vin)==0 then demo mode 3) if len(vin)==0 then demo mode
@ -829,17 +829,26 @@ def main():
#choose and load DFG #choose and load DFG
dfg = class_dfg( platform ) dfg = class_dfg( platform )
if os.path.isfile(dfg.cacheFile): #if cache exists if dfg.tcom == '146':
dfg = pickle.load( open( dfg.cacheFile, "rb" ) ) #load it dfg.tcom = '159'
else: #else dfg.dfgFile = dfg.dfgFile.replace('DFG_146', 'DFG_159')
dfg.loadDFG() #load file elif dfg.tcom == '135':
#pickle.dump( dfg, open( dfg.cacheFile, "wb" ) ) #and save cache 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_ds = dfg.dataSet
#dfg.showMenu(zipf) #dfg.showMenu(zipf)
#try: #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) generateHTML( "../DocDB_"+mod_globals.opt_lang+"/DocDb"+dfg.tcom+"/SIE/", mtcdata.split(';'), VIN, dfg, date_madc)
#except: #except:
# pass # pass

7
pyren/mod_dfg.py
View File

@ -65,7 +65,7 @@ class class_dfg:
vehTypeCode = vh.getAttribute("vehTypeCode") vehTypeCode = vh.getAttribute("vehTypeCode")
if vehTypeCode.upper()==platform.upper(): if vehTypeCode.upper()==platform.upper():
self.tcom = TCOM self.tcom = TCOM
break; break
self.dfgFile = '../Vehicles/DFG/DFG_'+self.tcom+'.Xml' self.dfgFile = '../Vehicles/DFG/DFG_'+self.tcom+'.Xml'
else: else:
vhcls = [] vhcls = []
@ -95,8 +95,9 @@ class class_dfg:
try: try:
DOMTree = xml.dom.minidom.parse(self.dfgFile) DOMTree = xml.dom.minidom.parse(self.dfgFile)
except: except:
if 'DFG_135' in self.dfgFile: print "ERROR loading dfg-file"
self.dfgFile = self.dfgFile.replace('DFG_135', 'DFG_147') #if 'DFG_135' in self.dfgFile:
# self.dfgFile = self.dfgFile.replace('DFG_135', 'DFG_147')
fs = DOMTree.documentElement #functionsStructure fs = DOMTree.documentElement #functionsStructure