From 225ee35143d9ea5c5da41f84e063bbcfdf49e7ca Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Thu, 27 Jun 2024 16:30:39 +0200
Subject: [PATCH] Aggiunta commentata in CameraSrv x recuperare DDF fisso...

---
 WebDoorCreator.CamSrv/ProcMan.vb             | 17 +++++++++++++++--
 WebDoorCreator.SDK/WDC.cs                    |  6 +++---
 WebDoorCreator.SDK/WebDoorCreator.SDK.csproj |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/WebDoorCreator.CamSrv/ProcMan.vb b/WebDoorCreator.CamSrv/ProcMan.vb
index e79a5fa..9a6f7d0 100644
--- a/WebDoorCreator.CamSrv/ProcMan.vb
+++ b/WebDoorCreator.CamSrv/ProcMan.vb
@@ -921,10 +921,23 @@ Public Class ProcMan
                      End If
                   End If
                   If m_bCheckOrder Then
-                     Dim LastRequest As Dictionary(Of String, String) = currWDC.queueList(1)
+                     Dim LastRequest As Dictionary(Of String, CalcReqtDTO) = currWDC.queueList(1)
                      If LastRequest.Count > 0 Then
                         MyThreadData.SetThreadOperation(ThreadOperations.FoundRequest)
-                        MyThreadData.SetCurrRequest(LastRequest.First())
+                        
+                        ' ToDo !!!
+                        ' gestione cablata x soli svg... 
+                        ' da qui implementazione svg/3dm...
+                        If LastRequest.First().Value.MimeType = "3dm" Then
+                        End If  
+
+                        Dim ConvItem As KeyValuePair(Of String, String)
+                        ConvItem = New KeyValuePair(Of String, String)(LastRequest.First().Key, LastRequest.First().Value.DDF)
+                        MyThreadData.SetCurrRequest(ConvItem)
+
+                        ' vecchia versione
+                        'MyThreadData.SetCurrRequest(LastRequest.First())
+
                         Dim Item As KeyValuePair(Of String, String) = MyThreadData.CurrRequest
                         Dim bOk As Boolean = Not IsNothing(Item)
                         If bOk Then
diff --git a/WebDoorCreator.SDK/WDC.cs b/WebDoorCreator.SDK/WDC.cs
index a49b695..ed5d308 100644
--- a/WebDoorCreator.SDK/WDC.cs
+++ b/WebDoorCreator.SDK/WDC.cs
@@ -125,9 +125,9 @@ namespace WebDoorCreator.SDK
         /// <summary>
         /// Elenco degli item da processare, nel formato DoorId, Vers
         /// </summary>
-        public Dictionary<string, string> queueList(int maxNum)
+        public Dictionary<string, CalcReqtDTO> queueList(int maxNum)
         {
-            Dictionary<string, string> returnData = new Dictionary<string, string>();
+            Dictionary<string, CalcReqtDTO> returnData = new Dictionary<string, CalcReqtDTO>();
             Dictionary<string, string> parList = new Dictionary<string, string>()
                 {
                     { "numItems", $"{maxNum}" }
@@ -135,7 +135,7 @@ namespace WebDoorCreator.SDK
             var rawData = callUrlGet(urlTakeNextItems, parList);
             if (!string.IsNullOrEmpty(rawData) && rawData != "ERR")
             {
-                returnData = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
+                returnData = JsonConvert.DeserializeObject<Dictionary<string, CalcReqtDTO>>(rawData);
             }
             return returnData;
         }
diff --git a/WebDoorCreator.SDK/WebDoorCreator.SDK.csproj b/WebDoorCreator.SDK/WebDoorCreator.SDK.csproj
index e0b3223..81af0b0 100644
--- a/WebDoorCreator.SDK/WebDoorCreator.SDK.csproj
+++ b/WebDoorCreator.SDK/WebDoorCreator.SDK.csproj
@@ -76,6 +76,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CalcReqDTO.cs" />
     <Compile Include="CalcResultDTO.cs" />
     <Compile Include="ProcStats.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />