Removes IfcFile::Dup in favour of accessing one of the

Luke Brooks · Luke Brooks · commit a421f48a73a0 · 2017-08-16T09:57:29.000+01:00
`IfcFile::Init` methods via the Python wrapper.
diff --git a/src/ifcparse/IfcFile.h b/src/ifcparse/IfcFile.h
@@ -106,7 +106,7 @@ class IFC_PARSE_API IfcFile {
 	/// attributes as a flat list. NB: includes the root instance specified
 	/// in the first function argument.
 	IfcEntityList::ptr traverse(IfcUtil::IfcBaseClass* instance, int max_level=-1);
-    
+	
 #ifdef USE_MMAP
 	bool Init(const std::string& fn, bool mmap=false);
 #else
@@ -116,7 +116,7 @@ class IFC_PARSE_API IfcFile {
 	bool Init(void* data, int len);
 	bool Init(IfcParse::IfcSpfStream* f);
 	
-    //bool Dup(const std::string& data);
+    bool Init(const std::string& data, unsigned int unused);
 
 	IfcEntityList::ptr getInverse(int instance_id, IfcSchema::Type::Enum type, int attribute_index);
 
diff --git a/src/ifcparse/IfcParse.cpp b/src/ifcparse/IfcParse.cpp
@@ -1252,19 +1252,14 @@ void IfcEntityInstanceData::setArgument(unsigned int i, Argument* a, IfcUtil::Ar
 // Parses the IFC file in fn
 // Creates the maps
 //
-/*
- * bool IfcFile::Dup(const std::string& data) {
- *     return IfcFile::Init(new IfcSpfStream(data, (unsigned int) 0));
- * }
- */
 
 #ifdef USE_MMAP
 bool IfcFile::Init(const std::string& fn, bool mmap) {
 	return IfcFile::Init(new IfcSpfStream(fn, mmap));
 }
 #else
 bool IfcFile::Init(const std::string& fn) {
-    return IfcFile::Init(new IfcSpfStream(fn, (unsigned int) 0));
+    //return IfcFile::Init(new IfcSpfStream(fn, (unsigned int) 0));
 	return IfcFile::Init(new IfcSpfStream(fn));
 }
 #endif
@@ -1275,6 +1270,9 @@ bool IfcFile::Init(std::istream& f, int len) {
 bool IfcFile::Init(void* data, int len) {
 	return IfcFile::Init(new IfcSpfStream(data,len));
 }
+bool IfcFile::Init(const std::string& data, unsigned int unused) {
+    return IfcFile::Init(new IfcSpfStream(data, (unsigned int) 0));
+}
 
 
 bool IfcFile::Init(IfcParse::IfcSpfStream* s) {
diff --git a/src/ifcwrap/IfcParseWrapper.i b/src/ifcwrap/IfcParseWrapper.i
@@ -394,21 +394,21 @@ private:
 
 // The IfcFile* returned by open() is to be freed by SWIG/Python
 %newobject open;
-//%newobject read;
+%newobject read;
 
 %inline %{
 	IfcParse::IfcFile* open(const std::string& fn) {
 		IfcParse::IfcFile* f = new IfcParse::IfcFile();
 		f->Init(fn);
 		return f;
 	}
-/*
-    IfcParse::IfcFile* read(const std::string& fn) {
+    IfcParse::IfcFile* read(const std::string& data) {
 		IfcParse::IfcFile* f = new IfcParse::IfcFile();
-		f->Dup(fn);
+        std::string copiedData;
+        copiedData = data;
+		f->Init((void *)copiedData.c_str(), data.length());
 		return f;
 	}
-*/
 	const char* schema_identifier() {
 		return IfcSchema::Identifier;
 	}
