presque fini wlh

1 files changed, 9 insertions, 9 deletions

diff --git a/mapsparsing.py b/mapsparsing.py
index 7fb6edd..7128f62 100644
--- a/mapsparsing.py
+++ b/mapsparsing.py
@@ -2,27 +2,27 @@ import xml.etree.ElementTree as xmlp
 import re
 import errmsg as e
 
-def mapparsing(filetype,basicfilename):
+def mapparsing(maptype,basicfilename):
     try:
         root=tree.getroot()
-        if filetype==1:
+        if maptype==1:
             tree=xmlp.parse(basicfilename)
             filename=root[1][0].text+".gpx"
-        else filetype==2:
-            tree=xmlp.parse(basicfilename)
-            filename= root[0][10][1][0].text+".kml"
-        elif filetype==3:
+        elif maptype==2:
             thefile=open(basicfilename)
             for i in range(3):
                 thefile.readline()
-            filename=re.findall(r'\|(.*?)\|', thefile.readline())[0]
+            filename=re.findall(r'\|(.*?)\|', thefile.readline())[0]+".trk"
+        elif maptype==3:
+            tree=xmlp.parse(basicfilename)
+            filename= root[0][10][1][0].text+".kml"  
         os.rename(basicfilename,filename)
     except OSError, e:
         print e.os
-    except xml.etree.ElementTree.ParseError, e:
+    except xmlp.ParseError, e:
         print e.formaterr
         print format(e)
         os.remove(basicfilename)
         pass
-   return filename
+    return filename