expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-23 07:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8246] Photo file handling and mugshots parsing sorted.

Browse Source 
Made URL settings more relative, less redundant.
This commit is contained in:
aaron 2009-02-18 07:45:45 +01:00
parent 1baf2cc0d4
commit 4fc8c8ae3c
5 changed files with 89 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
troggle/expo/models.py
View File

@ -452,11 +452,12 @@ class QM(models.Model):
QMnumber=str(self.found_by.cave)+'-'+str(self.found_by.date.year)+"-"+str(self.number)+self.grade QMnumber=str(self.found_by.cave)+'-'+str(self.found_by.date.year)+"-"+str(self.number)+self.grade
return str(QMnumber) return str(QMnumber)
photoFileStorage = FileSystemStorage(location=settings.EXPOWEB+'photos', base_url=settings.PHOTOS_URL)
class Photo(models.Model): class Photo(models.Model):
caption = models.CharField(max_length=1000,blank=True,null=True) caption = models.CharField(max_length=1000,blank=True,null=True)
contains_person_trip = models.ManyToManyField(PersonTrip,blank=True,null=True) contains_person_trip = models.ManyToManyField(PersonTrip,blank=True,null=True)
contains_person = models.ManyToManyField(Person,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) is_mugshot = models.BooleanField(default=False)
contains_cave = models.ForeignKey(Cave,blank=True,null=True) contains_cave = models.ForeignKey(Cave,blank=True,null=True)
contains_entrance = models.ForeignKey(Entrance, related_name="photo_file",blank=True,null=True) contains_entrance = models.ForeignKey(Entrance, related_name="photo_file",blank=True,null=True)

87
troggle/parsers/people.py
View File

@ -6,6 +6,7 @@ import csv
import re import re
import datetime import datetime
import os 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 # 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 = models.PersonExpedition(person = pObject, expedition = yo, is_guest=is_guest)
# pyo.save() # pyo.save()
def parseMugShotAndBlurb(firstname, lastname, person, header, pObject):
#create mugshot Photo instance
mugShotPath = os.path.join(settings.EXPOWEB, "folk", person[header["Mugshot"]]) def saveMugShot(mugShotPath, mugShotFilename, person):
if mugShotPath[-3:]=='jpg': #if person just has an image, add it 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( mugShotObj = models.Photo(
caption="Mugshot for "+firstname+" "+lastname, caption="Mugshot for "+person.first_name+" "+person.last_name,
is_mugshot=True, is_mugshot=True,
file=mugShotPath, 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.save()
mugShotObj.contains_person.add(pObject) mugShotObj.contains_person.add(person)
mugShotObj.save() mugShotObj.save()
def parseMugShotAndBlurb(personline, header, person):
#create mugshot Photo instance
mugShotFilename=personline[header["Mugshot"]]
mugShotPath = os.path.join(settings.EXPOWEB, "folk", mugShotFilename)
if mugShotPath[-3:]=='jpg': #if person just has an image, add it
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. 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() 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 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 photoFilename in re.findall('i/.*?jpg',personPageOld,re.DOTALL): for mugShotFilename in re.findall('i/.*?jpg',personPageOld,re.DOTALL):
mugShotPath=settings.EXPOWEB+"folk/"+photoFilename mugShotPath = os.path.join(settings.EXPOWEB, "folk", mugShotFilename)
mugShotObj = models.Photo( saveMugShot(mugShotPath=mugShotPath, mugShotFilename=mugShotFilename, person=person)
caption="Mugshot for "+firstname+" "+lastname, person.save()
is_mugshot=True,
file=mugShotPath,
)
mugShotObj.save()
mugShotObj.contains_person.add(pObject)
mugShotObj.save()
pObject.save()
def LoadPersonsExpos(): def LoadPersonsExpos():
@ -56,7 +62,7 @@ def LoadPersonsExpos():
print "Loading expeditions" print "Loading expeditions"
models.Expedition.objects.all().delete() models.Expedition.objects.all().delete()
years = headers[5:] years = headers[5:]
# years.append("2008")
for year in years: for year in years:
expedition = models.Expedition(year = year, name = "CUCC expo %s" % year) expedition = models.Expedition(year = year, name = "CUCC expo %s" % year)
expedition.save() expedition.save()
@ -81,7 +87,7 @@ def LoadPersonsExpos():
#print "NNNN", person.href #print "NNNN", person.href
is_guest = (personline[header["Guest"]] == "1") # this is really a per-expo catagory; not a permanent state is_guest = (personline[header["Guest"]] == "1") # this is really a per-expo catagory; not a permanent state
person.save() person.save()
#parseMugShotAndBlurb(firstname, lastname, person, header, pObject) parseMugShotAndBlurb(personline=personline, header=header, person=person)
# make person expedition from table # make person expedition from table
for year, attended in zip(headers, personline)[5:]: for year, attended in zip(headers, personline)[5:]:
@ -90,24 +96,25 @@ def LoadPersonsExpos():
personexpedition = models.PersonExpedition(person=person, expedition=expedition, nickname=nickname, is_guest=is_guest) personexpedition = models.PersonExpedition(person=person, expedition=expedition, nickname=nickname, is_guest=is_guest)
personexpedition.save() 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 # could rank according to surveying as well
#print "Setting person notability" #print "Setting person notability"
#for person in models.Person.objects.all(): #for person in models.Person.objects.all():

8
troggle/settings.py
View File

@ -1,5 +1,6 @@
from localsettings import * from localsettings import *
# Django settings for troggle2 project. import os
# Django settings for troggle project.
DEBUG = True DEBUG = True
TEMPLATE_DEBUG = DEBUG TEMPLATE_DEBUG = DEBUG
@ -32,6 +33,11 @@ USE_I18N = True
# trailing slash. # trailing slash.
# Examples: "http://foo.com/media/", "/media/". # Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/troggle/media-admin/' 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 APPEND_SLASH = False
SMART_APPEND_SLASH = True SMART_APPEND_SLASH = True

28
troggle/templates/person.html
View File

@ -8,17 +8,29 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if person.blurb %}
{{person.blurb}} {{person.blurb}}
{% for pic in person.photo_set {% endif %}
<div class="figure">
<p> <img src="{{ person.correctURL }}" class="thumbnail" /> </p>
</div>
<p>{{person|wiki_to_html_short}} has been on expo in the following years:</p> {% for pic in person.photo_set.all %}
<p> {% if pic.is_mugshot %}
{% for personexpedition in person.personexpedition_set.all %} <div class="figure">
| <a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.expedition.year}}</a> <p> <img src="{{ pic.file.url }}" class="thumbnail" />
<p> {{ pic.caption }}
</p>
</p>
</div>
{% endif %}
{% endfor %} {% 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> </p>

3
troggle/urls.py
View File

@ -75,5 +75,6 @@ urlpatterns = patterns('',
(r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve', (r'^survey_scans/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.SURVEYS, 'show_indexes':True}), {'document_root': settings.SURVEYS, 'show_indexes':True}),
(r'^photos/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.PHOTOS, 'show_indexes':True}),
) )