fix: Merge pull request #425 from sasjs/allbump

fix: updating all.sas and mv_webout

all.sas

@@ -26312,13 +26312,13 @@ data _null_;
   put '); ';
   put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name ';
   put '  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS; ';
-  put '%if %index("&_debug",log) %then %let _debug=131; ';
+  put '%if %index("&_debug",log) %then %let _debug=128; ';
   put ' ';
   put '%local i tempds table; ';
   put '%let action=%upcase(&action); ';
   put ' ';
   put '%if &action=FETCH %then %do; ';
-  put '  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 131 %then %do; ';
+  put '  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 128 %then %do; ';
   put '    options mprint notes mprintnest; ';
   put '  %end; ';
   put ' ';
@@ -26381,7 +26381,7 @@ data _null_;
   put '      infile indata termstr=crlf lrecl=32767; ';
   put '      input; ';
   put '      if _n_=1 then call symputx(''input_statement'',_infile_); ';
-  put '      %if %str(&_debug) ge 131 %then %do; ';
+  put '      %if %str(&_debug) ge 128 %then %do; ';
   put '        if _n_<20 then putlog _infile_; ';
   put '        else stop; ';
   put '      %end; ';
@@ -26414,6 +26414,9 @@ data _null_;
   put ' ';
   put '  /* setup json */ ';
   put '  data _null_;file &fref; ';
+  put '  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do; ';
+  put '    put ''>>weboutBEGIN<<''; ';
+  put '  %end; ';
   put '    put ''{"SYSDATE" : "'' "&SYSDATE" ''"''; ';
   put '    put '',"SYSTIME" : "'' "&SYSTIME" ''"''; ';
   put '  run; ';
@@ -26526,7 +26529,9 @@ data _null_;
   put '    memsize=quote(cats(memsize)); ';
   put '    put '',"MEMSIZE" : '' memsize; ';
   put '    put "}"; ';
-  put ' ';
+  put '  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do; ';
+  put '    put ''>>weboutEND<<''; ';
+  put '  %end; ';
   put '  %if %upcase(&fref) ne _WEBOUT and &stream=Y %then %do; ';
   put '    data _null_; rc=fcopy("&fref","_webout");run; ';
   put '  %end; ';
@@ -30438,13 +30443,13 @@ filename &fref1 clear;
 );
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
   sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS;
-%if %index("&_debug",log) %then %let _debug=131;
+%if %index("&_debug",log) %then %let _debug=128;
 
 %local i tempds table;
 %let action=%upcase(&action);
 
 %if &action=FETCH %then %do;
-  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 131 %then %do;
+  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 128 %then %do;
     options mprint notes mprintnest;
   %end;
 
@@ -30507,7 +30512,7 @@ filename &fref1 clear;
       infile indata termstr=crlf lrecl=32767;
       input;
       if _n_=1 then call symputx('input_statement',_infile_);
-      %if %str(&_debug) ge 131 %then %do;
+      %if %str(&_debug) ge 128 %then %do;
         if _n_<20 then putlog _infile_;
         else stop;
       %end;
@@ -30540,6 +30545,9 @@ filename &fref1 clear;
 
   /* setup json */
   data _null_;file &fref;
+  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do;
+    put '>>weboutBEGIN<<';
+  %end;
     put '{"SYSDATE" : "' "&SYSDATE" '"';
     put ',"SYSTIME" : "' "&SYSTIME" '"';
   run;
@@ -30652,7 +30660,9 @@ filename &fref1 clear;
     memsize=quote(cats(memsize));
     put ',"MEMSIZE" : ' memsize;
     put "}";
-
+  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do;
+    put '>>weboutEND<<';
+  %end;
   %if %upcase(&fref) ne _WEBOUT and &stream=Y %then %do;
     data _null_; rc=fcopy("&fref","_webout");run;
   %end;

tests/testinit.sas

@@ -23,6 +23,7 @@ options lrecl=80;
 
 %macro loglevel();
   %if "&_debug"="2477" or "&_debug"="fields,log,trace" or "&_debug"="131"
+  or "&_debug"="128"
   %then %do;
     %put debug mode activated;
     options mprint mprintnest;

viya/mv_createwebservice.sas

@@ -595,13 +595,13 @@ data _null_;
   put '); ';
   put '%global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name ';
   put '  sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS; ';
-  put '%if %index("&_debug",log) %then %let _debug=131; ';
+  put '%if %index("&_debug",log) %then %let _debug=128; ';
   put ' ';
   put '%local i tempds table; ';
   put '%let action=%upcase(&action); ';
   put ' ';
   put '%if &action=FETCH %then %do; ';
-  put '  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 131 %then %do; ';
+  put '  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 128 %then %do; ';
   put '    options mprint notes mprintnest; ';
   put '  %end; ';
   put ' ';
@@ -664,7 +664,7 @@ data _null_;
   put '      infile indata termstr=crlf lrecl=32767; ';
   put '      input; ';
   put '      if _n_=1 then call symputx(''input_statement'',_infile_); ';
-  put '      %if %str(&_debug) ge 131 %then %do; ';
+  put '      %if %str(&_debug) ge 128 %then %do; ';
   put '        if _n_<20 then putlog _infile_; ';
   put '        else stop; ';
   put '      %end; ';
@@ -697,6 +697,9 @@ data _null_;
   put ' ';
   put '  /* setup json */ ';
   put '  data _null_;file &fref; ';
+  put '  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do; ';
+  put '    put ''>>weboutBEGIN<<''; ';
+  put '  %end; ';
   put '    put ''{"SYSDATE" : "'' "&SYSDATE" ''"''; ';
   put '    put '',"SYSTIME" : "'' "&SYSTIME" ''"''; ';
   put '  run; ';
@@ -809,7 +812,9 @@ data _null_;
   put '    memsize=quote(cats(memsize)); ';
   put '    put '',"MEMSIZE" : '' memsize; ';
   put '    put "}"; ';
-  put ' ';
+  put '  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do; ';
+  put '    put ''>>weboutEND<<''; ';
+  put '  %end; ';
   put '  %if %upcase(&fref) ne _WEBOUT and &stream=Y %then %do; ';
   put '    data _null_; rc=fcopy("&fref","_webout");run; ';
   put '  %end; ';

viya/mv_webout.sas

@@ -56,13 +56,13 @@
 );
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
   sasjs_tables SYS_JES_JOB_URI _EXECUTIONTASKS;
-%if %index("&_debug",log) %then %let _debug=131;
+%if %index("&_debug",log) %then %let _debug=128;
 
 %local i tempds table;
 %let action=%upcase(&action);
 
 %if &action=FETCH %then %do;
-  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 131 %then %do;
+  %if %upcase(&_omittextlog)=FALSE or %str(&_debug) ge 128 %then %do;
     options mprint notes mprintnest;
   %end;
 
@@ -125,7 +125,7 @@
       infile indata termstr=crlf lrecl=32767;
       input;
       if _n_=1 then call symputx('input_statement',_infile_);
-      %if %str(&_debug) ge 131 %then %do;
+      %if %str(&_debug) ge 128 %then %do;
         if _n_<20 then putlog _infile_;
         else stop;
       %end;
@@ -158,6 +158,9 @@
 
   /* setup json */
   data _null_;file &fref;
+  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do;
+    put '>>weboutBEGIN<<';
+  %end;
     put '{"SYSDATE" : "' "&SYSDATE" '"';
     put ',"SYSTIME" : "' "&SYSTIME" '"';
   run;
@@ -270,7 +273,9 @@
     memsize=quote(cats(memsize));
     put ',"MEMSIZE" : ' memsize;
     put "}";
-
+  %if %str(&_debug) ge 128 and &_EXECUTIONTASKS=true %then %do;
+    put '>>weboutEND<<';
+  %end;
   %if %upcase(&fref) ne _WEBOUT and &stream=Y %then %do;
     data _null_; rc=fcopy("&fref","_webout");run;
   %end;