Merge pull request #255 from sasjs/allanbowe/mp-abort-fails-on-windows-254

fix: handling embedded speechmarks in SYSPROCESSNAME.  Closes #254

all.sas

@@ -2256,7 +2256,7 @@ Usage:
 
   %if %symexist(_SYSINCLUDEFILEDEVICE)
   /* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
-  and "&SYSPROCESSNAME " ne "Compute Server "
+  and %str(&SYSPROCESSNAME) ne %str(Compute Server)
   %then %do;
     %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
       data &errds;
@@ -2274,7 +2274,7 @@ Usage:
 
   /* Web App Context */
   %if %symexist(_PROGRAM)
-    or "&SYSPROCESSNAME "="Compute Server "
+    or %str(&SYSPROCESSNAME) = %str(Compute Server)
     or &mode=INCLUDE
   %then %do;
     options obs=max replace mprint;
@@ -20476,6 +20476,19 @@ options &optval;
 %let fref1=%mf_getuniquefileref();
 %let libref=%mf_getuniquelibref();
 
+%if %sysget(MODE)=desktop %then %do;
+  /* users api does not exist in desktop mode */
+  data &outds;
+    length DISPLAYNAME $60 USERNAME:$30 ID 8;
+    USERNAME="&sysuserid";
+    DISPLAYNAME="&sysuserid (desktop mode)";
+    ID=1;
+    output;
+    stop;
+  run;
+  %return;
+%end;
+
 /* avoid sending bom marker to API */
 %let optval=%sysfunc(getoption(bomfile));
 options nobomfile;

base/mp_abort.sas

@@ -74,7 +74,7 @@
 
   %if %symexist(_SYSINCLUDEFILEDEVICE)
   /* abort cancel FILE does not restart outside the INCLUDE on Viya 3.5 */
-  and "&SYSPROCESSNAME " ne "Compute Server "
+  and %str(&SYSPROCESSNAME) ne %str(Compute Server)
   %then %do;
     %if "*&_SYSINCLUDEFILEDEVICE*" ne "**" %then %do;
       data &errds;
@@ -92,7 +92,7 @@
 
   /* Web App Context */
   %if %symexist(_PROGRAM)
-    or "&SYSPROCESSNAME "="Compute Server "
+    or %str(&SYSPROCESSNAME) = %str(Compute Server)
     or &mode=INCLUDE
   %then %do;
     options obs=max replace mprint;

server/ms_getusers.sas

@@ -60,6 +60,19 @@
 %let fref1=%mf_getuniquefileref();
 %let libref=%mf_getuniquelibref();
 
+%if %sysget(MODE)=desktop %then %do;
+  /* users api does not exist in desktop mode */
+  data &outds;
+    length DISPLAYNAME $60 USERNAME:$30 ID 8;
+    USERNAME="&sysuserid";
+    DISPLAYNAME="&sysuserid (desktop mode)";
+    ID=1;
+    output;
+    stop;
+  run;
+  %return;
+%end;
+
 /* avoid sending bom marker to API */
 %let optval=%sysfunc(getoption(bomfile));
 options nobomfile;