Changeset 11 for trunk/Ean.pas

Timestamp:

Apr 15, 2026, 10:17:17 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: EAN address as separate field.

File:

• trunk/Ean.pas (modified) (7 diffs)

trunk/Ean.pas

@@ -36 +36 @@
     Number: string;
     Owner: string;
+    Address: string;
     DistributionTariff: string;
     PriceLow: Double;
@@ -58 +59 @@
   TEans = class(TObjectList<TEan>)
     function SearchByNumber(Number: string): TEan;
-    function SearchByOwner(Owner: string): TEan;
+    function SearchByOwnerKind(Owner: string; Kind: TEanKind): TEan;
     procedure LoadToStrings(Strings: TStrings; AllowNone: Boolean = False);
     procedure LoadFromXmlNode(Node: TDOMNode);
@@ -241 +242 @@
   Number := ReadString(Node, 'Number', Number);
   Owner := ReadString(Node, 'Owner', Owner);
+  Address := ReadString(Node, 'Address', Address);
   DistributionTariff := ReadString(Node, 'DistributionTariff', DistributionTariff);
   PriceLow := ReadDouble(Node, 'PriceLow', PriceLow);
@@ -258 +260 @@
   if Number <> '' then WriteString(Node, 'Number', Number);
   if Owner <> '' then WriteString(Node, 'Owner', Owner);
+  if Address <> '' then WriteString(Node, 'Address', Address);
   if DistributionTariff <> '' then WriteString(Node, 'DistributionTariff', DistributionTariff);
   if PriceLow <> 0 then WriteDouble(Node, 'PriceLow', PriceLow);
@@ -294 +297 @@
 end;
 
-function TEans.SearchByOwner(Owner: string): TEan;
+function TEans.SearchByOwnerKind(Owner: string; Kind: TEanKind): TEan;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (Items[I].Owner <> Owner) do Inc(I);
+  while (I < Count) and ((Items[I].Owner <> Owner) or (Items[I].Kind <> Kind)) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;
@@ -308 +311 @@
   I: Integer;
   Shift: Integer;
+  Text: string;
 begin
   if AllowNone then Shift := 1 else Shift := 0;
@@ -315 +319 @@
     while Strings.Count < Count + Shift do Strings.Add('');
     for I := 0 to Count - 1 do begin
-      Strings[I + Shift] := Items[I].Number + ' (' + Items[I].Owner + ')';
+      Text := EanKindText[Items[I].Kind];
+      if Items[I].Address <> '' then Text := Items[I].Address + ', ' + Text;
+      if Items[I].Owner <> '' then Text := Items[I].Owner + ', ' + Text;
+      Text := Items[I].Number + ' (' + Text + ')';
+      Strings[I + Shift] := Text;
       Strings.Objects[I + Shift] := Items[I];
     end;