Commit 7a72c101111cd9df8d09c0ca1208b8cd878e3126

Authored by Geoffrey PREUD'HOMME
1 parent ab9e873d

Stricter verification of adjacent lessons

Also removed debug echo. Again.
Showing 1 changed file with 2 additions and 3 deletions   Show diff stats
@@ -278,19 +278,18 @@ for day in days: @@ -278,19 +278,18 @@ for day in days:
278 for slot in range(len(SLOTS)): 278 for slot in range(len(SLOTS)):
279 event = days[day][slot] 279 event = days[day][slot]
280 if prevEvent: 280 if prevEvent:
281 - if prevEvent.shortText == event.shortText: 281 + if prevEvent.longText == event.longText:
282 prevEvent.feedEndSlot(slot) 282 prevEvent.feedEndSlot(slot)
283 else: 283 else:
284 prevEvent.endFeed() 284 prevEvent.endFeed()
285 events.append(prevEvent) 285 events.append(prevEvent)
286 - if not prevEvent or (prevEvent and prevEvent.shortText != event.shortText): 286 + if not prevEvent or (prevEvent and prevEvent.longText != event.longText):
287 event.feedDate(day) 287 event.feedDate(day)
288 event.feedBegSlot(slot) 288 event.feedBegSlot(slot)
289 event.feedEndSlot(slot) 289 event.feedEndSlot(slot)
290 prevEvent = event 290 prevEvent = event
291 prevEvent.endFeed() 291 prevEvent.endFeed()
292 events.append(prevEvent) 292 events.append(prevEvent)
293 -print(287, len(events))  
294 293
295 # Creating calendar 294 # Creating calendar
296 cal = Calendar() 295 cal = Calendar()