Просмотр исходного кода

'nnyverter.py' ändern

fahrzeugtyp
tsi 4 лет назад
Родитель
Сommit
5b5dcd7a13
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      nnyverter.py

+ 6 - 6
nnyverter.py

@@ -30,7 +30,7 @@ def convert_pdf_to_txt(path):
     retstr.close()
     return text
 
-regex = r"^Tour Nr:\n\n(\d*)\n\nAbfahrt:.*?(?!(StellPl.|StellPl))\nMaut.*?^(\d*(,\d*)?|0)\sKM$"
+regex = r"^Tour Nr:\n\n(\d*)\n\nAbfahrt:.*?(?!(StellPl.|StellPl))\nFahrzeugTyp:\s(.*?)\nR-Tour.*?\nMaut.*?^(\d*(,\d*)?|0)\sKM$"
 
 
 total = 0.0
@@ -45,9 +45,9 @@ with open("ergebnis.csv", 'w', newline='') as csvfile:
         print("Beginne mit " + file + " alles guddes!")
         spamwriter.writerow([str(file)])
         out = convert_pdf_to_txt(file)
-        #file = open("testfile.txt","w",  encoding='utf-8') 
-        #file.write(out)
-        #file.close() 
+        file = open("testfile.txt","w",  encoding='utf-8') 
+        file.write(out)
+        file.close() 
         matches = re.finditer(regex, out, re.MULTILINE | re.DOTALL)
 
         
@@ -56,9 +56,9 @@ with open("ergebnis.csv", 'w', newline='') as csvfile:
 
         for matchNum, match in enumerate(matches, start=1):
             ##print ("Match {matchNum} was found at {start}-{end}: {match}".format(matchNum = matchNum, start = match.start(), end = match.end(), match = match.group()))
-            spamwriter.writerow([str("=\"" + match.group(1) + "\"")] + [str(match.group(3)).replace(",",",")])
+            spamwriter.writerow([str("=\"" + match.group(1) + "\"")] + [str(match.group(4)).replace(",",",")] + [str(match.group(3)).replace(",",",")])
             print ("Tour " + str(i) + "," + str(match.group(1)) + "," + str(match.group(3)).replace(",","."))
-            daily = daily + float(match.group(3).replace(",","."))
+            daily = daily + float(match.group(4).replace(",","."))
             i = i+1
         print(daily)
         total = total + daily