Skip to content

Commit 833386c

Browse files
committed
additonal entry header conflict checks
1 parent 5d7a2e0 commit 833386c

5 files changed

Lines changed: 23 additions & 9 deletions

File tree

utilities/makelist/makelist.lpi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<VersionInfo>
1717
<UseVersionInfo Value="True"/>
1818
<MajorVersionNr Value="1"/>
19-
<MinorVersionNr Value="3"/>
19+
<MinorVersionNr Value="4"/>
2020
<StringTable LegalCopyright="(c) 2025-2026 Jerome Shidel" ProductName="The List Release File Assembler" ProductVersion="1.0"/>
2121
</VersionInfo>
2222
<BuildModes>

utilities/makelist/makelist.lpr

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,10 @@ function FileToSection(const Name : String; var Data : RawByteString;
535535
H[I]:=Trim(H[I]);
536536
case UpperCase(K) of
537537
'UNIQUE ID' : begin
538+
if IDSORT <> '' then begin
539+
LogMessage(vbMinimal, 'Multiple Unique ID fields for file: '+ Name);
540+
Result:=False;
541+
end;
538542
IDSORT:=V;
539543
IDLIST:=V;
540544
if H[I] <> '' then
@@ -546,11 +550,19 @@ function FileToSection(const Name : String; var Data : RawByteString;
546550
end;
547551
end;
548552
'SORT AS' : begin
549-
FSORTAS:=V;
550-
if H[I] <> '' then
551-
LogMessage(vbMinimal, 'Extraneous Data in Sort As for file: '+ Name);
553+
if FSORTAS <> '' then begin
554+
LogMessage(vbMinimal, 'Multiple Sort As fields for file: '+ Name);
555+
Result:=False;
556+
end;
557+
FSORTAS:=V;
558+
if H[I] <> '' then
559+
LogMessage(vbMinimal, 'Extraneous Data in Sort As for file: '+ Name);
552560
end;
553561
'CATEGORY' : begin
562+
if Category <> '' then begin
563+
LogMessage(vbMinimal, 'Multiple Category fields for file: '+ Name);
564+
Result:=False;
565+
end;
554566
if UpperCase(V) = 'N/A' then
555567
V := '-';
556568
If Length(V) > 1 then
@@ -571,8 +583,10 @@ function FileToSection(const Name : String; var Data : RawByteString;
571583
if FSORTAS <> '' then begin
572584
if IDSORT = IDLIST then
573585
IDSORT:=FSORTAS
574-
else
586+
else begin
587+
LogMessage(vbMinimal, 'Using both "-sort-as-" and "Sort As" is prohibited in file: '+ Name);
575588
Result:=False;
589+
end;
576590
end;
577591
end;
578592

utilities/makelist/makelist.lps

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<Filename Value="makelist.lpr"/>
99
<IsPartOfProject Value="True"/>
1010
<IsVisibleTab Value="True"/>
11-
<TopLine Value="520"/>
12-
<CursorPos X="32" Y="565"/>
13-
<FoldState Value=" T3Q0921912 pnIoV0S5 piXja0O011[M4lGoY033 PiXi10."/>
11+
<TopLine Value="540"/>
12+
<CursorPos X="72" Y="572"/>
13+
<FoldState Value=" T3Q0921912 pnIoV0S5 piXja0O011[M4lGp5033 PiXi100"/>
1414
<UsageCount Value="208"/>
1515
<Loaded Value="True"/>
1616
</Unit>

utilities/makelist/makelist.res

0 Bytes
Binary file not shown.

utilities/makelist/version.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ interface
1717

1818
const
1919
{ General Application Information }
20-
APP_VERSION: String = '1.3.0';
20+
APP_VERSION: String = '1.4.0';
2121
APP_BUILD: String = '0';
2222
APP_TITLE: String = 'makelist';
2323
APP_LEGALCOPYRIGHT: String = '(c) 2025-2026 Jerome Shidel';

0 commit comments

Comments
 (0)