fix: adding lrecl to mv_createfile to support lines 1 million characters wide. Closes #47

Merge pull request #44 from sasjs/vpn-connection
chore: added vpn connection
2026-01-01 15:00:04 +00:00 · 2021-06-23 21:53:32 +03:00 · 2021-06-21 14:35:19 +03:00 · 2021-06-21 11:27:06 +00:00 · 2021-06-21 11:49:37 +02:00 · 2021-06-17 16:31:29 +03:00
19 changed files with 2241 additions and 527 deletions
--- a/.github/vpn/config.ovpn
+++ b/.github/vpn/config.ovpn
@@ -0,0 +1,30 @@
+cipher AES-256-CBC
+setenv FORWARD_COMPATIBLE 1
+client
+server-poll-timeout 4
+nobind
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 443 tcp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+dev tun
+dev-type tun
+ns-cert-type server
+setenv opt tls-version-min 1.0 or-highest
+reneg-sec 604800
+sndbuf 0
+rcvbuf 0
+# NOTE: LZO commands are pushed by the Access Server at connect time.
+# NOTE: The below line doesn't disable LZO.
+comp-lzo no
+verb 3
+setenv PUSH_PEER_INFO
+
+ca ca.crt
+cert user.crt
+key user.key
+tls-auth tls.key 1
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -21,6 +21,31 @@ jobs:
        with:
          node-version: ${{ matrix.node-version }}

+      - name: Write VPN Files
+        run: |
+          echo "$CA_CRT" > .github/vpn/ca.crt
+          echo "$USER_CRT" > .github/vpn/user.crt
+          echo "$USER_KEY" > .github/vpn/user.key
+          echo "$TLS_KEY" > .github/vpn/tls.key
+        shell: bash
+        env:
+          CA_CRT: ${{ secrets.CA_CRT}}
+          USER_CRT: ${{ secrets.USER_CRT }}
+          USER_KEY: ${{ secrets.USER_KEY }}
+          TLS_KEY: ${{ secrets.TLS_KEY }}
+
+      - name: Install Open VPN
+        run: |
+          sudo apt install apt-transport-https
+          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
+          sudo apt-key add openvpn-repo-pkg-key.pub
+          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-bionic.list
+          sudo apt update
+          sudo apt install openvpn3
+
+      - name: Start Open VPN 3
+        run: openvpn3 session-start --config .github/vpn/config.ovpn
+
      - name: Install Doxygen
        run: sudo apt-get install doxygen

@@ -31,16 +56,16 @@ jobs:
        run: npm run lint

      - name: Add client
-        run:  echo "CLIENT=${{secrets.CLIENT}}"> .env.viya
+        run: echo "CLIENT=${{secrets.CLIENT}}"> .env.viya

      - name: Add secret
-        run:  echo "SECRET=${{secrets.SECRET}}" >> .env.viya
+        run: echo "SECRET=${{secrets.SECRET}}" >> .env.viya

      - name: Add access token
-        run:  echo "ACCESS_TOKEN=${{secrets.ACCESS_TOKEN}}" >> .env.viya
+        run: echo "ACCESS_TOKEN=${{secrets.ACCESS_TOKEN}}" >> .env.viya

      - name: Add refresh token
-        run:  echo "REFRESH_TOKEN=${{secrets.REFRESH_TOKEN}}" >> .env.viya
+        run: echo "REFRESH_TOKEN=${{secrets.REFRESH_TOKEN}}" >> .env.viya

      - name: Build Project
        run: npm run build
--- a/.sasjslint
+++ b/.sasjslint
@@ -6,7 +6,7 @@
    "hasMacroParentheses": true,
    "noNestedMacros": false,
    "noSpacesInFileNames": true,
-    "maxLineLength": 135,
+    "maxLineLength": 230,
    "lowerCaseFileNames": true,
    "noTabIndentation": true,
    "indentationMultiple": 2
--- a/all.sas
+++ b/all.sas
@@ -67,7 +67,8 @@ options noquotelenmax;
  %if %sysfunc(exist(&libds)) ne 1 & %sysfunc(exist(&libds,VIEW)) ne 1 %then 0;
  %else 1;

