added new property mrSubrecordErrors to TwbMainRecord, helper functio…

…n to add a new subrecord error, and populating of these errors in the TwbMainRecord.Init function Exposed through property GetSubrecordErrors
matortheeternal · May 24, 2016 · caac0e6 · caac0e6
1 parent a0593c7
commit caac0e6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/xedit/wbImplementation.pas b/lib/xedit/wbImplementation.pas
@@ -864,6 +864,7 @@   TwbMainRecord = class(TwbRecord, IwbMainRecord, IwbMainRecordInternal, IwbMain
     mrOverridesSorted  : Boolean;
     mrEditorID         : string;
     mrFullName         : string;
+    mrSubrecordErrors  : string;
     mrStates           : TwbMainRecordStates;
     mrBaseRecordID     : Cardinal;
     mrConflictAll      : TConflictAll;
@@ -885,6 +886,7 @@   TwbMainRecord = class(TwbRecord, IwbMainRecord, IwbMainRecordInternal, IwbMain
     procedure ElementChanged(const aElement: IwbElement; aContainer: Pointer); override;
     function RemoveElement(aPos: Integer; aMarkModified: Boolean = False): IwbElement; overload; override;
     function ResolveElementName(aName: string; out aRemainingName: string; aCanCreate: Boolean = False): IwbElement; override;
+    procedure SubrecordError(sig: string);
 
     function GetIsInjected: Boolean; override;
     function GetReferencesInjected: Boolean; override;
@@ -974,6 +976,7 @@   TwbMainRecord = class(TwbRecord, IwbMainRecord, IwbMainRecordInternal, IwbMain
     function GetReferencedBy(aIndex: Integer): IwbMainRecord;
     function GetReferencedByCount: Integer;
     function GetCheck: string; override;
+    function GetSubrecordErrors: string;
     function GetIsWinningOverride: Boolean;
     function GetWinningOverride: IwbMainRecord;
     function GetHighestOverrideOrSelf(aMaxLoadOrder: Integer): IwbMainRecord;
@@ -6030,7 +6033,8 @@ procedure TwbMainRecord.Init;
     Exit;
 
   DecompressIfNeeded;
-
+
+  mrSubrecordErrors := '';
   FoundError := False;
 
   if not (mrsQuickInit in mrStates) then begin
@@ -6088,6 +6092,7 @@ procedure TwbMainRecord.Init;
     if mrDef.AllowUnordered then begin
       CurrentDefPos := mrDef.GetMemberIndexFor(CurrentRec.Signature, CurrentRec);
       if CurrentDefPos < 0 then begin
+        SubrecordError(String(CurrentRec.Signature));
         if Assigned(wbProgressCallback) then
           wbProgressCallback('Error: record '+ String(GetSignature) + ' contains unexpected (or out of order) subrecord ' + String(CurrentRec.Signature) + ' ' + IntToHex(Int64(Cardinal(CurrentRec.Signature)), 8) );
         FoundError := True;
@@ -6097,6 +6102,7 @@ procedure TwbMainRecord.Init;
       CurrentDef := mrDef.Members[CurrentDefPos];
     end else begin
       if not mrDef.ContainsMemberFor(CurrentRec.Signature, CurrentRec) then begin
+        SubrecordError(String(CurrentRec.Signature));
         if Assigned(wbProgressCallback) then
           wbProgressCallback('Error: record '+ String(GetSignature) + ' contains unexpected (or out of order) subrecord ' + String(CurrentRec.Signature) + ' ' + IntToHex(Int64(Cardinal(CurrentRec.Signature)), 8) );
         FoundError := True;
@@ -6111,6 +6117,7 @@ procedure TwbMainRecord.Init;
           Continue;
         end;
       end else begin
+        SubrecordError(String(CurrentRec.Signature));
         if Assigned(wbProgressCallback) then
           wbProgressCallback('Error: record '+ String(GetSignature) + ' contains unexpected (or out of order) subrecord ' + String(CurrentRec.Signature) );
         FoundError := True;
@@ -6189,6 +6196,7 @@ procedure TwbMainRecord.Init;
       Continue;
     end;
 
+    SubrecordError(String(CurrentRec.Signature));
     if Assigned(wbProgressCallback) then
       wbProgressCallback('Error: record '+ String(GetSignature) + ' contains unexpected (or out of order) subrecord ' + String(CurrentRec.Signature) );
     FoundError := True;
@@ -6475,6 +6483,19 @@ function TwbMainRecord.GetCheck: string;
   end;
 end;
 
+function TwbMainRecord.GetSubrecordErrors: String;
+begin
+  Result := mrSubrecordErrors;
+end;
+
+procedure TwbMainRecord.SubrecordError(sig: String);
+begin
+  if mrSubrecordErrors = '' then
+    mrSubrecordErrors := sig
+  else
+    mrSubrecordErrors := mrSubrecordErrors + ',' + sig;
+end;
+
 function TwbMainRecord.GetChildGroup: IwbGroupRecord;
 var
   SearchForGroup: Integer;

diff --git a/lib/xedit/wbInterface.pas b/lib/xedit/wbInterface.pas
@@ -945,6 +945,7 @@   TwbGridCell = record
     procedure SetEditorID(const aValue: string);
     function GetFullName: string;
     function GetDisplayNameKey: string;
+    function GetSubrecordErrors: string;
     function GetMaster: IwbMainRecord;
     function GetIsMaster: Boolean;
     function GetMasterOrSelf: IwbMainRecord;
@@ -1029,6 +1030,8 @@   TwbGridCell = record
       read GetFullName;
     property DisplayNameKey: string
       read GetDisplayNameKey;
+    property SubrecordErrors: string
+      read GetSubrecordErrors;
 
     property Flags: TwbMainRecordStructFlags
       read GetFlags;