mirror of
https://github.com/sasjs/core.git
synced 2026-01-04 08:00:05 +00:00
fix: updating ms_runstp and ms_testservice macros to cater for latest response JSON formats in sasjs/server
This commit is contained in:
@@ -108,47 +108,34 @@ run;
|
||||
)
|
||||
|
||||
|
||||
/* SASjs services have the _webout embedded in wrapper JSON */
|
||||
/* Files can also be very large - so use a dedicated macro to chop it out */
|
||||
%local matchstr1 matchstr2 ;
|
||||
%let matchstr1={"status":"success","_webout":{;
|
||||
%let matchstr2=},"log":[{;
|
||||
%let chopout1=%sysfunc(pathname(work))/%mf_getuniquename(prefix=chop1);
|
||||
%let chopout2=%sysfunc(pathname(work))/%mf_getuniquename(prefix=chop2);
|
||||
/* chop out JSON section */
|
||||
%local matchstr chopout;
|
||||
%let matchstr=SASJS_LOGS_SEPARATOR_163ee17b6ff24f028928972d80a26784;
|
||||
%let chopout=%sysfunc(pathname(work))/%mf_getuniquename(prefix=chop);
|
||||
|
||||
%mp_chop("%sysfunc(pathname(&fref1,F))"
|
||||
,matchvar=matchstr1
|
||||
,keep=LAST
|
||||
,matchpoint=END
|
||||
,offset=-1
|
||||
,outfile="&chopout1"
|
||||
,mdebug=&mdebug
|
||||
)
|
||||
|
||||
%mp_chop("&chopout1"
|
||||
,matchvar=matchstr2
|
||||
,matchvar=matchstr
|
||||
,keep=FIRST
|
||||
,matchpoint=START
|
||||
,offset=1
|
||||
,outfile="&chopout2"
|
||||
,offset=-1
|
||||
,outfile="&chopout"
|
||||
,mdebug=&mdebug
|
||||
)
|
||||
|
||||
%if &outlib ne 0 %then %do;
|
||||
libname &outlib json "&chopout2";
|
||||
libname &outlib json "&chopout";
|
||||
%end;
|
||||
%if &outref ne 0 %then %do;
|
||||
filename &outref "&chopout2";
|
||||
filename &outref "&chopout";
|
||||
%end;
|
||||
|
||||
%if &mdebug=0 %then %do;
|
||||
filename &webref clear;
|
||||
filename &fref1 clear;
|
||||
filename &fref2 clear;
|
||||
%end;
|
||||
%else %do;
|
||||
%put &sysmacroname exit vars:;
|
||||
%put _local_;
|
||||
%end;
|
||||
|
||||
%mend ms_testservice;
|
||||
%mend ms_testservice;
|
||||
|
||||
Reference in New Issue
Block a user