diff --git a/BudaPortaXmlConvert.py b/BudaPortaXmlConvert.py index 3c1ea83..8f7928a 100644 --- a/BudaPortaXmlConvert.py +++ b/BudaPortaXmlConvert.py @@ -70,11 +70,11 @@ def getXmlData(data): def checkData(xmlData): print() - missingData = False - for mérő in xmlData: + missingData = [] + for i, mérő in enumerate(xmlData): for adat in mérő: - if len(mérő[adat]) == 0: - missingData = True + if len(mérő[adat]) == 0 or mérő[adat] == "diktalos": + missingData.append(i) print(f'Adat hiányzik: "{adat}" a következő sorból:') print(mérő) return missingData @@ -147,16 +147,22 @@ for i, table in enumerate(csvArrs): xmlReqData = [] for i, table in enumerate(reqData): print(f'Fájl ellenőrzése: {csvFileNames[i]}') + + # unwrap data currXmlData = getXmlData(table) - if not checkData(currXmlData): + + # check for missing data + wrongLines = checkData(currXmlData) + if len(wrongLines) == 0: print('Fájl hibátlan') + else: + # remove bad lines + print(wrongLines) + for ele in sorted(wrongLines, reverse = True): + del currXmlData[ele] print() xmlReqData.append(currXmlData) -# print(xmlReqData) -# for i in xmlReqData: -# print(i) - # ------------------------------- Merge arrays ------------------------------- #