Changeset 785 for cpp

Timestamp:

05/19/18 15:46:36 (7 years ago)

Author:

Maciej Komosinski

Message:

Very long string values are not printed shortened

Location:

cpp/frams/util

Files:

• extvalue.cpp (modified) (1 diff)
• sstringutils.cpp (modified) (1 diff)
• sstringutils.h (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -309 +309 @@
         case TInt: case TDouble: case TString: case TObj:
                 msg += " '";
-                msg += getString();
+                msg += sstringShorten(getString(), 30);
                 msg += "'";
         default:;

cpp/frams/util/sstringutils.cpp

@@ -157 +157 @@
 }
 
+SString sstringShorten(const SString &in, int maxlen)
+{
+        SString out;
+        if (in.len() > maxlen)
+                out = in.substr(0, maxlen / 2) + "..." + in.substr(in.len() - maxlen + maxlen / 2) + SString::sprintf(" (length %d)", in.len());
+        else
+                out = in;
+        sstringQuote(out);
+        return out;
+}
+
 const char* skipQuoteString(const char* txt, const char* limit)
 {

cpp/frams/util/sstringutils.h

@@ -19 +19 @@
 bool strContainsOneOf(const char* str, const char* chars);
 bool sstringQuote(SString& target);
+SString sstringShorten(const SString &in, int maxlen);
 const char* skipQuoteString(const char* txt, const char* limit);
 int sstringUnquote(SString &target);