improve datalink uri handling to consider : inside uri

NeuroJSON · Mar 30, 2022 · 4433a21 · 4433a21
1 parent 6368409
commit 4433a21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/examples/random_json_joke.m b/examples/random_json_joke.m
@@ -6,7 +6,7 @@
 % web. In the below example, the jokeapi.dev feed returns a JSON record via
 % RESTFul URL, the returned record contains a subfield called `joke`, which
 % can be retrieved via the JSONPath $.joke attched after the URL, separated
-% by a collon. The general _DataLink_ URL is in the form of "URL:$jsonpath"
+% by a colon. The general _DataLink_ URL is in the form of "URL:$jsonpath"
 
 if(nargin==0)
     num=1;

diff --git a/jdatadecode.m b/jdatadecode.m
@@ -464,7 +464,11 @@
     if(opt.maxlinklevel>0 && isfield(data,N_('_DataLink_')))
         if(ischar(data.(N_('_DataLink_'))))
             datalink=data.(N_('_DataLink_'));
-            ref=regexp(datalink, '^(?<proto>[a-zA-Z]+://)*(?<path>.+)(?<delim>\:)()*(?<jsonpath>(?<=:)\$\d*\..*)*', 'names');
+            if(regexp(datalink,'\:\$'))
+                ref=regexp(datalink, '^(?<proto>[a-zA-Z]+://)*(?<path>.+)(?<delim>\:)()*(?<jsonpath>(?<=:)\$\d*\.*.*)*', 'names');
+            else
+                ref=regexp(datalink, '^(?<proto>[a-zA-Z]+://)*(?<path>.+)(?<delim>\:)*(?<jsonpath>(?<=:)\$\d*\..*)*', 'names');
+            end
             if(~isempty(ref.path))
                 uripath=[ref.proto ref.path];
                 [fpath, fname, fext]=fileparts(uripath);