equal
deleted
inserted
replaced
75 } |
75 } |
76 |
76 |
77 def command_status(markups: List[Markup]): Status = |
77 def command_status(markups: List[Markup]): Status = |
78 (Status.init /: markups)(command_status(_, _)) |
78 (Status.init /: markups)(command_status(_, _)) |
79 |
79 |
80 val command_status_elements: Set[String] = |
80 val command_status_elements = |
81 Set(Markup.ACCEPTED, Markup.FORKED, Markup.JOINED, Markup.RUNNING, |
81 Document.Elements(Markup.ACCEPTED, Markup.FORKED, Markup.JOINED, Markup.RUNNING, |
82 Markup.FINISHED, Markup.FAILED) |
82 Markup.FINISHED, Markup.FAILED) |
83 |
83 |
84 val status_elements: Set[String] = |
84 val status_elements = |
85 command_status_elements + Markup.WARNING + Markup.ERROR |
85 command_status_elements + Markup.WARNING + Markup.ERROR |
86 |
86 |
87 |
87 |
88 /* command timing */ |
88 /* command timing */ |
89 |
89 |
163 } |
163 } |
164 |
164 |
165 |
165 |
166 /* result messages */ |
166 /* result messages */ |
167 |
167 |
168 private val clean_elements = Set(Markup.REPORT, Markup.NO_REPORT) |
168 private val clean_elements = |
|
169 Document.Elements(Markup.REPORT, Markup.NO_REPORT) |
169 |
170 |
170 def clean_message(body: XML.Body): XML.Body = |
171 def clean_message(body: XML.Body): XML.Body = |
171 body filter { |
172 body filter { |
172 case XML.Wrapped_Elem(Markup(name, _), _, _) => !clean_elements(name) |
173 case XML.Wrapped_Elem(Markup(name, _), _, _) => !clean_elements(name) |
173 case XML.Elem(Markup(name, _), _) => !clean_elements(name) |
174 case XML.Elem(Markup(name, _), _) => !clean_elements(name) |
274 |
275 |
275 |
276 |
276 /* reported positions */ |
277 /* reported positions */ |
277 |
278 |
278 private val position_elements = |
279 private val position_elements = |
279 Set(Markup.BINDING, Markup.ENTITY, Markup.REPORT, Markup.POSITION) |
280 Document.Elements(Markup.BINDING, Markup.ENTITY, Markup.REPORT, Markup.POSITION) |
280 |
281 |
281 def message_positions( |
282 def message_positions( |
282 command_id: Document_ID.Command, |
283 command_id: Document_ID.Command, |
283 alt_id: Document_ID.Generic, |
284 alt_id: Document_ID.Generic, |
284 chunk: Command.Chunk, |
285 chunk: Command.Chunk, |