diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-07-22 16:18:00 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-07-22 16:18:00 +0100 |
| commit | 57ede091c42878f11b33a2c77aa73a71bd4723dd (patch) | |
| tree | 7ce10a69ac98b29265124361f290088a44cb70aa /core/views_other.py | |
| parent | e5033c7b69a2210087c502b54c5fd07d57c5a0d2 (diff) | |
| download | troggle-57ede091c42878f11b33a2c77aa73a71bd4723dd.tar.gz troggle-57ede091c42878f11b33a2c77aa73a71bd4723dd.tar.bz2 troggle-57ede091c42878f11b33a2c77aa73a71bd4723dd.zip | |
[svn] Various bug fixes, using more raw_id fields in admin so it loads faster. I had to put onLoad="contentHeight();" back into the base template. This is a bad solution, I would rather use Martin's, but it wasn't working.
Diffstat (limited to 'core/views_other.py')
| -rw-r--r-- | core/views_other.py | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/core/views_other.py b/core/views_other.py index c2c82ee..e3ecb10 100644 --- a/core/views_other.py +++ b/core/views_other.py @@ -161,7 +161,7 @@ def logbook_entry_suggestions(request): Generates a html box with suggestions about what to do with QMs
in logbook entry text.
"""
- unwiki_QM_pattern=r"(?P<whole>(?P<explorer_code>[ABC]?)(?P<cave>\d*)-?(?P<year>\d\d\d?\d?)-(?P<number>\d\d)(?P<grade>[ABCDXV]?)(?=\s))"
+ unwiki_QM_pattern=r"(?P<whole>(?P<explorer_code>[ABC]?)(?P<cave>\d*)-?(?P<year>\d\d\d?\d?)-(?P<number>\d\d)(?P<grade>[ABCDXV]?))"
unwiki_QM_pattern=re.compile(unwiki_QM_pattern)
#wikilink_QM_pattern=settings.QM_PATTERN
@@ -174,18 +174,24 @@ def logbook_entry_suggestions(request): print unwiki_QMs
for qm in unwiki_QMs:
- if len(qm['year'])==2:
- if int(qm['year'])<50:
- qm['year']='20'+qm['year']
- else:
- qm['year']='19'+qm['year']
-
- temp_QM=QM(found_by=lbo,number=qm['number'],grade=qm['grade'])
- try:
- temp_QM.grade=unwiki_QM['grade']
- except:
- pass
- qm['wikilink']=temp_QM.wiki_link()
+ #try:
+ if len(qm['year'])==2:
+ if int(qm['year'])<50:
+ qm['year']='20'+qm['year']
+ else:
+ qm['year']='19'+qm['year']
+
+ if lbo.date.year!=int(qm['year']):
+ try:
+ lbo=LogbookEntry.objects.get(date__year=qm['year'],title__icontains="placeholder for QMs in")
+ except:
+ print "failed to get placeholder for year "+str(qm['year'])
+
+ temp_QM=QM(found_by=lbo,number=qm['number'],grade=qm['grade'])
+ temp_QM.grade=qm['grade']
+ qm['wikilink']=temp_QM.wiki_link()
+ #except:
+ #print 'failed'
print unwiki_QMs
|