diff options
Diffstat (limited to 'expo')
| -rw-r--r-- | expo/models.py | 22 | ||||
| -rw-r--r-- | expo/views_caves.py | 11 |
2 files changed, 17 insertions, 16 deletions
diff --git a/expo/models.py b/expo/models.py index 6331c0c..3472a01 100644 --- a/expo/models.py +++ b/expo/models.py @@ -1,17 +1,14 @@ -import urllib
-import string
+import urllib, urlparse, string, os, datetime
from django.forms import ModelForm
from django.db import models
from django.contrib import admin
from django.core.files.storage import FileSystemStorage
from django.contrib.auth.models import User
from django.contrib.contenttypes.models import ContentType
-import os
from django.conf import settings
-import datetime
from decimal import Decimal, getcontext
-from django.core.urlresolvers import reverse
-from troggle.imagekit.models import ImageModel
+from django.core.urlresolvers import reverse
+from imagekit.models import ImageModel
getcontext().prec=2 #use 2 significant figures for decimal calculations
from models_survex import *
@@ -462,7 +459,7 @@ class Subcave(TroggleModel): description = models.TextField()
name = models.CharField(max_length=200, )
cave = models.ForeignKey('Cave', blank=True, null=True, help_text="Only the top-level subcave should be linked to a cave")
- parent= models.ForeignKey('Subcave', blank=True, null=True,)
+ parent= models.ForeignKey('Subcave', blank=True, null=True, related_name='children')
adjoining = models.ManyToManyField('Subcave',blank=True, null=True,)
survex_file = models.CharField(max_length=200, blank=True, null=True,)
@@ -473,14 +470,17 @@ class Subcave(TroggleModel): urlString=self.name
if self.parent:
parent=self.parent
- while parent.parent:
+ while parent: #recursively walk up the tree, adding parents to the left of the URL
urlString=parent.name+'/'+urlString
+ if parent.cave:
+ cave=parent.cave
parent=parent.parent
- urlString=unicode(parent.cave.kataster_number)+urlString
+ urlString='cave/'+unicode(cave.kataster_number)+'/'+urlString
else:
- urlString=unicode(self.cave.kataster_number)+urlString
+ urlString='cave/'+unicode(self.cave.kataster_number)+'/'+urlString
- return settings.URL_ROOT + urlString
+
+ return urlparse.urljoin(settings.URL_ROOT, urlString)
class QM(TroggleModel):
#based on qm.csv in trunk/expoweb/smkridge/204 which has the fields:
diff --git a/expo/views_caves.py b/expo/views_caves.py index 1e11602..691cdcb 100644 --- a/expo/views_caves.py +++ b/expo/views_caves.py @@ -54,15 +54,16 @@ def survexblock(request, survexpath): def subcave(request, cave_id, subcave):
print subcave
- subcaveSeq=re.findall('([a-zA-Z]*)(?:/)',subcave)
+ subcaveSeq=re.findall('(?:/)([^/]*)',subcave)
print subcaveSeq
- cave=models.Cave.objects.filter(kataster_number = cave_id)[0]
+ cave=models.Cave.objects.get(kataster_number = cave_id)
subcave=models.Subcave.objects.get(name=subcaveSeq[0], cave=cave)
if len(subcaveSeq)>1:
- for singleSubcave in subcaveSeq[1:]:
- subcave=subcave.subcave_set.get(name=singleSubcave)
+ for subcaveUrlSegment in subcaveSeq[1:]:
+ if subcaveUrlSegment:
+ subcave=subcave.children.get(name=subcaveUrlSegment)
print subcave
- return render_response(request,'subcave.html', {'subcave': subcave,})
+ return render_response(request,'subcave.html', {'subcave': subcave,'cave':cave})
def caveSearch(request):
query_string = ''
|