Mercurial > hg > piper-cpp

changeset 43:62c17e143aba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simple test script (and associated fixes) for the JS code
author Chris Cannam <c.cannam@qmul.ac.uk>
date Wed, 24 Aug 2016 10:50:40 +0100
parents 91f5c92d3bf7
children a98ef4c2616b
files json/VampJson.h
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/json/VampJson.h	Tue Aug 23 12:04:49 2016 +0100
+++ b/json/VampJson.h	Wed Aug 24 10:50:40 2016 +0100
@@ -983,16 +983,19 @@
     fromException(const std::exception &e, RRType responseType) {
 
         json11::Json::object jo;
+        std::string type;
 
-        if (responseType == RRType::List) jo["type"] = "list";
-        else if (responseType == RRType::Load) jo["type"] = "load";
-        else if (responseType == RRType::Configure) jo["type"] = "configure";
-        else if (responseType == RRType::Process) jo["type"] = "process";
-        else if (responseType == RRType::Finish) jo["type"] = "finish";
-        else jo["type"] = "invalid";
+        if (responseType == RRType::List) type = "list";
+        else if (responseType == RRType::Load) type = "load";
+        else if (responseType == RRType::Configure) type = "configure";
+        else if (responseType == RRType::Process) type = "process";
+        else if (responseType == RRType::Finish) type = "finish";
+        else type = "invalid";
 
+        jo["type"] = type;
         jo["success"] = false;
-        jo["errorText"] = std::string("exception caught: ") + e.what();
+        jo["errorText"] = std::string("exception caught: ") +
+            type + " request: " + e.what();
         return json11::Json(jo);
     }