Changeset 7 for trunk/EdcProject.pas

Timestamp:

Apr 13, 2026, 7:11:03 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Store imported values in EdcProject.

File:

• trunk/EdcProject.pas (modified) (10 diffs)

trunk/EdcProject.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, Generics.Defaults, XML, DateUtils,
-  fphttpclient, opensslsockets, Ean, DOM, XMLRead, XMLWrite, Common, CsvDocument,
+  Ean, DOM, XMLRead, XMLWrite, Common, CsvDocument,
   SpotPrice;
 
@@ -48 +48 @@
   I: Integer;
 begin
+  for I := 0 to Eans.Count - 1 do
+    Eans[I].Values.Clear;
+
   Reports := TStringList.Create;
   try
@@ -59 +62 @@
   for I := 0 to Eans.Count - 1 do
     Eans[I].Values.Sort(TComparer<TEanValue>.Construct(Eans[I].Values.Comparer));
+
 
   CreateEan('', STotalSupply, ekSupply);
@@ -102 +106 @@
     AppendChild(RootNode);
 
-    NewNode := RootNode.OwnerDocument.CreateElement(EansName);
-    RootNode.AppendChild(NewNode);
-    Eans.SaveToXmlNode(NewNode);
-
-    NewNode := RootNode.OwnerDocument.CreateElement(SpotPricesName);
-    RootNode.AppendChild(NewNode);
-    SpotPrices.SaveToXmlNode(NewNode);
+    if Eans.Count > 0 then begin
+      NewNode := RootNode.OwnerDocument.CreateElement(EansName);
+      RootNode.AppendChild(NewNode);
+      Eans.SaveToXmlNode(NewNode);
+    end;
+
+    if SpotPrices.Count > 0 then begin
+      NewNode := RootNode.OwnerDocument.CreateElement(SpotPricesName);
+      RootNode.AppendChild(NewNode);
+      SpotPrices.SaveToXmlNode(NewNode);
+    end;
 
     if ExtractFileDir(FileName) <> '' then
@@ -136 +144 @@
   C: Integer;
   CSVDoc: TCSVDocument;
+  Date: TDateTime;
   TimeFrom: TDateTime;
   TimeTo: TDateTime;
@@ -147 +156 @@
   try
     CSVDoc.Delimiter := ';';
-    //BufferedFileStream := TBufferedFileStream.Create(FileName, fmOpenRead);
-    //CSVDoc.LoadFromStream(BufferedFileStream);
     CSVDoc.LoadFromFile(FileName);
-    //BufferedFileStream.Free;
 
     for C := 0 to ((CSVDoc.ColCount[0] - 3) div 2) - 1 do begin
@@ -172 +178 @@
       Ean.Kind := EanKind;
 
+      Ean.Values.Capacity := Ean.Values.Count + CSVDoc.RowCount;
+
       for R := 1 to CSVDoc.RowCount - 1 do begin
-        TimeFrom := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[1, R]);
-        TimeTo := StrToDate(CSVDoc.Cells[0, R]) + StrToTime(CSVDoc.Cells[2, R]);
+        Date := StrToDate(CSVDoc.Cells[0, R]);
+        TimeFrom := Date + StrToTime(CSVDoc.Cells[1, R]);
+        TimeTo := Date + StrToTime(CSVDoc.Cells[2, R]);
 
         CellValueIn := 0;
@@ -203 +212 @@
   Value: TEanValue;
 begin
-  Ean := TEan.Create;
-  Ean.Number := Number;
-  Ean.Owner := Owner;
-  Ean.Kind := Kind;
+  Ean := Eans.SearchByOwner(Owner);
+  if not Assigned(Ean) then begin
+    Ean := TEan.Create;
+    Ean.Number := Number;
+    Ean.Owner := Owner;
+    Ean.Kind := Kind;
+    Eans.Add(Ean);
+  end;
+
+  Ean.Values.Clear;
 
   Values := TDictionary<TDateTime, TEanValue>.Create;
@@ -223 +238 @@
 
   ValuesArray := Values.ToArray;
+  Ean.Values.Capacity := Values.Count;
   for I := 0 to Values.Count - 1 do begin
     Ean.Values.Add(TEanValue.Create(ValuesArray[I].Key, ValuesArray[I].Value.ValueIn, ValuesArray[I].Value.ValueOut));
@@ -229 +245 @@
 
   Values.Free;
-
-  Eans.Add(Ean);
 end;