zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not trim value names for now. There are such error fields in aim2 db.

Browse source
This commit is contained in:
lzwdgc 2024-04-02 14:38:48 +03:00
parent 8954b11c95
commit 8e4c4cfd64
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/db2.h
View file

@ -183,6 +183,7 @@ struct db2 {
auto begin(this auto &&d) {return d.m.begin();}
auto end(this auto &&d) {return d.m.end();}
bool empty() const { return m.empty(); }
auto &operator[](this auto &&d, const std::string &s) {
return d.m[s];
}
@ -281,12 +282,14 @@ struct db2 {
}
};
// converts string to utf8, trims them
// converts string to utf8
// filters out values with empty name ""
auto to_map() const {
auto prepare_string = [](auto &&in) {
auto s = str2utf8(in);
boost::trim(s);
// we have some erroneous table values (records) with spaces
// we can trim only field values, but don't do it at the moment
//boost::trim(s);
return s;
};
@ -311,6 +314,7 @@ struct db2 {
throw std::logic_error{"unknown field"};
}
auto fn = prepare_string(f->name);
boost::trim(fn); // trim field name
if (jv.contains(fn)) {
// we analyze such cases manually
throw std::logic_error{"duplicate field: "s + fn};
@ -323,7 +327,7 @@ struct db2 {
jv[fn] = *(float *)p;
break;
case db2::field_type::string:
jv[fn] = prepare_string((const char *)p);
jv[fn] = boost::trim_copy(prepare_string((const char *)p)); // trim field value
break;
default:
throw std::logic_error{"bad type"};