From 41cbdaadbada33a8586515b8c07defbc6a74ec43 Mon Sep 17 00:00:00 2001 From: "Stieber Daniel (CSC FI SPS MESLEO)" Date: Mon, 3 Mar 2025 20:21:49 +0100 Subject: [PATCH] Merged PR 11921: improved GetActiveOrders reliability improved GetActiveOrders reliability --- LSL2/STPROC/NICA_ORDERS_SERVICES.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt index 504288a..ba8b1b7 100644 --- a/LSL2/STPROC/NICA_ORDERS_SERVICES.txt +++ b/LSL2/STPROC/NICA_ORDERS_SERVICES.txt @@ -74,7 +74,12 @@ Service GetOrderIds(EntityType=ENTITY_TYPES, EntityID, OrderTypes=ORDER_TYPES, O Query := @FM end If OrderStatus NE '' then Query := 'ORDER_STATUS' : @VM : OrderStatus : @FM - If IsComplete NE '' then Query := 'IS_COMPLETE' : @VM : IsComplete : @FM + If IsComplete NE '' then + Query := 'IS_COMPLETE' + For each Val in IsComplete using @VM + Query := @VM : Val + Next Val + end Btree.Extract(Query, Table, hDict, OrderKeys, Option, Flag) If Flag NE 0 then ErrorMsg = 'Error in ':Service:' service. Btree.Extract call failed.' @@ -161,7 +166,7 @@ end service Service GetActiveOrders(EntityType=ENTITY_TYPES, EntityId, OrderTypes=ORDER_TYPES) - Response = Nica_Orders_Services('GetOrderIds', EntityType, EntityID, OrderTypes, '#cancelled', False$) + Response = Nica_Orders_Services('GetOrderIds', EntityType, EntityID, OrderTypes, '#cancelled', False$:@VM:'') end service @@ -640,3 +645,4 @@ end service // Internal GoSubs //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +