From 545218e3b9a6ac1d3cd7783103f71039f2861426 Mon Sep 17 00:00:00 2001
From: munja <allnbwe@gmail.com>
Date: Thu, 6 Jan 2022 23:44:42 +0100
Subject: [PATCH] fix: avoiding type clash

---
 all.sas                      | 27 ++++++++++++++++++++-------
 base/mp_jsonout.sas          | 11 ++++++++---
 meta/mm_createwebservice.sas |  8 ++++++--
 viya/mv_createwebservice.sas |  8 ++++++--
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/all.sas b/all.sas
index 9e44f56..20cc266 100644
--- a/all.sas
+++ b/all.sas
@@ -7528,11 +7528,12 @@ filename &tempref clear;
 
         %mp_jsonout(OPEN,jref=tmp)
         %mp_jsonout(OBJ,class,jref=tmp)
+        %mp_jsonout(OBJ,class,dslabel=class2,jref=tmp,showmeta=YES)
         %mp_jsonout(CLOSE,jref=tmp)
 
         data _null_;
         infile tmp;
-        input;list;
+        input;putlog _infile_;
         run;
 
   If you are building web apps with SAS then you are strongly encouraged to use
@@ -7576,7 +7577,6 @@ filename &tempref clear;
 )/*/STORE SOURCE*/;
 %local tempds colinfo fmtds i numcols;
 %let numcols=0;
-%let fmtds=_null_;
 
 %if &action=OPEN %then %do;
   options nobomfile;
@@ -7694,7 +7694,12 @@ filename &tempref clear;
           format &&name&i $32767.;
         %end;
       %end;
-      set &fmtds &ds;
+      %if &fmt=Y %then %do;
+        set &fmtds;
+      %end;
+      %else %do;
+        set &ds;
+      %end;
       format _numeric_ bart.;
     %do i=1 %to &numcols;
       %if &&typelong&i=char %then %do;
@@ -12699,7 +12704,6 @@ data _null_;
   put ')/*/STORE SOURCE*/; ';
   put '%local tempds colinfo fmtds i numcols; ';
   put '%let numcols=0; ';
-  put '%let fmtds=_null_; ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -12817,7 +12821,12 @@ data _null_;
   put '          format &&name&i $32767.; ';
   put '        %end; ';
   put '      %end; ';
-  put '      set &fmtds &ds; ';
+  put '      %if &fmt=Y %then %do; ';
+  put '        set &fmtds; ';
+  put '      %end; ';
+  put '      %else %do; ';
+  put '        set &ds; ';
+  put '      %end; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char %then %do; ';
@@ -17823,7 +17832,6 @@ data _null_;
   put ')/*/STORE SOURCE*/; ';
   put '%local tempds colinfo fmtds i numcols; ';
   put '%let numcols=0; ';
-  put '%let fmtds=_null_; ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -17941,7 +17949,12 @@ data _null_;
   put '          format &&name&i $32767.; ';
   put '        %end; ';
   put '      %end; ';
-  put '      set &fmtds &ds; ';
+  put '      %if &fmt=Y %then %do; ';
+  put '        set &fmtds; ';
+  put '      %end; ';
+  put '      %else %do; ';
+  put '        set &ds; ';
+  put '      %end; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char %then %do; ';
diff --git a/base/mp_jsonout.sas b/base/mp_jsonout.sas
index 6573d1c..f7f6024 100644
--- a/base/mp_jsonout.sas
+++ b/base/mp_jsonout.sas
@@ -19,11 +19,12 @@
 
         %mp_jsonout(OPEN,jref=tmp)
         %mp_jsonout(OBJ,class,jref=tmp)
+        %mp_jsonout(OBJ,class,dslabel=class2,jref=tmp,showmeta=YES)
         %mp_jsonout(CLOSE,jref=tmp)
 
         data _null_;
         infile tmp;
-        input;list;
+        input;putlog _infile_;
         run;
 
   If you are building web apps with SAS then you are strongly encouraged to use
@@ -67,7 +68,6 @@
 )/*/STORE SOURCE*/;
 %local tempds colinfo fmtds i numcols;
 %let numcols=0;
-%let fmtds=_null_;
 
 %if &action=OPEN %then %do;
   options nobomfile;
@@ -185,7 +185,12 @@
           format &&name&i $32767.;
         %end;
       %end;
-      set &fmtds &ds;
+      %if &fmt=Y %then %do;
+        set &fmtds;
+      %end;
+      %else %do;
+        set &ds;
+      %end;
       format _numeric_ bart.;
     %do i=1 %to &numcols;
       %if &&typelong&i=char %then %do;
diff --git a/meta/mm_createwebservice.sas b/meta/mm_createwebservice.sas
index ae95e3a..21ba9fb 100644
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -101,7 +101,6 @@ data _null_;
   put ')/*/STORE SOURCE*/; ';
   put '%local tempds colinfo fmtds i numcols; ';
   put '%let numcols=0; ';
-  put '%let fmtds=_null_; ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -219,7 +218,12 @@ data _null_;
   put '          format &&name&i $32767.; ';
   put '        %end; ';
   put '      %end; ';
-  put '      set &fmtds &ds; ';
+  put '      %if &fmt=Y %then %do; ';
+  put '        set &fmtds; ';
+  put '      %end; ';
+  put '      %else %do; ';
+  put '        set &ds; ';
+  put '      %end; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char %then %do; ';
diff --git a/viya/mv_createwebservice.sas b/viya/mv_createwebservice.sas
index 4c199c8..f938f00 100644
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -245,7 +245,6 @@ data _null_;
   put ')/*/STORE SOURCE*/; ';
   put '%local tempds colinfo fmtds i numcols; ';
   put '%let numcols=0; ';
-  put '%let fmtds=_null_; ';
   put ' ';
   put '%if &action=OPEN %then %do; ';
   put '  options nobomfile; ';
@@ -363,7 +362,12 @@ data _null_;
   put '          format &&name&i $32767.; ';
   put '        %end; ';
   put '      %end; ';
-  put '      set &fmtds &ds; ';
+  put '      %if &fmt=Y %then %do; ';
+  put '        set &fmtds; ';
+  put '      %end; ';
+  put '      %else %do; ';
+  put '        set &ds; ';
+  put '      %end; ';
   put '      format _numeric_ bart.; ';
   put '    %do i=1 %to &numcols; ';
   put '      %if &&typelong&i=char %then %do; ';