[svn r8324] Weeks of local changes.

- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style

troggle/parsers/QMs.py

@@ -1,28 +1,40 @@
+# -*- coding: UTF-8 -*-
+
 import csv
 import settings
 from expo.models import QM, LogbookEntry, Cave
 from datetime import *
+from helpers import save_carefully
 import re
 
-#sorry that the below code is ugly. I'll fix it sometime, really! - AC
+def deleteQMs():
+    QM.objects.all().delete()
 
-QM.objects.all().delete()
+def parseCaveQMs(cave,inputFile):
+    """Runs through the CSV file at inputFile (which is a relative path from expoweb) and saves each QM as a QM instance."""
 
-def parseCaveQMs(cave,pathToCSV):
     if cave=='stein':
         try:
-        	steinBr=Cave.objects.get(official_name="Steinbrückenhöhle")
+            steinBr=Cave.objects.get(official_name="Steinbrückenhöhle")
         except Cave.DoesNotExist:
             print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first."
             return
     elif cave=='hauch':
         try:
-        	hauchHl=Cave.objects.get(official_name="Hauchhöhle")
+            hauchHl=Cave.objects.get(official_name="Hauchhöhle")
         except Cave.DoesNotExist:
             print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first."
-            return	
-    
-    qmPath = settings.EXPOWEB+pathToCSV
+            return
+    elif cave =='kh':
+        try:
+            kh=Cave.objects.get(official_name="Kaninchenhöhle")
+        except Cave.DoesNotExist:
+            print "Steinbruckenhoehle is not in the database. Please run parsers.cavetab first."
+        for file in inputFile:
+            parse_KH_QMs(kh, inputFile=file) 
+        return
+
+    qmPath = settings.EXPOWEB+inputFile
     qmCSVContents = open(qmPath,'r')
     dialect=csv.Sniffer().sniff(qmCSVContents.read())
     qmCSVContents.seek(0,0)
@@ -55,13 +67,54 @@ def parseCaveQMs(cave,pathToCSV):
                 newQM.ticked_off_by=placeholder
 
             newQM.comment=line[6]
-            newQM.save()
-            print "QM "+str(newQM) + ' added to database\r',
-        except KeyError:
+            try:
+                preexistingQM=QM.objects.get(number=QMnum, found_by__date__year=year)  #if we don't have this one in the DB, save it
+                if preexistingQM.new_since_parsing==False:  #if the pre-existing QM has not been modified, overwrite it
+                    preexistingQM.delete()
+                    newQM.save()
+                    print "overwriting " + str(preexistingQM) +"\r",
+                
+                else:  # otherwise, print that it was ignored
+                    print "preserving "+ str(preexistingQM) + ", which was edited in admin \r",
+                    
+            except QM.DoesNotExist:         #if there is no pre-existing QM, save the new one
+                newQM.save() 
+                print "QM "+str(newQM) + ' added to database\r',
+                
+        except KeyError: #check on this one
             continue
 #        except IndexError:
 #            print "Index error in " + str(line)
 #           continue
 
-parseCaveQMs(cave='stein',pathToCSV=r"smkridge/204/qm.csv")
-parseCaveQMs(cave='hauch',pathToCSV=r"smkridge/234/qm.csv")
+def parse_KH_QMs(kh, inputFile):
+    """import QMs from the 1623-161 (Kaninchenh<6E>hle) html pages
+    """
+    khQMs=open(settings.EXPOWEB+inputFile,'r')
+    khQMs=khQMs.readlines()
+    for line in khQMs:
+        res=re.search('name=\"[CB](?P<year>\d*)-(?P<cave>\d*)-(?P<number>\d*).*</a> (?P<grade>[ABDCV])<dd>(?P<description>.*)\[(?P<nearest_station>.*)\]',line)
+        if res:
+            res=res.groupdict()
+            year=int(res['year'])
+        #check if placeholder exists for given year, create it if not
+            placeholder, hadToCreate = LogbookEntry.objects.get_or_create(date__year=year, title="placeholder for QMs in 161", text="QMs temporarily attached to this should be re-attached to their actual trips", defaults={"date": date((year), 1, 1),"cave":kh})
+            lookupArgs={
+                'found_by':placeholder,
+                'number':res['number']
+                }
+            nonLookupArgs={
+                'grade':res['grade'],
+                'nearest_station':res['nearest_station'],
+                'location_description':res['description']
+                }
+            
+            if 
+            
+            save_carefully(QM,lookupArgs,nonLookupArgs)
+        
+
+parseCaveQMs(cave='kh', inputFile=r"smkridge/161/qmtodo.htm")
+parseCaveQMs(cave='stein',inputFile=r"smkridge/204/qm.csv")
+parseCaveQMs(cave='hauch',inputFile=r"smkridge/234/qm.csv")
+