Rocksdb header parsing

aothms · aothms · commit de8c8d3bed85 · 2025-09-10T09:10:59.000+02:00
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -1352,6 +1352,7 @@ IfcFile::IfcFile(const std::string& fn, bool mmap) {
 IfcFile::IfcFile(const std::string& path, filetype ty, bool readonly)
     : schema_(nullptr)
     , max_id_(0)
+    , _header(this)
 {
     // @todo allow for rocksdb from path
     if (ty == FT_AUTODETECT) {
@@ -1441,7 +1442,7 @@ IfcFile::IfcFile(const IfcParse::schema_definition* schema, filetype ty, const s
     : schema_(schema)
     , ifcroot_type_(schema_->declaration_by_name("IfcRoot"))
     , max_id_(0)
-    , _header(ty == FT_ROCKSDB ? this : nullptr)
+    , _header(this)
 {
     if (ty == FT_AUTODETECT) {
         ty = guess_file_type(path);
@@ -2793,7 +2794,7 @@ AttributeValue IfcEntityInstanceData::get_attribute_value(void* storage, const I
     if (storage_) {
         return AttributeValue(storage_, (uint8_t)index);
     } else {
-        return AttributeValue((IfcParse::impl::rocks_db_file_storage*)storage, identity, decl->as_entity() ? 1 : 0, index);
+        return AttributeValue((IfcParse::impl::rocks_db_file_storage*)storage, identity, decl, index);
     }
 }
 
diff --git a/src/ifcparse/IfcSpfHeader.cpp b/src/ifcparse/IfcSpfHeader.cpp
@@ -87,6 +87,15 @@ IfcParse::IfcSpfHeader::IfcSpfHeader(IfcParse::IfcFile* file)
             }
             return nullptr;
         }, file_->storage_);
+
+        if (storage_ == nullptr) {
+            file_description_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_description::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_description>();
+            file_description_->file_ = file_;
+            file_name_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_name::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_name>();
+            file_name_->file_ = file_;
+            file_schema_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_schema::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_schema>();
+            file_schema_->file_ = file_;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1352,6 +1352,7 @@ IfcFile::IfcFile(const std::string& fn, bool mmap) {`
`1352`	`1352`	`IfcFile::IfcFile(const std::string& path, filetype ty, bool readonly)`
`1353`	`1353`	`: schema_(nullptr)`
`1354`	`1354`	`, max_id_(0)`
	`1355`	`+ , _header(this)`
`1355`	`1356`	`{`
`1356`	`1357`	`// @todo allow for rocksdb from path`
`1357`	`1358`	`if (ty == FT_AUTODETECT) {`
`@@ -1441,7 +1442,7 @@ IfcFile::IfcFile(const IfcParse::schema_definition* schema, filetype ty, const s`
`1441`	`1442`	`: schema_(schema)`
`1442`	`1443`	`, ifcroot_type_(schema_->declaration_by_name("IfcRoot"))`
`1443`	`1444`	`, max_id_(0)`
`1444`		`- , _header(ty == FT_ROCKSDB ? this : nullptr)`
	`1445`	`+ , _header(this)`
`1445`	`1446`	`{`
`1446`	`1447`	`if (ty == FT_AUTODETECT) {`
`1447`	`1448`	`ty = guess_file_type(path);`
`@@ -2793,7 +2794,7 @@ AttributeValue IfcEntityInstanceData::get_attribute_value(void* storage, const I`
`2793`	`2794`	`if (storage_) {`
`2794`	`2795`	`return AttributeValue(storage_, (uint8_t)index);`
`2795`	`2796`	`} else {`
`2796`		`- return AttributeValue((IfcParse::impl::rocks_db_file_storage*)storage, identity, decl->as_entity() ? 1 : 0, index);`
	`2797`	`+ return AttributeValue((IfcParse::impl::rocks_db_file_storage*)storage, identity, decl, index);`
`2797`	`2798`	`}`
`2798`	`2799`	`}`
`2799`	`2800`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,15 @@ IfcParse::IfcSpfHeader::IfcSpfHeader(IfcParse::IfcFile* file)`
`87`	`87`	`}`
`88`	`88`	`return nullptr;`
`89`	`89`	`}, file_->storage_);`
	`90`	`+`
	`91`	`+ if (storage_ == nullptr) {`
	`92`	`+ file_description_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_description::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_description>();`
	`93`	`+ file_description_->file_ = file_;`
	`94`	`+ file_name_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_name::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_name>();`
	`95`	`+ file_name_->file_ = file_;`
	`96`	`+ file_schema_ = Header_section_schema::get_schema().instantiate(&Header_section_schema::file_schema::Class(), IfcEntityInstanceData(rocks_db_attribute_storage{}))->as<Header_section_schema::file_schema>();`
	`97`	`+ file_schema_->file_ = file_;`
	`98`	`+ }`
`90`	`99`	`}`
`91`	`100`	`}`
`92`	`101`