diff --git a/CMDB2CSV_Aufbaumaster.py b/CMDB2CSV_Aufbaumaster.py index 5c326176..e543aa61 100755 --- a/CMDB2CSV_Aufbaumaster.py +++ b/CMDB2CSV_Aufbaumaster.py @@ -75,15 +75,15 @@ class MainUI(QDialog): # erbt von QDialog self.collect_allgemein() -# self.collect_cmdb_daten_gg() -# self.collect_cmdb_daten_erw() - self.collect_vm() + self.collect_cmdb_daten_gg() + self.collect_cmdb_daten_erw() + #self.collect_vm() def collect_vm(self): self.df_vte_vm= self.df_vte[self.df_vte['Gruppierung'] == 'VM'] if self.df_vte_vm.empty: self.logger.info("Aufbaumaster %s hat keine VMs! - Beendung des Programms",self.onlyfilename) - sys.exit(0) + #sys.exit(0) self.df_cmdb_vm = self.df_cmdb[self.df_cmdb['Filter'] == 'VM'] self.df_vte_vm = self.bereinigen_leerzeichen(self.df_vte_vm) @@ -174,7 +174,7 @@ class MainUI(QDialog): # erbt von QDialog # Setzen von int für HE und Anz. HE - self.dfb_gg['HE'] = self.dfb_gg['HE'].apply(lambda x: x if pd.isnull(x) else str(int(x))) + #self.dfb_gg['HE'] = self.dfb_gg['HE'].apply(lambda x: x if pd.isnull(x) else str(int(x))) def has_special_characters(self, s): # Regex pattern für Sonderzeichen @@ -571,8 +571,8 @@ class MainUI(QDialog): # erbt von QDialog self.dfb_gg.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_GG"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') self.dfb_erw.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_ERW"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') - self.dfb_vm.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_VM"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') -# print("Datei wurde gespeichert:", self.savefilename) + #self.dfb_vm.to_csv(os.path.splitext(os.path.basename(self.savefilename))[0]+"_VM"+os.path.splitext(os.path.basename(self.savefilename))[1], index=None, header=True, encoding='utf-8') + print("Datei wurde gespeichert:", self.savefilename) def collect_allgemein(self): self.df_vte = pd.read_excel(self.filename, header=7, na_filter=False, sheet_name='VTE-Input',