diff --git a/expo/models.py b/expo/models.py
index 9561963..faa4ce3 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -451,12 +451,13 @@ class QM(models.Model):
def __str__(self):
QMnumber=str(self.found_by.cave)+'-'+str(self.found_by.date.year)+"-"+str(self.number)+self.grade
return str(QMnumber)
-
+
+photoFileStorage = FileSystemStorage(location=settings.EXPOWEB+'photos', base_url=settings.PHOTOS_URL)
class Photo(models.Model):
caption = models.CharField(max_length=1000,blank=True,null=True)
contains_person_trip = models.ManyToManyField(PersonTrip,blank=True,null=True)
contains_person = models.ManyToManyField(Person,blank=True,null=True)
- file = models.ImageField(upload_to='photos',)
+ file = models.ImageField(storage=photoFileStorage, upload_to='.',)
is_mugshot = models.BooleanField(default=False)
contains_cave = models.ForeignKey(Cave,blank=True,null=True)
contains_entrance = models.ForeignKey(Entrance, related_name="photo_file",blank=True,null=True)
diff --git a/parsers/people.py b/parsers/people.py
index 6c94679..3a8fb05 100644
--- a/parsers/people.py
+++ b/parsers/people.py
@@ -6,6 +6,7 @@ import csv
import re
import datetime
import os
+import shutil
# Julian: the below code was causing errors and it seems like a duplication of the above. Hope I haven't broken anything by commenting it. -Aaron
#
@@ -16,34 +17,39 @@ import os
# pyo = models.PersonExpedition(person = pObject, expedition = yo, is_guest=is_guest)
# pyo.save()
-def parseMugShotAndBlurb(firstname, lastname, person, header, pObject):
+
+
+def saveMugShot(mugShotPath, mugShotFilename, person):
+ if mugShotFilename.startswith(r'i/'): #if filename in cell has the directory attached (I think they all do), remove it
+ mugShotFilename=mugShotFilename[2:]
+ else:
+ mugShotFilename=mugShotFilename # just in case one doesn't
+
+ mugShotObj = models.Photo(
+ caption="Mugshot for "+person.first_name+" "+person.last_name,
+ is_mugshot=True,
+ file=mugShotFilename,
+ )
+
+ shutil.copy(mugShotPath, mugShotObj.file.path) #Put a copy of the file in the right place. mugShotObj.file.path is determined by the django filesystemstorage specified in models.py
+
+ mugShotObj.save()
+ mugShotObj.contains_person.add(person)
+ mugShotObj.save()
+
+def parseMugShotAndBlurb(personline, header, person):
#create mugshot Photo instance
- mugShotPath = os.path.join(settings.EXPOWEB, "folk", person[header["Mugshot"]])
+ mugShotFilename=personline[header["Mugshot"]]
+ mugShotPath = os.path.join(settings.EXPOWEB, "folk", mugShotFilename)
if mugShotPath[-3:]=='jpg': #if person just has an image, add it
- mugShotObj = models.Photo(
- caption="Mugshot for "+firstname+" "+lastname,
- is_mugshot=True,
- file=mugShotPath,
- )
- mugShotObj.save()
- mugShotObj.contains_person.add(pObject)
- mugShotObj.save()
+ saveMugShot(mugShotPath=mugShotPath, mugShotFilename=mugShotFilename, person=person)
elif mugShotPath[-3:]=='htm': #if person has an html page, find the image(s) and add it. Also, add the text from the html page to the "blurb" field in his model instance.
personPageOld=open(mugShotPath,'r').read()
- pObject.blurb=re.search('<body>.*<hr',personPageOld,re.DOTALL).group() #this needs to be refined, take care of the HTML and make sure it doesn't match beyond the blurb
- for photoFilename in re.findall('i/.*?jpg',personPageOld,re.DOTALL):
- mugShotPath=settings.EXPOWEB+"folk/"+photoFilename
- mugShotObj = models.Photo(
- caption="Mugshot for "+firstname+" "+lastname,
- is_mugshot=True,
- file=mugShotPath,
- )
- mugShotObj.save()
- mugShotObj.contains_person.add(pObject)
- mugShotObj.save()
- pObject.save()
-
-
+ person.blurb=re.search('<body>.*<hr',personPageOld,re.DOTALL).group() #this needs to be refined, take care of the HTML and make sure it doesn't match beyond the blurb
+ for mugShotFilename in re.findall('i/.*?jpg',personPageOld,re.DOTALL):
+ mugShotPath = os.path.join(settings.EXPOWEB, "folk", mugShotFilename)
+ saveMugShot(mugShotPath=mugShotPath, mugShotFilename=mugShotFilename, person=person)
+ person.save()
def LoadPersonsExpos():
@@ -56,7 +62,7 @@ def LoadPersonsExpos():
print "Loading expeditions"
models.Expedition.objects.all().delete()
years = headers[5:]
-# years.append("2008")
+
for year in years:
expedition = models.Expedition(year = year, name = "CUCC expo %s" % year)
expedition.save()
@@ -81,7 +87,7 @@ def LoadPersonsExpos():
#print "NNNN", person.href
is_guest = (personline[header["Guest"]] == "1") # this is really a per-expo catagory; not a permanent state
person.save()
- #parseMugShotAndBlurb(firstname, lastname, person, header, pObject)
+ parseMugShotAndBlurb(personline=personline, header=header, person=person)
# make person expedition from table
for year, attended in zip(headers, personline)[5:]:
@@ -90,33 +96,34 @@ def LoadPersonsExpos():
personexpedition = models.PersonExpedition(person=person, expedition=expedition, nickname=nickname, is_guest=is_guest)
personexpedition.save()
- # The below is no longer necessary because the 2008 expedition people have been added to surveys.csv. - AC 16 Feb 09
- # this fills in those people for whom 2008 was their first expo
-# print "Loading personexpeditions 2008"
-# for name in expomissing:
-# firstname, lastname = name.split()
-# is_guest = name in ["Eeva Makiranta", "Keith Curtis"]
-# print "2008:", name
-# persons = list(models.Person.objects.filter(first_name=firstname, last_name=lastname))
-# if not persons:
-# person = models.Person(first_name=firstname, last_name = lastname, is_vfho = False, mug_shot = "")
-# #person.Sethref()
-# person.save()
-# else:
-# person = persons[0]
-# expedition = models.Expedition.objects.get(year="2008")
-# personexpedition = models.PersonExpedition(person=person, expedition=expedition, nickname="", is_guest=is_guest)
-# personexpedition.save()
+ # this fills in those people for whom 2008 was their first expo
+ print "Loading personexpeditions 2008"
+ for name in expomissing:
+ firstname, lastname = name.split()
+ is_guest = name in ["Eeva Makiranta", "Keith Curtis"]
+ print "2008:", name
+ persons = list(models.Person.objects.filter(first_name=firstname, last_name=lastname))
+ if not persons:
+ person = models.Person(first_name=firstname, last_name = lastname, is_vfho = False, mug_shot = "")
+ person.Sethref()
+ person.save()
+ else:
+ person = persons[0]
+ expedition = models.Expedition.objects.get(year="2008")
+ personexpedition = models.PersonExpedition(person=person, expedition=expedition, nickname="", is_guest=is_guest)
+ personexpedition.save()
+
+ #Notability is now a method of person. Makes no sense to store it in the database; it would need to be recalculated every time something changes. - AC 16 Feb 09
# could rank according to surveying as well
-# print "Setting person notability"
-# for person in models.Person.objects.all():
-# person.notability = 0.0
-# for personexpedition in person.personexpedition_set.all():
-# if not personexpedition.is_guest:
-# person.notability += 1.0 / (2012 - int(personexpedition.expedition.year))
-# person.bisnotable = person.notability > 0.3 # I don't know how to filter by this
-# person.save()
+ #print "Setting person notability"
+ #for person in models.Person.objects.all():
+ #person.notability = 0.0
+ #for personexpedition in person.personexpedition_set.all():
+ #if not personexpedition.is_guest:
+ #person.notability += 1.0 / (2012 - int(personexpedition.expedition.year))
+ #person.bisnotable = person.notability > 0.3 # I don't know how to filter by this
+ #person.save()
# used in other referencing parser functions
diff --git a/settings.py b/settings.py
index f22bd36..c2b62b9 100644
--- a/settings.py
+++ b/settings.py
@@ -1,5 +1,6 @@
from localsettings import *
-# Django settings for troggle2 project.
+import os
+# Django settings for troggle project.
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -32,6 +33,11 @@ USE_I18N = True
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/'
+PHOTOS = os.path.join(EXPOWEB, 'photos')
+MEDIA_URL = URL_ROOT+'/site_media/'
+SURVEYS_URL = URL_ROOT+'/survey_scans/'
+PHOTOS_URL = URL_ROOT+'/photos/'
+SVX_URL = URL_ROOT+'/survex/'
APPEND_SLASH = False
SMART_APPEND_SLASH = True
diff --git a/templates/person.html b/templates/person.html
index 88171c1..aed5989 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -8,17 +8,29 @@
{% endblock %}
{% block content %}
+{% if person.blurb %}
{{person.blurb}}
-{% for pic in person.photo_set
+{% endif %}
+
+{% for pic in person.photo_set.all %}
+{% if pic.is_mugshot %}
<div class="figure">
- <p> <img src="{{ person.correctURL }}" class="thumbnail" /> </p>
+ <p> <img src="{{ pic.file.url }}" class="thumbnail" />
+ <p> {{ pic.caption }}
+ </p>
+ </p>
</div>
-
-<p>{{person|wiki_to_html_short}} has been on expo in the following years:</p>
-<p>
-{% for personexpedition in person.personexpedition_set.all %}
- | <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a>
+{% endif %}
{% endfor %}
+<br class="clearfloat" />
+
+<h3>{{person|wiki_to_html_short}} has been on expo in the following years:</h3>
+<p>
+<ul>
+{% for personexpedition in person.personexpedition_set.all %}
+ <li> <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a></li>
+{% endfor %}
+</ul>
</p>
diff --git a/urls.py b/urls.py
index fedc122..a701ba1 100644
--- a/urls.py
+++ b/urls.py
@@ -75,5 +75,6 @@ urlpatterns = patterns('',
(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.SURVEYS, 'show_indexes':True}),
-
+ (r'^photos/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.PHOTOS, 'show_indexes':True}),
)