-%mend;/**
+%mend mf_existds;
+/**
  @file
  @brief Checks whether a feature exists
  @details Check to see if a feature is supported in your environment.
@@ -975,7 +976,8 @@ options noquotelenmax;
    %let rc=%sysfunc(close(&dsid));
  %end;
  %else %do;
-    %put unable to open &libds (rc=&dsid);
+    %put &sysmacroname: Unable to open &libds (rc=&dsid);
+    %put &sysmacroname: SYSMSG= %sysfunc(sysmsg());
    %let rc=%sysfunc(close(&dsid));
  %end;
  &outvar
@@ -8810,7 +8812,7 @@ Usage:
  @param code=(ft15f001) Space seperated fileref(s) of the actual code to be
    added
  @param server=(SASApp) The server which will run the STP.  Server name or uri
-   is fine.
+    is fine.
  @param mDebug=(0) set to 1 to show debug messages in the log
  @param replace=(YES) select NO to avoid replacing an existing service in that
    location
@@ -9036,7 +9038,12 @@ data _null_;
  put '%macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y); ';
  put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug ';
  put '  sasjs_tables; ';
-  put '%local i tempds; ';
+  put '%local i tempds jsonengine; ';
+  put ' ';
+  put '/* see https://github.com/sasjs/core/issues/41 */ ';
+  put '%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON; ';
+  put '%else %let jsonengine=DATASTEP; ';
+  put ' ';
  put ' ';
  put '%if &action=FETCH %then %do; ';
  put '  %if %str(&_debug) ge 131 %then %do; ';
@@ -9071,7 +9078,7 @@ data _null_;
  put '  OPTIONS NOBOMFILE; ';
  put ' ';
  put '  /** ';
-  put '    * check engine type to avoid the below err message: ';
+  put '    * check xengine type to avoid the below err message: ';
  put '    * > Function is only valid for filerefs using the CACHE access method. ';
  put '    */ ';
  put '  data _null_; ';
@@ -9093,7 +9100,7 @@ data _null_;
  put ' ';
  put '%else %if &action=ARR or &action=OBJ %then %do; ';
  put '  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref ';
-  put '    ,engine=DATASTEP,dbg=%str(&_debug) ';
+  put '    ,engine=&jsonengine,dbg=%str(&_debug) ';
  put '  ) ';
  put '%end; ';
  put '%else %if &action=CLOSE %then %do; ';
@@ -9106,7 +9113,7 @@ data _null_;
  put '    %local wtcnt;%let wtcnt=0; ';
  put '    data _null_; ';
  put '      set &tempds; ';
-  put '      if not (name =:"DATA"); ';
+  put '      if not (upcase(name) =:"DATA"); /* ignore temp datasets */ ';
  put '      i+1; ';
  put '      call symputx(''wt''!!left(i),name,''l''); ';
  put '      call symputx(''wtcnt'',i,''l''); ';
@@ -9126,8 +9133,8 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=DATASTEP) ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=DATASTEP) ';
+  put '      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=&jsonengine) ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=&jsonengine) ';
  put '      data _null_; file &fref mod encoding=''utf-8''; ';
  put '        put "}"; ';
  put '    %end; ';
@@ -11762,7 +11769,8 @@ filename __shake clear;
        put '%let mmxpass="Mars321";';
      run;

-      filename myref "%sysfunc(pathname(work))/mmxexport.sh";
+      filename myref "%sysfunc(pathname(work))/mmxexport.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          ,outref=myref
          ,secureref=tmp
@@ -11771,7 +11779,8 @@ filename __shake clear;

  Alternatively, call without inputs to create a function style output

-      filename myref "/tmp/mmscript.sh";
+      filename myref "/tmp/mmscript.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          outref=myref
          ,cmdoutloc=%str(/tmp)
@@ -11857,7 +11866,7 @@ run;
  ,msg=%str(syscc=&syscc)
 )

-%mend;/**
+%mend mm_spkexport;/**
  @file mm_tree.sas
  @brief Returns all folders / subfolder content for a particular root
  @details Shows all members and SubTrees for a particular root.
@@ -12522,7 +12531,12 @@ run;
 %macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y);
 %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug
  sasjs_tables;
-%local i tempds;
+%local i tempds jsonengine;
+
+/* see https://github.com/sasjs/core/issues/41 */
+%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON;
+%else %let jsonengine=DATASTEP;
+

 %if &action=FETCH %then %do;
  %if %str(&_debug) ge 131 %then %do;
