From ab464431491650138c476b411e42cd675513ec22 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 21 Dec 2012 06:56:29 +0000 Subject: [PATCH] =?UTF-8?q?Spezzamento=20su=20pi=C3=B9=20righe=20per=20fac?= =?UTF-8?q?ilitare=20debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/branches/R_10_00@22770 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/textset.cpp | 21 ++++++++++++++++----- include/varrec.cpp | 4 +++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/textset.cpp b/include/textset.cpp index 4483088ac..4db4fc906 100755 --- a/include/textset.cpp +++ b/include/textset.cpp @@ -241,11 +241,22 @@ TQuery_type TCSV_recordset::parse_query(const char* query, TFilename& table) if (q.starts_with("CSV(", true)) { - const int apici = q.find('"'); - if (apici > 0) - _separator = q[apici+1]; - else - _separator = ','; + switch (q[4]) + { + case '\'': + case '"' : + if (q[5] == '\\' && q[6] == 't') + _separator = '\t'; + else + _separator = q[5]; + break; + default : + if (q[4] != ')') + _separator = q[4]; + else + _separator = ','; + break; + } q = q.after(')'); q.trim(); diff --git a/include/varrec.cpp b/include/varrec.cpp index 78c837d9d..9c2454eb8 100755 --- a/include/varrec.cpp +++ b/include/varrec.cpp @@ -287,7 +287,9 @@ const TString & TVariable_rectype::get_str(const char* fieldname) const } f = (TVariable_field*)_virtual_fields.objptr(fieldname); } - return f != NULL ? f->get() : TRectype::get_str(fieldname); + if (f != NULL) + return f->get(); // Easier to breakpoint + return TRectype::get_str(fieldname); } void TVariable_rectype::put_str(const char* fieldname, const char* val)