comparison utilities/vampipe-convert.cpp @ 66:6f160dee1192

Instead of using separate values and b64values entries in JSON serialisations, allow numeric arrays to be replaced by b64 variants wherever they appear (discriminating by type). Also rename values to featureValues in feature throughout, as values turns out to be a hazardous name in a JS context. Finally use Array instead of Text for array encoding (seems clearer).

     if (err != "") return {};
 
     rr.type = VampJson::getRequestResponseType(j, err);
     if (err != "") return {};
     
-    VampJson::BufferSerialisation serialisation = VampJson::BufferSerialisation::Text;
+    VampJson::BufferSerialisation serialisation =
+        VampJson::BufferSerialisation::Array;
 
     switch (rr.type) {
 
     case RRType::List:
 	VampJson::toVampRequest_List(j, err); // type check only

     Json j;
 
     VampJson::BufferSerialisation serialisation =
         (useBase64 ?
          VampJson::BufferSerialisation::Base64 :
-         VampJson::BufferSerialisation::Text);
+         VampJson::BufferSerialisation::Array);
 
     switch (rr.type) {
 
     case RRType::List:
 	j = VampJson::fromVampRequest_List();

     if (err != "") return {};
 
     rr.type = VampJson::getRequestResponseType(j, err);
     if (err != "") return {};
     
-    VampJson::BufferSerialisation serialisation = VampJson::BufferSerialisation::Text;
+    VampJson::BufferSerialisation serialisation =
+        VampJson::BufferSerialisation::Array;
 
     rr.success = j["success"].bool_value();
     rr.errorText = j["errorText"].string_value();
 
     switch (rr.type) {

     Json j;
 
     VampJson::BufferSerialisation serialisation =
         (useBase64 ?
          VampJson::BufferSerialisation::Base64 :
-         VampJson::BufferSerialisation::Text);
+         VampJson::BufferSerialisation::Array);
 
     if (!rr.success) {
 
 	j = VampJson::fromError(rr.errorText, rr.type);