@@ -12557,7 +12571,7 @@ run;
  OPTIONS NOBOMFILE;

  /**
-    * check engine type to avoid the below err message:
+    * check xengine type to avoid the below err message:
    * > Function is only valid for filerefs using the CACHE access method.
    */
  data _null_;
@@ -12579,7 +12593,7 @@ run;

 %else %if &action=ARR or &action=OBJ %then %do;
  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
-    ,engine=DATASTEP,dbg=%str(&_debug)
+    ,engine=&jsonengine,dbg=%str(&_debug)
  )
 %end;
 %else %if &action=CLOSE %then %do;
@@ -12592,7 +12606,7 @@ run;
    %local wtcnt;%let wtcnt=0;
    data _null_;
      set &tempds;
-      if not (name =:"DATA");
+      if not (upcase(name) =:"DATA"); /* ignore temp datasets */
      i+1;
      call symputx('wt'!!left(i),name,'l');
      call symputx('wtcnt',i,'l');
@@ -12612,8 +12626,8 @@ run;
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=DATASTEP)
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=DATASTEP)
+      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=&jsonengine)
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=&jsonengine)
      data _null_; file &fref mod encoding='utf-8';
        put "}";
    %end;
@@ -12791,8 +12805,8 @@ run;

  Usage:

-    %put %mfv_existfile(/does/exist.txt);
-    %put %mfv_existfile(/does/not/exist.txt);
+      %put %mfv_existfile(/does/exist.txt);
+      %put %mfv_existfile(/does/not/exist.txt);

  @param filepath The full path to the file on SAS drive (eg /Public/myfile.txt)

@@ -12800,6 +12814,9 @@ run;
  @li mf_abort.sas
  @li mf_getuniquefileref.sas

+  <h4> Related Macros </h4>
+  @li mfv_existfolder.sas
+
  @version 3.5
  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
 **/
@@ -12838,8 +12855,8 @@ run;

  Usage:

-    %put %mfv_existfolder(/does/exist);
-    %put %mfv_existfolder(/does/not/exist);
+      %put %mfv_existfolder(/does/exist);
+      %put %mfv_existfolder(/does/not/exist);

  @param path The path to the folder on SAS drive

@@ -12847,6 +12864,9 @@ run;
  @li mf_abort.sas
  @li mf_getuniquefileref.sas

+  <h4> Related Macros </h4>
+  @li mfv_existfile.sas
+
  @version 3.5
  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
 **/
@@ -12890,6 +12910,10 @@ run;
  @param [in] path= The parent folder in which to create the file
  @param [in] name= The name of the file to be created
  @param [in] inref= The fileref pointing to the file to be uploaded
+  @param [in] contentdisp= (inline) Content Disposition. Example values:
+      @li inline
+      @li attachment
+
  @param [in] access_token_var= The global macro variable to contain the access
    token, if using authorization_code grant type.
  @param [in] grant_type= (sas_services) Valid values are:
