Adding validation for uniqueness of service_id X date in calendar_dates

python/transitfeed.py

 #!/usr/bin/python2.5
 
 # Copyright (C) 2007 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 2434 matching lines @@
       yield (self.service_id, date, unicode(exception_type))
 
   def GetCalendarDatesFieldValuesTuples(self):
     """Return a list of date execeptions"""
     result = []
     for date_tuple in self.GenerateCalendarDatesFieldValuesTuples():
       result.append(date_tuple)
     result.sort()  # helps with __eq__
     return result
 
-  def SetDateHasService(self, date, has_service=True,
-                        problems=None):
+  def SetDateHasService(self, date, has_service=True, problems=None):
     if date in self.date_exceptions and problems:
       problems.DuplicateID(('service_id', 'date'),
                            (self.service_id, date),
                            type=TYPE_WARNING)
     self.date_exceptions[date] = has_service and 1 or 2
 
   def ResetDateToNormalService(self, date):
     if date in self.date_exceptions:
       del self.date_exceptions[date]
 
@@ skipping 1516 matching lines @@
               self._ReadCSV(file_name,
                             ServicePeriod._FIELD_NAMES,
                             ServicePeriod._FIELD_NAMES_REQUIRED):
         context = (file_name, row_num, row, cols)
         self._problems.SetFileContext(*context)
 
         period = ServicePeriod(field_list=row)
 
         if period.service_id in periods:
           self._problems.DuplicateID('service_id', period.service_id)
-          continue

[Tom, 2009/10/26 19:34:20]

else:
  periods[period.service_id] = (period, context) (from below)

self._problems.ClearContext()

[jirka, 2009/10/26 22:18:13]

On 2009/10/26 19:34:20, Tom wrote:
> else:
>   periods[period.service_id] = (period, context) (from below)
> 
> self._problems.ClearContext()

Done.

-
-        periods[period.service_id] = (period, context)
+        else:
+          periods[period.service_id] = (period, context)
+        self._problems.ClearContext()
 
     # process calendar_dates.txt
     if self._HasFile(file_name_dates):
       # ['service_id', 'date', 'exception_type']
       fields = ServicePeriod._FIELD_NAMES_CALENDAR_DATES
       for (row, row_num, cols) in self._ReadCSV(file_name_dates,
                                                 fields, fields):
         context = (file_name_dates, row_num, row, cols)
         self._problems.SetFileContext(*context)
 
         service_id = row[0]
 
         period = None
         if service_id in periods:
           period = periods[service_id][0]
         else:
           period = ServicePeriod(service_id)
           periods[period.service_id] = (period, context)
 
         exception_type = row[2]
         if exception_type == u'1':
           period.SetDateHasService(row[1], True, self._problems)
         elif exception_type == u'2':
           period.SetDateHasService(row[1], False, self._problems)
         else:
           self._problems.InvalidValue('exception_type', exception_type)
+        self._problems.ClearContext()
 

[Tom, 2009/10/26 19:34:20]

self._problems.ClearContext()

[jirka, 2009/10/26 22:18:13]

On 2009/10/26 19:34:20, Tom wrote:
> self._problems.ClearContext()

Done.

     # Now insert the periods into the schedule object, so that they're
     # validated with both calendar and calendar_dates info present
     for period, context in periods.values():
       self._problems.SetFileContext(*context)
       self._schedule.AddServicePeriodObject(period, self._problems)
       self._problems.ClearContext()
 
   def _LoadShapes(self):
     if not self._HasFile('shapes.txt'):
       return
@@ skipping 200 matching lines @@
   def __init__(self, *args, **kwargs):
     """Initialize a new ShapeLoader object.
 
     See Loader.__init__ for argument documentation.
     """
     Loader.__init__(self, *args, **kwargs)
 
   def Load(self):
     self._LoadShapes()
     return self._schedule