sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2025-12-11 19:44:35 +00:00
Code Issues Projects Releases Wiki Activity

fix: pass _program to execute file without extension

Browse Source
This commit is contained in:
Sabir Hassan
2022-06-03 17:24:29 +05:00
parent 07295aa151
commit 5df619b3f6
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/controllers/stp.ts
View File

@@ -131,15 +131,11 @@ const executeReturnRaw = async (
_program: string _program: string
): Promise<string | Buffer> => { ): Promise<string | Buffer> => {
const query = req.query as ExecutionVars const query = req.query as ExecutionVars
const sasCodePath =
path
.join(getFilesFolder(), _program)
.replace(new RegExp('/', 'g'), path.sep) + '.sas'
try { try {
const { result, httpHeaders } = const { result, httpHeaders } =
(await new ExecutionController().executeFile( (await new ExecutionController().executeFile(
sasCodePath, _program,
getPreProgramVariables(req), getPreProgramVariables(req),
query query
)) as ExecuteReturnRaw )) as ExecuteReturnRaw
@@ -171,11 +167,6 @@ const executeReturnJson = async (
req: express.Request, req: express.Request,
_program: string _program: string
): Promise<ExecuteReturnJsonResponse> => { ): Promise<ExecuteReturnJsonResponse> => {
const sasCodePath =
path
.join(getFilesFolder(), _program)
.replace(new RegExp('/', 'g'), path.sep) + '.sas'
const filesNamesMap = req.files?.length const filesNamesMap = req.files?.length
? makeFilesNamesMap(req.files as MulterFile[]) ? makeFilesNamesMap(req.files as MulterFile[])
: null : null
@@ -183,12 +174,12 @@ const executeReturnJson = async (
try { try {
const { webout, log, httpHeaders } = const { webout, log, httpHeaders } =
(await new ExecutionController().executeFile( (await new ExecutionController().executeFile(
sasCodePath, _program,
getPreProgramVariables(req), getPreProgramVariables(req),
{ ...req.query, ...req.body }, { ...req.query, ...req.body },
{ filesNamesMap: filesNamesMap }, { filesNamesMap: filesNamesMap },
true, true,
req.sasSession req.sasjsSession
)) as ExecuteReturnJson )) as ExecuteReturnJson
let weboutRes: string | IRecordOfAny = webout let weboutRes: string | IRecordOfAny = webout