@@ -12914,6 +12938,7 @@ run;
 %macro mv_createfile(path=
    ,name=
    ,inref=
+    ,contentdisp=inline
    ,access_token_var=ACCESS_TOKEN
    ,grant_type=sas_services
    ,mdebug=0
@@ -12961,12 +12986,24 @@ run;
 /* create file with relevant options */
 %local fref;
 %let fref=%mf_getuniquefileref();
-filename &fref filesrvc folderPath="&path" filename="&name";
+filename &fref filesrvc
+  folderPath="&path"
+  filename="&name"
+  cdisp="&contentdisp"
+  lrecl=1048544;

 %mp_binarycopy(inref=&inref, outref=&fref)

 filename &fref clear;

+%local base_uri; /* location of rest apis */
+%let base_uri=%mf_getplatform(VIYARESTAPI);
+
+%put &sysmacroname: File &name successfully created in &path;
+%put &sysmacroname:;%put;
+%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname:;
+
 %mend mv_createfile;/**
  @file mv_createfolder.sas
  @brief Creates a viya folder if that folder does not already exist
@@ -13389,6 +13426,30 @@ run;
        rc =fput(fileid,'\');rc =fwrite(fileid);
        rc =fput(fileid,'\');rc =fwrite(fileid);
      end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
@@ -14008,8 +14069,9 @@ data _null_;
  put '    ods output Members=&tempds; ';
  put '    proc datasets library=WORK memtype=data; ';
  put '    %local wtcnt;%let wtcnt=0; ';
-  put '    data _null_; set &tempds; ';
-  put '      if not (name =:"DATA"); ';
+  put '    data _null_; ';
+  put '      set &tempds; ';
+  put '      if not (upcase(name) =:"DATA"); /* ignore temp datasets */ ';
  put '      i+1; ';
  put '      call symputx(''wt''!!left(i),name); ';
  put '      call symputx(''wtcnt'',i); ';
@@ -14133,6 +14195,22 @@ run;
        rc =fput(fileid,'0');rc =fwrite(fileid);
        rc =fput(fileid,'1');rc =fwrite(fileid);
      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
@@ -17808,8 +17886,9 @@ filename &fref1 clear;
    ods output Members=&tempds;
    proc datasets library=WORK memtype=data;
    %local wtcnt;%let wtcnt=0;
-    data _null_; set &tempds;
-      if not (name =:"DATA");
+    data _null_;
+      set &tempds;
+      if not (upcase(name) =:"DATA"); /* ignore temp datasets */
      i+1;
      call symputx('wt'!!left(i),name);
      call symputx('wtcnt',i);
--- a/base/mf_existds.sas
+++ b/base/mf_existds.sas
@@ -23,4 +23,4 @@
  %if %sysfunc(exist(&libds)) ne 1 & %sysfunc(exist(&libds,VIEW)) ne 1 %then 0;
  %else 1;

-%mend;
+%mend mf_existds;
--- a/base/mf_getvarlist.sas
+++ b/base/mf_getvarlist.sas
@@ -66,7 +66,8 @@
    %let rc=%sysfunc(close(&dsid));
  %end;
  %else %do;
-    %put unable to open &libds (rc=&dsid);
+    %put &sysmacroname: Unable to open &libds (rc=&dsid);
+    %put &sysmacroname: SYSMSG= %sysfunc(sysmsg());
    %let rc=%sysfunc(close(&dsid));
  %end;
  &outvar
--- a/main.dox
+++ b/main.dox
@@ -42,6 +42,13 @@

 */

+ /*! \dir Tests
+ *  \brief SASjs Tests
+ *  \details These folders contain the macro tests.  They are first compiled
+   and deployed (sasjs cbd) then executed (sasjs test).
+
+ */
+
 /*! \dir viya
 *  \brief Viya macros
 *  \details These macros have the following attributes:
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -40,7 +40,7 @@ Usage:
  @param code=(ft15f001) Space seperated fileref(s) of the actual code to be
    added
  @param server=(SASApp) The server which will run the STP.  Server name or uri
-   is fine.
+    is fine.
  @param mDebug=(0) set to 1 to show debug messages in the log
  @param replace=(YES) select NO to avoid replacing an existing service in that
    location
@@ -266,7 +266,12 @@ data _null_;
  put '%macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y); ';
  put '%global _webin_file_count _webin_fileref1 _webin_name1 _program _debug ';
  put '  sasjs_tables; ';
-  put '%local i tempds; ';
+  put '%local i tempds jsonengine; ';
+  put ' ';
+  put '/* see https://github.com/sasjs/core/issues/41 */ ';
+  put '%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON; ';
+  put '%else %let jsonengine=DATASTEP; ';
+  put ' ';
  put ' ';
  put '%if &action=FETCH %then %do; ';
  put '  %if %str(&_debug) ge 131 %then %do; ';
@@ -301,7 +306,7 @@ data _null_;
  put '  OPTIONS NOBOMFILE; ';
  put ' ';
  put '  /** ';
-  put '    * check engine type to avoid the below err message: ';
+  put '    * check xengine type to avoid the below err message: ';
  put '    * > Function is only valid for filerefs using the CACHE access method. ';
  put '    */ ';
  put '  data _null_; ';
@@ -323,7 +328,7 @@ data _null_;
  put ' ';
  put '%else %if &action=ARR or &action=OBJ %then %do; ';
  put '  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref ';
-  put '    ,engine=DATASTEP,dbg=%str(&_debug) ';
+  put '    ,engine=&jsonengine,dbg=%str(&_debug) ';
  put '  ) ';
  put '%end; ';
  put '%else %if &action=CLOSE %then %do; ';
@@ -336,7 +341,7 @@ data _null_;
  put '    %local wtcnt;%let wtcnt=0; ';
  put '    data _null_; ';
  put '      set &tempds; ';
-  put '      if not (name =:"DATA"); ';
+  put '      if not (upcase(name) =:"DATA"); /* ignore temp datasets */ ';
  put '      i+1; ';
  put '      call symputx(''wt''!!left(i),name,''l''); ';
  put '      call symputx(''wtcnt'',i,''l''); ';
@@ -356,8 +361,8 @@ data _null_;
  put '        put " ""&wt"" : {"; ';
  put '        put ''"nlobs":'' nlobs; ';
  put '        put '',"nvars":'' nvars; ';
-  put '      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=DATASTEP) ';
-  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=DATASTEP) ';
+  put '      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=&jsonengine) ';
+  put '      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=&jsonengine) ';
  put '      data _null_; file &fref mod encoding=''utf-8''; ';
  put '        put "}"; ';
  put '    %end; ';
