Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 09:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly escape apostrophes in strings on write using the IfcCharacterEncoder

Browse Source
This commit is contained in:
Thomas Krijnen
2012-10-09 19:54:35 +00:00
parent 2f500aa098
commit 8b11a1baf7
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcCharacterDecoder.cpp
+11 -5
View File
@@ -314,6 +314,8 @@ IfcCharacterEncoder::~IfcCharacterEncoder() {
}
IfcCharacterEncoder::operator std::string() {
std::ostringstream oss;
oss.put('\'');
#ifdef HAVE_ICU
// Either 2 or 4 to uses \X2 or \X4 respectively.
// Currently hardcoded to 4, but \X2 might be
@@ -321,7 +323,7 @@ IfcCharacterEncoder::operator std::string() {
const int num_bytes = 4;
const std::string num_bytes_str = std::string(1,num_bytes + 0x30);
std::ostringstream oss;
UChar32 ch;
const char* source = str.c_str();
@@ -339,7 +341,7 @@ IfcCharacterEncoder::operator std::string() {
}
if ( within_spf_range ) {
oss.put(ch);
if ( ch == '\\' ) oss.put(ch);
if ( ch == '\\' || ch == '\'' ) oss.put(ch);
} else {
oss << std::hex << std::setw(num_bytes*2) << std::uppercase << std::setfill('0') << (int) ch;
}
@@ -347,11 +349,15 @@ IfcCharacterEncoder::operator std::string() {
}
if ( in_extended ) oss << "\\X0\\";
return oss.str();
#else
return str;
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i) {
char ch = *i;
if ( ch == '\\' || ch == '\'' ) oss.put(ch);
oss.put(ch);
}
#endif
oss.put('\'');
return oss.str();
}