diff --git a/pyren/mod_ddt.py b/pyren/mod_ddt.py index 724e5a3..44c6bdd 100755 --- a/pyren/mod_ddt.py +++ b/pyren/mod_ddt.py @@ -1242,8 +1242,8 @@ class DDTLauncher(): #b_xml.grid(row=8, column=2, **optsGrid) allxmllist = [] - for l in sorted(mod_db_manager.get_file_list_from_ddt('^ecus/*')): - allxmllist.append( l[5:] ) + for l in sorted(mod_db_manager.get_file_list_from_ddt('ecus/*')): + allxmllist.append( os.path.basename(l) ) l2_xml = tk.Label(self.ecudlg, text='ALL XML:', background="#d9d9d9") l2_xml.grid(row=9, column=0, **optsGrid_e) a_xml = ttk.Combobox(self.ecudlg, width=30) diff --git a/pyren/mod_ddt_ecu.py b/pyren/mod_ddt_ecu.py index ed11022..249e7e5 100755 --- a/pyren/mod_ddt_ecu.py +++ b/pyren/mod_ddt_ecu.py @@ -285,7 +285,7 @@ class DDTECU(): eculist = mod_ddt_utils.loadECUlist() - mod_ddt_utils.searchddtroot() + #mod_ddt_utils.searchddtroot() if len(mod_globals.opt_ddtxml)>0: fname = mod_globals.opt_ddtxml @@ -393,7 +393,7 @@ class DDTECU(): if xmlname.upper().endswith('.XML'): xmlname = xmlname[:-4] - if len(dumpname)==0: + if len(dumpname)==0 or not os.path.exists(dumpname): flist = [] for root, dirs, files in os.walk("./dumps"): diff --git a/pyren/mod_ddt_utils.py b/pyren/mod_ddt_utils.py index f680d0a..872eef0 100644 --- a/pyren/mod_ddt_utils.py +++ b/pyren/mod_ddt_utils.py @@ -125,10 +125,10 @@ def loadECUlist(): pjcl = [] eculist[Address]["targets"][href]['Projects'] = pjcl ail = [] - ais = target.findall("AutoIdents") + ais = target.findall("ns0:AutoIdents", ns) if len(ais): for ai in ais: - AutoIdents = ai.findall("AutoIdent") + AutoIdents = ai.findall("ns0:AutoIdent", ns) if len(AutoIdents): for AutoIdent in AutoIdents: air = {}