[svn] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense.

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8163 by aaron @ 1/16/2009 7:50 PM

urls.py

@@ -28,7 +28,7 @@ urlpatterns = patterns('',
     (r'^statistics/?$', stats),
     
     (r'^survey/?$', surveyindex),
-    (r'^survey/(?P<survey_id>.*)$', survey),
+    (r'^survey/(?P<year>\d\d\d\d)\#(?P<wallet_number>\d*)$', survey),
     
     (r'^admin/doc/?', include('django.contrib.admindocs.urls')),
     (r'^admin/(.*)', admin.site.root),