# HG changeset patch # User casties # Date 1481282661 -3600 # Node ID 277ea02906f98c1d8d1426126df20468516b8638 # Parent 4692e90215ebb6d02767450f7d08e8e895b67ba4 update for changes in log format. diff -r 4692e90215eb -r 277ea02906f9 importFromOpenMind/importer/check_ismi_log.py --- a/importFromOpenMind/importer/check_ismi_log.py Thu Dec 08 20:41:33 2016 +0100 +++ b/importFromOpenMind/importer/check_ismi_log.py Fri Dec 09 12:24:21 2016 +0100 @@ -306,7 +306,7 @@ deleteCtx = parseStart(line) if deleting > 1: - log("ERROR", "Concurrent delete (%s) in #%s of %s"%(saving, linecnt, line)) + log("ERROR", "Concurrent delete (%s) in #%s of %s"%(deleting, linecnt, line)) # TODO: what now? break @@ -314,7 +314,7 @@ if '* START save previous' in line: savingPrev += 1 - elif '* End ...save previous' in line: + elif '* END ...save previous' in line or '* End ...save previous' in line: if deleting > 0 and savingPrev > 0: # this should be the end of the save prev from deleting deleting -= 1 @@ -322,7 +322,7 @@ savingPrev -= 1 - if saving < 0: + if savingPrev < 0: log("ERROR", "Too many END save previous!") elif 'save previous' in line: