give a warning when jdatadecode fails, but still return the raw data

NeuroJSON · Feb 10, 2022 · 88a59eb · 88a59eb
1 parent 05edb7a
commit 88a59eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/loadbj.m b/loadbj.m
@@ -150,7 +150,12 @@
     end
 
     if(jsonopt('JDataDecode',1,varargin{:})==1)
-        data=jdatadecode(data,'Base64',0,'Recursive',1,varargin{:});
+        try
+            data=jdatadecode(data,'Base64',0,'Recursive',1,varargin{:});
+        catch ME
+            warning(['Failed to decode embedded JData annotations, '...
+                'return raw JSON data\n\nError: %s\n%s'], ME.identifier, ME.message);
+        end
     end
 end
 

diff --git a/loadjson.m b/loadjson.m
@@ -192,7 +192,12 @@
     end
 
     if(jsonopt('JDataDecode',1,varargin{:})==1)
-        data=jdatadecode(data,'Base64',1,'Recursive',1,varargin{:});
+        try
+            data=jdatadecode(data,'Base64',1,'Recursive',1,varargin{:});
+        catch ME
+            warning(['Failed to decode embedded JData annotations, '...
+                'return raw JSON data\n\nError: %s\n%s'], ME.identifier, ME.message);
+        end
     end
 
     if(isfield(opt,'progressbar_'))