--- a/meta/mm_spkexport.sas
+++ b/meta/mm_spkexport.sas
@@ -24,7 +24,8 @@
        put '%let mmxpass="Mars321";';
      run;

-      filename myref "%sysfunc(pathname(work))/mmxexport.sh";
+      filename myref "%sysfunc(pathname(work))/mmxexport.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          ,outref=myref
          ,secureref=tmp
@@ -33,7 +34,8 @@

  Alternatively, call without inputs to create a function style output

-      filename myref "/tmp/mmscript.sh";
+      filename myref "/tmp/mmscript.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          outref=myref
          ,cmdoutloc=%str(/tmp)
@@ -119,4 +121,4 @@ run;
  ,msg=%str(syscc=&syscc)
 )

-%mend;
+%mend mm_spkexport;
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -36,7 +36,12 @@
 %macro mm_webout(action,ds,dslabel=,fref=_webout,fmt=Y);
 %global _webin_file_count _webin_fileref1 _webin_name1 _program _debug
  sasjs_tables;
-%local i tempds;
+%local i tempds jsonengine;
+
+/* see https://github.com/sasjs/core/issues/41 */
+%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON;
+%else %let jsonengine=DATASTEP;
+

 %if &action=FETCH %then %do;
  %if %str(&_debug) ge 131 %then %do;
@@ -71,7 +76,7 @@
  OPTIONS NOBOMFILE;

  /**
-    * check engine type to avoid the below err message:
+    * check xengine type to avoid the below err message:
    * > Function is only valid for filerefs using the CACHE access method.
    */
  data _null_;
@@ -93,7 +98,7 @@

 %else %if &action=ARR or &action=OBJ %then %do;
  %mp_jsonout(&action,&ds,dslabel=&dslabel,fmt=&fmt,jref=&fref
-    ,engine=DATASTEP,dbg=%str(&_debug)
+    ,engine=&jsonengine,dbg=%str(&_debug)
  )
 %end;
 %else %if &action=CLOSE %then %do;
@@ -106,7 +111,7 @@
    %local wtcnt;%let wtcnt=0;
    data _null_;
      set &tempds;
-      if not (name =:"DATA");
+      if not (upcase(name) =:"DATA"); /* ignore temp datasets */
      i+1;
      call symputx('wt'!!left(i),name,'l');
      call symputx('wtcnt',i,'l');
@@ -126,8 +131,8 @@
        put " ""&wt"" : {";
        put '"nlobs":' nlobs;
        put ',"nvars":' nvars;
