only write BLOCK_RECORD table on R13+

tr3ysmith · Nov 29, 2021 · 73c0c37 · 73c0c37
1 parent ce94d5d
commit 73c0c37
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/build/table_generator.rs b/build/table_generator.rs
@@ -320,10 +320,29 @@ fn generate_table_writer(fun: &mut String, element: &Element) {
         "pub(crate) fn add_table_code_pairs(drawing: &Drawing, pairs: &mut Vec<CodePair>, write_handles: bool) {\n",
     );
     for table in &element.children {
+        let mut indention = "";
+        let mut predicates = vec![];
+        if !min_version(&table).is_empty() {
+            indention = "    ";
+            predicates.push(format!(
+                "drawing.header.version >= AcadVersion::{}",
+                min_version(&table)
+            ));
+        }
+        if predicates.len() != 0 {
+            fun.push_str(&format!(
+                "    if {predicate} {{\n",
+                predicate = predicates.join(" && ")
+            ));
+        }
         fun.push_str(&format!(
-            "    add_{collection}_code_pairs(pairs, drawing, write_handles);\n",
-            collection = attr(&table, "Collection")
+            "    {indention}add_{collection}_code_pairs(pairs, drawing, write_handles);\n",
+            collection = attr(&table, "Collection"),
+            indention = indention
         ));
+        if predicates.len() != 0 {
+            fun.push_str("    }\n");
+        }
     }
 
     fun.push_str("}\n");

diff --git a/spec/TableSpec.xml b/spec/TableSpec.xml
@@ -3,7 +3,7 @@
         <TableItem Name="AppId" ClassName="AcDbRegAppTableRecord">
         </TableItem>
     </Table>
-    <Table Collection="block_records" TypeString="BLOCK_RECORD">
+    <Table Collection="block_records" TypeString="BLOCK_RECORD" MinVersion="R13">
         <TableItem Name="BlockRecord" ClassName="AcDbBlockTableRecord" HasFlags="false">
             <Pointer Name="layout" Code="340" MinVersion="R2000" />
 

diff --git a/src/table.rs b/src/table.rs
@@ -404,4 +404,18 @@ mod tests {
         assert_eq!(1, ucss.len());
         assert_eq!("primary ucs", ucss[0].name);
     }
+
+    #[test]
+    fn block_record_table_not_written_on_r12() {
+        let mut drawing = Drawing::new();
+        drawing.header.version = AcadVersion::R12;
+        assert_not_contains_pairs(&drawing, vec![CodePair::new_str(0, "BLOCK_RECORD")]);
+    }
+
+    #[test]
+    fn block_record_table_is_written_on_r13() {
+        let mut drawing = Drawing::new();
+        drawing.header.version = AcadVersion::R13;
+        assert_contains_pairs(&drawing, vec![CodePair::new_str(0, "BLOCK_RECORD")]);
+    }
 }