From dc1327674c2676db02ccf525725019cd9115b699 Mon Sep 17 00:00:00 2001
From: Wookey <wookey@wookware.org>
Date: Mon, 11 Jul 2011 02:10:22 +0100
Subject: remove all the DOS linefeeds

---
 export/tocavetab.py | 98 ++++++++++++++++++++++++++---------------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

(limited to 'export/tocavetab.py')

diff --git a/export/tocavetab.py b/export/tocavetab.py
index bf0170d..f55032d 100644
--- a/export/tocavetab.py
+++ b/export/tocavetab.py
@@ -1,49 +1,49 @@
-import troggle.core.models as models
-from django.conf import settings
-
-import csv, re, os
-
-#format of CAVETAB2.CSV is
-headers=['KatasterNumber','KatStatusCode','Entrances','UnofficialNumber','MultipleEntrances','AutogenFile','LinkFile','LinkEntrance','Name','UnofficialName',
- 'Comment','Area','Explorers','UndergroundDescription','Equipment','QMList','KatasterStatus','References','UndergroundCentreLine','UndergroundDrawnSurvey',
- 'SurvexFile','Length','Depth','Extent','Notes','EntranceName','TagPoint','OtherPoint','DescriptionOfOtherPoint','ExactEntrance','TypeOfFix','GPSpreSA',
- 'GPSpostSA','Northing','Easting','Altitude','Bearings','Map','Location','Approach','EntranceDescription','PhotoOfLocation','Marking','MarkingComment',
- 'Findability','FindabilityComment']
-
-def cavetabRow(cave):
-    #mapping of troggle models to table columns is: (guess this could just be a tuple of tuples rather than a dictionary actually)
-    columnsToModelFields={
-        'Name':cave.official_name,
-        'Area':cave.kat_area(),
-        'KatStatusCode':cave.kataster_code,
-        'KatasterNumber':cave.kataster_number,
-        'UnofficialNumber':cave.unofficial_number,
-        #'' : cave.entrances 		This is a multiple foreignkey now, may be tricky to dump back into csv. Work on this.
-        'Explorers':cave.explorers,
-        'UndergroundDescription':cave.underground_description,
-        'Equipment':cave.equipment,
-        'References':cave.references,
-        'UndergroundDrawnSurvey':cave.survey,
-        'KatasterStatus':cave.kataster_status,
-        'UndergroundCentreLine':cave.underground_centre_line,
-        'Notes':cave.notes,
-        'Length':cave.length,
-        'Depth':cave.depth,
-        'Extent':cave.extent,
-        'SurvexFile':cave.survex_file,
-        }
-        
-    caveRow=['' for x in range(len(headers))]
-    for column, modelField in columnsToModelFields.items():
-        if modelField:
-            # Very sorry about the atrocious replace below. I will fix this soon if noone beats me to it. - AC
-            caveRow[headers.index(column)]=modelField.replace(u'\xd7','x').replace(u'\u201c','').replace(u'\u2013','').replace(u'\xbd','')
-    return caveRow
-
-def writeCaveTab(outfile):
-    cavewriter=csv.writer(outfile,lineterminator='\r')
-    cavewriter.writerow(headers)
-    for cave in models.Cave.objects.all():
-        cavewriter.writerow(cavetabRow(cave))
-
-
+import troggle.core.models as models
+from django.conf import settings
+
+import csv, re, os
+
+#format of CAVETAB2.CSV is
+headers=['KatasterNumber','KatStatusCode','Entrances','UnofficialNumber','MultipleEntrances','AutogenFile','LinkFile','LinkEntrance','Name','UnofficialName',
+ 'Comment','Area','Explorers','UndergroundDescription','Equipment','QMList','KatasterStatus','References','UndergroundCentreLine','UndergroundDrawnSurvey',
+ 'SurvexFile','Length','Depth','Extent','Notes','EntranceName','TagPoint','OtherPoint','DescriptionOfOtherPoint','ExactEntrance','TypeOfFix','GPSpreSA',
+ 'GPSpostSA','Northing','Easting','Altitude','Bearings','Map','Location','Approach','EntranceDescription','PhotoOfLocation','Marking','MarkingComment',
+ 'Findability','FindabilityComment']
+
+def cavetabRow(cave):
+    #mapping of troggle models to table columns is: (guess this could just be a tuple of tuples rather than a dictionary actually)
+    columnsToModelFields={
+        'Name':cave.official_name,
+        'Area':cave.kat_area(),
+        'KatStatusCode':cave.kataster_code,
+        'KatasterNumber':cave.kataster_number,
+        'UnofficialNumber':cave.unofficial_number,
+        #'' : cave.entrances 		This is a multiple foreignkey now, may be tricky to dump back into csv. Work on this.
+        'Explorers':cave.explorers,
+        'UndergroundDescription':cave.underground_description,
+        'Equipment':cave.equipment,
+        'References':cave.references,
+        'UndergroundDrawnSurvey':cave.survey,
+        'KatasterStatus':cave.kataster_status,
+        'UndergroundCentreLine':cave.underground_centre_line,
+        'Notes':cave.notes,
+        'Length':cave.length,
+        'Depth':cave.depth,
+        'Extent':cave.extent,
+        'SurvexFile':cave.survex_file,
+        }
+        
+    caveRow=['' for x in range(len(headers))]
+    for column, modelField in columnsToModelFields.items():
+        if modelField:
+            # Very sorry about the atrocious replace below. I will fix this soon if noone beats me to it. - AC
+            caveRow[headers.index(column)]=modelField.replace(u'\xd7','x').replace(u'\u201c','').replace(u'\u2013','').replace(u'\xbd','')
+    return caveRow
+
+def writeCaveTab(outfile):
+    cavewriter=csv.writer(outfile,lineterminator='\r')
+    cavewriter.writerow(headers)
+    for cave in models.Cave.objects.all():
+        cavewriter.writerow(cavetabRow(cave))
+
+
-- 
cgit v1.2.3