X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Tasks%2FmTaskTask.icl;h=27edc82a3658d62e1c7013e45d0736c9dd6a8450;hb=71726cdfddd9dfa11395f10ef3b5af28613fd5a0;hp=9bd56126d40de228dd6863dfd121db21b30ec112;hpb=41ba74ece94d91858a6683a58a0f064c36900c4b;p=mTask.git diff --git a/Tasks/mTaskTask.icl b/Tasks/mTaskTask.icl index 9bd5612..27edc82 100644 --- a/Tasks/mTaskTask.icl +++ b/Tasks/mTaskTask.icl @@ -17,7 +17,7 @@ sendTaskToDevice wta mTask (device, timeout) = get bcStateStore @ toMessages timeout mTask >>= \(msgs, st1)->set st1 bcStateStore >>| toSDSRecords msgs st1 device - >>= \sdss->upd (mergeShares sdss) sdsStore + >>= \sdss->updateShares device ((++) sdss) >>| sendMessages msgs device >>| makeTask wta -1 >>= withDevices device o addTask @@ -27,12 +27,8 @@ sendTaskToDevice wta mTask (device, timeout) = toSDSRecords :: [MTaskMSGSend] BCState MTaskDevice -> Task [MTaskShare] toSDSRecords s st device = treturn - [makeShare wta device.deviceName sdsi sdsval - \\{sdsi,sdspub,sdsval}<-st.sdss - , (MTSds sdsi` _)<-s - | sdsi == sdsi`] - - mergeShares a b = a ++ b + [makeShare wta sdsi sdsval + \\{sdsi,sdsval}<-st.sdss, (MTSds sdsi` _)<-s | sdsi == sdsi`] addTask :: MTaskTask MTaskDevice -> MTaskDevice addTask task device = {device & deviceTasks=[task:device.deviceTasks]}