-      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=DATASTEP)
-      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=DATASTEP)
+      %mp_jsonout(OBJ,&tempds,jref=&fref,dslabel=colattrs,engine=&jsonengine)
+      %mp_jsonout(OBJ,&wt,jref=&fref,dslabel=first10rows,engine=&jsonengine)
      data _null_; file &fref mod encoding='utf-8';
        put "}";
    %end;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
    "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
  },
  "devDependencies": {
-    "@sasjs/cli": "^2.22.2"
-  },
-  "dependencies": {}
+    "@sasjs/cli": "^2.27.0"
+  }
 }
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -30,13 +30,16 @@
      "name": "viya",
      "serverUrl": "https://sas.analytium.co.uk",
      "serverType": "SASVIYA",
+      "allowInsecureRequests": false,
      "appLoc": "/Public/temp/macrocore",
-      "deployConfig": {
-        "deployServicePack": true
-      },
      "macroFolders": [
        "tests/viya"
      ],
+      "programFolders": [],
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": []
+      },
      "contextName": "SAS Job Execution compute context"
    },
    {
--- a/viya/mfv_existfile.sas
+++ b/viya/mfv_existfile.sas
@@ -9,8 +9,8 @@

  Usage:

-    %put %mfv_existfile(/does/exist.txt);
-    %put %mfv_existfile(/does/not/exist.txt);
+      %put %mfv_existfile(/does/exist.txt);
+      %put %mfv_existfile(/does/not/exist.txt);

  @param filepath The full path to the file on SAS drive (eg /Public/myfile.txt)

@@ -18,6 +18,9 @@
  @li mf_abort.sas
  @li mf_getuniquefileref.sas

+  <h4> Related Macros </h4>
+  @li mfv_existfolder.sas
+
  @version 3.5
  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
 **/
--- a/viya/mfv_existfolder.sas
+++ b/viya/mfv_existfolder.sas
@@ -9,8 +9,8 @@

  Usage:

-    %put %mfv_existfolder(/does/exist);
-    %put %mfv_existfolder(/does/not/exist);
+      %put %mfv_existfolder(/does/exist);
+      %put %mfv_existfolder(/does/not/exist);

  @param path The path to the folder on SAS drive

@@ -18,6 +18,9 @@
  @li mf_abort.sas
  @li mf_getuniquefileref.sas

+  <h4> Related Macros </h4>
+  @li mfv_existfile.sas
+
  @version 3.5
  @author [Allan Bowe](https://www.linkedin.com/in/allanbowe/)
 **/
--- a/viya/mv_createfile.sas
+++ b/viya/mv_createfile.sas
@@ -17,6 +17,10 @@
  @param [in] path= The parent folder in which to create the file
  @param [in] name= The name of the file to be created
  @param [in] inref= The fileref pointing to the file to be uploaded
+  @param [in] contentdisp= (inline) Content Disposition. Example values:
+      @li inline
+      @li attachment
+
  @param [in] access_token_var= The global macro variable to contain the access
    token, if using authorization_code grant type.
  @param [in] grant_type= (sas_services) Valid values are:
@@ -41,6 +45,7 @@
 %macro mv_createfile(path=
    ,name=
    ,inref=
+    ,contentdisp=inline
    ,access_token_var=ACCESS_TOKEN
    ,grant_type=sas_services
    ,mdebug=0
@@ -88,10 +93,22 @@
 /* create file with relevant options */
 %local fref;
 %let fref=%mf_getuniquefileref();
-filename &fref filesrvc folderPath="&path" filename="&name";
+filename &fref filesrvc
+  folderPath="&path"
+  filename="&name"
+  cdisp="&contentdisp"
+  lrecl=1048544;

 %mp_binarycopy(inref=&inref, outref=&fref)

 filename &fref clear;

+%local base_uri; /* location of rest apis */
+%let base_uri=%mf_getplatform(VIYARESTAPI);
+
+%put &sysmacroname: File &name successfully created in &path;
+%put &sysmacroname:;%put;
+%put    &base_uri/SASJobExecution?_file=&path/&name;%put;
+%put &sysmacroname:;
+
 %mend mv_createfile;
--- a/viya/mv_createjob.sas
+++ b/viya/mv_createjob.sas
@@ -237,6 +237,30 @@ run;
        rc =fput(fileid,'\');rc =fwrite(fileid);
        rc =fput(fileid,'\');rc =fwrite(fileid);
      end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -549,8 +549,9 @@ data _null_;
  put '    ods output Members=&tempds; ';
  put '    proc datasets library=WORK memtype=data; ';
  put '    %local wtcnt;%let wtcnt=0; ';
-  put '    data _null_; set &tempds; ';
-  put '      if not (name =:"DATA"); ';
+  put '    data _null_; ';
+  put '      set &tempds; ';
+  put '      if not (upcase(name) =:"DATA"); /* ignore temp datasets */ ';
  put '      i+1; ';
  put '      call symputx(''wt''!!left(i),name); ';
  put '      call symputx(''wtcnt'',i); ';
@@ -674,6 +675,22 @@ run;
        rc =fput(fileid,'0');rc =fwrite(fileid);
        rc =fput(fileid,'1');rc =fwrite(fileid);
      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
--- a/viya/mv_webout.sas
+++ b/viya/mv_webout.sas
@@ -174,8 +174,9 @@
    ods output Members=&tempds;
    proc datasets library=WORK memtype=data;
    %local wtcnt;%let wtcnt=0;
-    data _null_; set &tempds;
-      if not (name =:"DATA");
+    data _null_;
+      set &tempds;
+      if not (upcase(name) =:"DATA"); /* ignore temp datasets */
      i+1;
      call symputx('wt'!!left(i),name);
      call symputx('wtcnt',i);
Author	SHA1	Message	Date
Allan Bowe	c8d3b43b12	fix: adding lrecl to mv_createfile to support lines 1 million characters wide. Closes #47	2021-06-23 21:53:32 +03:00
Allan Bowe	32a6d15c2e	Merge pull request #44 from sasjs/vpn-connection chore: added vpn connection	2021-06-21 14:35:19 +03:00
Allan Bowe	b109e7cead	fix: bumping core	2021-06-21 11:27:06 +00:00
Mihajlo	d291d3e287	chore: added vpn connection	2021-06-21 11:49:37 +02:00
Allan Bowe	5a2968e798	fix: supporting LATIN1 as well as WLATIN1 in mm_webout	2021-06-17 16:31:29 +03:00
Allan Bowe	120ad9a7da	fix: supporting bell cand escape characters when creating viya jobs / services with macro	2021-06-11 00:09:16 +03:00
Allan Bowe	67a81b2690	chore: updating the docs for mm_spkexport.sas	2021-06-08 20:09:23 +03:00
Allan Bowe	506cf1812f	fix: deal with dashes in sysencoding	2021-06-08 16:59:43 +03:00
Allan Bowe	8cc0eb0dd7	Merge pull request #42 from sasjs/issue41 closes #42 Issue41	2021-06-03 22:44:16 +03:00
Allan Bowe	4c1f69da3a	fix: using PROC JSON for JSON where SYSENCODING=wlatin1	2021-06-01 18:24:04 +03:00
Allan Bowe	f160ebe705	chore: updating all.sas from previous pushes	2021-06-01 18:01:01 +03:00
Allan Bowe	3f49925d01	Merge pull request #40 from sasjs/dependabot/npm_and_yarn/ws-7.4.6 chore(deps): bump ws from 7.4.5 to 7.4.6	2021-06-01 17:58:49 +03:00
Allan Bowe	53ed5dc916	fix: adding extra debugging to mf_getvarlist	2021-06-01 09:32:19 +03:00
Allan Bowe	808b24e31b	chore: adding mend statement	2021-05-31 15:15:17 +03:00
dependabot[bot]	c51c9c2ca9	chore(deps): bump ws from 7.4.5 to 7.4.6 Bumps [ws](https://github.com/websockets/ws) from 7.4.5 to 7.4.6. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.4.5...7.4.6) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-31 02:08:52 +00:00
Allan Bowe	4d6edf5566	feat: additional options for mv_createfile.sas, also a log message to enable file to be easily opened	2021-05-30 13:22:50 +03:00
Allan Bowe	41a24677f5	chore: automated commit	2021-05-27 09:42:15 +03:00
Allan Bowe	e7d8d8ffb3	chore: updating docs	2021-05-27 09:40:38 +03:00