Merge pull request #300 from eregs/dont-expand-long-reserved-section-spans

[WIP] Merge spans longer than 3 reserved sections

Author: cmc333333

regparser/tree/xml_parser/reg_text.py

@@ -267,20 +267,29 @@ def build_from_section(reg_part, section_xml):
             secnum_candidate = int(secnum_candidate)
         section_nums.append(secnum_candidate)
 
-    #  Span of section numbers
+    #  Merge spans longer than 3 sections
+    section_span_end = None
     if u'§§' == section_no[:2] and '-' in section_no:
         first, last = section_nums
-        section_nums = []
-        for i in range(first, last + 1):
-            section_nums.append(i)
+        if last - first + 1 > 3:
+            section_span_end = str(last)
+            section_nums = [first]
+        else:
+            section_nums = []
+            for i in range(first, last + 1):
+                section_nums.append(i)
 
     section_nodes = []
     for section_number in section_nums:
         section_number = str(section_number)
         section_text = (section_xml.text or '').strip()
         tagged_section_text = section_xml.text
 
-        section_title = u"§ " + reg_part + "." + section_number
+        if section_span_end:
+            section_title = u"§§ {}.{}-{}".format(
+                    reg_part, section_number, section_span_end)
+        else:
+            section_title = u"§ {}.{}".format(reg_part, section_number)
         if subject_text:
             section_title += " " + subject_text
 

tests/tree_xml_parser_reg_text_tests.py

@@ -82,7 +82,7 @@ def test_build_from_section_reserved(self):
         self.assertEqual(u'§ 8675.309 [Reserved]', node.title)
         self.assertEqual([], node.children)
 
-    def test_build_from_section_reserved_range(self):
+    def test_build_from_3_section_reserved_range(self):
         with XMLBuilder("SECTION") as ctx:
             ctx.SECTNO(u"§§ 8675.309-8675.311")
             ctx.RESERVED("[Reserved]")
@@ -94,6 +94,14 @@ def test_build_from_section_reserved_range(self):
         self.assertEqual(u'§ 8675.310 [Reserved]', n310.title)
         self.assertEqual(u'§ 8675.311 [Reserved]', n311.title)
 
+    def test_build_from_4_section_reserved_range(self):
+        with XMLBuilder("SECTION") as ctx:
+            ctx.SECTNO(u"§§ 8675.309-8675.312")
+            ctx.RESERVED("[Reserved]")
+        n309 = reg_text.build_from_section('8675', ctx.xml)[0]
+        self.assertEqual(n309.label, ['8675', '309'])
+        self.assertEqual(u'§§ 8675.309-312 [Reserved]', n309.title)
+
     def _setup_for_ambiguous(self, final_par):
         with self.section() as ctx:
             ctx.P("(g) Some Content")