Fix serialization of simple type attributes

aothms · aothms · commit 68e60f05860a · 2014-06-07T11:47:26.000+02:00
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -891,7 +891,9 @@ std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {
 
 	for ( MapEntityById::const_iterator it = f.begin(); it != f.end(); ++ it ) {
 		const IfcEntity e = it->second;
-		os << e->entity->toString(true) << ";" << std::endl;
+		if (!IfcSchema::Type::IsSimple(e->type())) {
+			os << e->entity->toString(true) << ";" << std::endl;
+		}
 	}
 
 	os << "ENDSEC;" << std::endl;
diff --git a/src/ifcparse/IfcWrite.cpp b/src/ifcparse/IfcWrite.cpp
@@ -84,8 +84,10 @@ std::string IfcWritableEntity::toString(bool upper) {
 	if ( upper ) {
 		for (std::string::iterator p = dt.begin(); p != dt.end(); ++p ) *p = toupper(*p);
 	}
-	if ( _id ) ss << "#" << *_id;
-	ss << "=" << dt << "(";
+	if ( _id && !IfcSchema::Type::IsSimple(_type) ) {
+		ss << "#" << *_id << "=";
+	}
+	ss << dt << "(";
 	for ( std::map<int,ArgumentPtr>::const_iterator it = args.begin(); it != args.end(); ++ it ) {
 		if ( it != args.begin() ) ss << ",";
 		const ArgumentPtr a = it->second;

Original file line number	Diff line number	Diff line change
`@@ -891,7 +891,9 @@ std::ostream& operator<< (std::ostream& os, const IfcParse::IfcFile& f) {`
`891`	`891`
`892`	`892`	`for ( MapEntityById::const_iterator it = f.begin(); it != f.end(); ++ it ) {`
`893`	`893`	`const IfcEntity e = it->second;`
`894`		`- os << e->entity->toString(true) << ";" << std::endl;`
	`894`	`+ if (!IfcSchema::Type::IsSimple(e->type())) {`
	`895`	`+ os << e->entity->toString(true) << ";" << std::endl;`
	`896`	`+ }`
`895`	`897`	`}`
`896`	`898`
`897`	`899`	`os << "ENDSEC;" << std::endl;`