DataScraping: More sanity checks

SunSerega · Jan 6, 2025 · a140776 · a140776
1 parent 3db134d
commit a140776
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/DataScraping/XML/ItemSources.pas b/DataScraping/XML/ItemSources.pas
@@ -56,6 +56,8 @@ interface
 
     protected constructor(name: TSourceName);
     begin
+      if name=nil then
+        raise nil;
       self._name := name;
       if name in all_sources then
         raise new InvalidOperationException($'Added {self} multiple times');

diff --git a/DataScraping/XML/OpenCL/ScrapXML.pas b/DataScraping/XML/OpenCL/ScrapXML.pas
@@ -226,6 +226,9 @@
       end;
       if throw_away then exit;
 
+      if gr_name=nil then
+        raise new InvalidOperationException($'<require> node with etype="{etype}" had no group attribute:{#10}{n.FullXmlText}');
+
       var gr_s := FindOrMakeSource(gr_name, nil);
       if gr_s<>nil then
       begin

diff --git a/Utils/ThoroughXML.pas b/Utils/ThoroughXML.pas
@@ -73,6 +73,8 @@ interface
     public property Tag: string read _raw.Name;
     public property Text: string read GetContent(()->_raw.InnerText);
 
+    public property FullXmlText: string read _raw.OuterXml;
+
     public function IterateParents: sequence of XmlNode;
     begin
       var curr := self;