Mercurial > hg > drupalISMI
comparison importFromOpenMind/importer/check_ismi_log.py @ 41:5b3cd0b66b30
fix bug with multiple-saved nodes.
author | casties |
---|---|
date | Wed, 02 Nov 2016 16:56:27 +0100 |
parents | f38ca3eb1088 |
children | 4dee9586cc44 |
comparison
equal
deleted
inserted
replaced
40:f38ca3eb1088 | 41:5b3cd0b66b30 |
---|---|
8 | 8 |
9 # do not output deleted nodes | 9 # do not output deleted nodes |
10 omitDeleted = True | 10 omitDeleted = True |
11 | 11 |
12 # active log levels for logging | 12 # active log levels for logging |
13 #logLevels = {'DEBUG', 'INFO', 'WARNING', 'ERROR', 'SYSMSG'} | 13 logLevels = {'DEBUG', 'INFO', 'WARNING', 'ERROR', 'SYSMSG'} |
14 #logLevels = {'INFO', 'WARNING', 'ERROR', 'SYSMSG'} | 14 #logLevels = {'INFO', 'WARNING', 'ERROR', 'SYSMSG'} |
15 logLevels = {'ERROR', 'SYSMSG'} | 15 #logLevels = {'ERROR', 'SYSMSG'} |
16 | 16 |
17 def log(level, message): | 17 def log(level, message): |
18 if level in logLevels: | 18 if level in logLevels: |
19 print("%s: %s"%(level, message)) | 19 print("%s: %s"%(level, message)) |
20 | 20 |
158 | 158 |
159 return None | 159 return None |
160 | 160 |
161 | 161 |
162 def compareNodeLists(prev, cur, ctx, lostFile=None): | 162 def compareNodeLists(prev, cur, ctx, lostFile=None): |
163 """compare list of previous and current nodes. | |
164 | |
165 prints results to the log and output file. | |
166 """ | |
163 prevNodes = {} | 167 prevNodes = {} |
164 curNodes = {} | 168 curNodes = {} |
165 | 169 |
166 # | 170 # |
167 # read nodes | 171 # read nodes |
222 | 226 |
223 curNodeUnchecked.remove(nid) | 227 curNodeUnchecked.remove(nid) |
224 | 228 |
225 # make list of additional current (=new) nodes | 229 # make list of additional current (=new) nodes |
226 for nid in curNodeUnchecked: | 230 for nid in curNodeUnchecked: |
227 addCurNodes.append(curNodes[nid]) | 231 curNode = curNodes[nid] |
232 # list can contain lists | |
233 if isinstance(curNode, list): | |
234 # use the last version(?) | |
235 curNode = curNode[-1] | |
236 | |
237 addCurNodes.append(curNode) | |
228 log("DEBUG", "new node %s"%curNodes[nid]) | 238 log("DEBUG", "new node %s"%curNodes[nid]) |
229 | 239 |
230 # compare missing and new nodes | 240 # compare missing and new nodes |
231 for n in addPrevNodes.copy(): | 241 for n in addPrevNodes.copy(): |
232 sn = getSimilarNode(n, addCurNodes) | 242 sn = getSimilarNode(n, addCurNodes) |