[svn] full checkin. animations disabled, sorry

2009-07-27 13:43:43 +01:00
parent 68060d6118
commit 7158a79a34
11 changed files with 255 additions and 173 deletions
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -68,7 +68,10 @@ def make_model(name, parent, iter_lines, sf, c, l):
    def saveEnd(survex_file, count):
          if m.start_year and team:
              try:
-                  exp = models.Expedition.objects.get(year = str(m.start_year))
+                  explist = models.Expedition.objects.filter(year = str(m.start_year))
+                  if not explist:
+                      return   # help hack
+                  exp = explist[0]
                  for file_, (role, names) in team:
                      if names.strip("\t").strip(" ") == "both" or names.strip("\t").strip(" ") == "Both":
                          names = reduce(lambda x, y: x + u" & " + y,