Skip to content

Commit

Permalink
Update QSHONISRV.RPGLE
Browse files Browse the repository at this point in the history
  • Loading branch information
@richardschoen
richardschoen committed Jul 3, 2024
1 parent 6e64656 commit 8ae5a16
Showing 1 changed file with 202 additions and 19 deletions.
221 changes: 202 additions & 19 deletions QSHONISRV.RPGLE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@ Ctl-Opt NoMain;
*N Packed(15:5) Const;
End-PR;

// Run QSHGETPARR rpg program to get return values
Dcl-PR QshGetParr Extpgm('QSHGETPARR');
parm01 Char(255);
parm02 Char(255);
parm03 Char(255);
parm04 Char(255);
parm05 Char(255);
parm06 Char(255);
parm07 Char(255);
parm08 Char(255);
parm09 Char(255);
parm10 Char(255);
End-PR;


// Run CL command via wrapper procedure
// that calls QCmdExc and monitors for errors.
Dcl-PR RunClCmd Int(10:0);
Expand Down Expand Up @@ -50,7 +65,30 @@ Ctl-Opt NoMain;
End-PR;

// Run pase command via QSHBASH CL command
Dcl-PR QshbASH Int(10:0);
Dcl-PR QshBash Int(10:0);
cmdln VarChar(5000) const;
setpkgpath VarChar(4) const;
dspstdout VarChar(5) const;
logstdout VarChar(5) const;
prtstdout VarChar(5) const;
dltstdout VarChar(5) const;
ifsstdout VarChar(5) const;
ifsfile VarChar(255) const;
ifsopt VarChar(10) const;
ccsid VarChar(10) const;
prtsplf VarChar(10) const;
prtusrdta VarChar(10) const;
prttxt VarChar(30) const;
prthold VarChar(4) const;
prtoutq VarChar(21) const;
outfile VarChar(21) const;
mbropt VarChar(10) const;
pasejobnam VarChar(10) const;
promptcmd VarChar(5) const;
End-PR;

// Run pase command via QSHCALL CL command and return values
Dcl-PR QshCall Int(10:0);
cmdln VarChar(5000) const;
setpkgpath VarChar(4) const;
dspstdout VarChar(5) const;
Expand All @@ -70,8 +108,52 @@ Ctl-Opt NoMain;
mbropt VarChar(10) const;
pasejobnam VarChar(10) const;
promptcmd VarChar(5) const;
rtnparm01 Char(255);
rtnparm02 Char(255);
rtnparm03 Char(255);
rtnparm04 Char(255);
rtnparm05 Char(255);
rtnparm06 Char(255);
rtnparm07 Char(255);
rtnparm08 Char(255);
rtnparm09 Char(255);
rtnparm10 Char(255);
End-PR;

// ------------------------------------------------------
// Proc: RunClCmd
//
// Desc: Run CL command line via QCMDEXEC
// Handles command line trimming internally.
//
// Parms:
// P1-cmdln - Command line to run
//
// Returns:
// 0=success, -2=errors
// ------------------------------------------------------
Dcl-Proc RunClCmd export;
Dcl-PI RunClCmd Int(10:0);
cmdln VarChar(5000) const;
End-PI;
Dcl-S lccmd VarChar(5000) inz('');

// Execute QSHEXEC CL command
Monitor;

// Set local command and run via QcmdExc;
lccmd = cmdln;
QcmdExc(%trim(lccmd):%Len(lccmd));

// Ran successfully
Return 0;

On-Error;
// Error occurred
Return -2;
EndMon;

End-Proc RunClCmd;
// ------------------------------------------------------
// Proc: QshExec
// Desc: Run pase command via QSHONI/QSHEXEC command
Expand Down Expand Up @@ -256,37 +338,138 @@ Ctl-Opt NoMain;

End-Proc QshBash;

// ------------------------------------------------------
// Proc: RunClCmd
//
// Desc: Run CL command line via QCMDEXEC
// Handles command line trimming internally.
//
// ------------------------------------------------------
// Proc: QshCall
// Desc: Run pase command via QSHONI/QSHEXEC command
// and return parameters by parsing STDOUT log
// for special return parm values: RTNPARM01-RTNPARM10
// Parms:
// P1-cmdln - Command line to run
//
// P1-cmdln - PASE/QSH command to run
// Returns:
// 0=success, -2=errors
// ------------------------------------------------------
Dcl-Proc RunClCmd export;
Dcl-PI RunClCmd Int(10:0);
// ------------------------------------------------------
Dcl-Proc QshCall export;
Dcl-PI QshCall Int(10:0);
cmdln VarChar(5000) const;
setpkgpath VarChar(4) const;
dspstdout VarChar(5) const;
logstdout VarChar(5) const;
prtstdout VarChar(5) const;
dltstdout VarChar(5) const;
ifsstdout VarChar(5) const;
ifsfile VarChar(255) const;
ifsopt VarChar(10) const;
ccsid VarChar(10) const;
prtsplf VarChar(10) const;
prtusrdta VarChar(10) const;
prttxt VarChar(30) const;
prthold VarChar(4) const;
prtoutq VarChar(21) const;
outfile VarChar(21) const;
mbropt VarChar(10) const;
pasejobnam VarChar(10) const;
promptcmd VarChar(5) const;
rtnparm01 Char(255);
rtnparm02 Char(255);
rtnparm03 Char(255);
rtnparm04 Char(255);
rtnparm05 Char(255);
rtnparm06 Char(255);
rtnparm07 Char(255);
rtnparm08 Char(255);
rtnparm09 Char(255);
rtnparm10 Char(255);
End-PI;
Dcl-S lccmd VarChar(5000) inz('');
Dcl-S qshcmd VarChar(5000) inz('');

// Init return values
rtnparm01=*blanks;
rtnparm02=*blanks;
rtnparm03=*blanks;
rtnparm04=*blanks;
rtnparm05=*blanks;
rtnparm06=*blanks;
rtnparm07=*blanks;
rtnparm08=*blanks;
rtnparm09=*blanks;
rtnparm10=*blanks;

// Execute QSHEXEC CL command
Monitor;

// Set local command and run via QcmdExc;
lccmd = cmdln;
QcmdExc(%trim(lccmd):%Len(lccmd));
// Set blank parm defaults

// Build QSHEXEC command call
qshcmd='QSHONI/QSHEXEC CMDLINE(' + qt + %trim(cmdln) + qt + ') ' +
'SETPKGPATH(@@SETPKGPATH) ' +
'DSPSTDOUT(@@DSPSTDOUT) ' +
'LOGSTDOUT(@@LOGSTDOUT) ' +
'PRTSTDOUT(@@PRTSTDOUT) ' +
'DLTSTDOUT(@@DLTSTDOUT) ' +
'IFSSTDOUT(@@IFSSTDOUT) ' +
'IFSFILE(''@@IFSFILE'') ' +
'IFSOPT(@@IFSOPT) ' +
'CCSID(@@CCSID) ' +
'PRTSPLF(@@PRTSPLF) ' +
'PRTUSRDTA(*NONE) ' +
'PRTTXT(*NONE) ' +
'PRTHOLD(*YES) ' +
'PRTOUTQ(*SAME) ' +
'OUTFILE(QTEMP/STDOUTQSH) ' +
'MBROPT(*REPLACE) ' +
'PASEJOBNAM(@@PASEJOBNAM)';

// Replace keywords with parm values
qshcmd = %scanrpl('@@SETPKGPATH':%trim(setpkgpath):qshcmd);
qshcmd = %scanrpl('@@DSPSTDOUT':%trim(dspstdout):qshcmd);
qshcmd = %scanrpl('@@LOGSTDOUT':%trim(logstdout):qshcmd);
qshcmd = %scanrpl('@@PRTSTDOUT':%trim(prtstdout):qshcmd);
qshcmd = %scanrpl('@@DLTSTDOUT':%trim(dltstdout):qshcmd);
qshcmd = %scanrpl('@@IFSSTDOUT':%trim(ifsstdout):qshcmd);
qshcmd = %scanrpl('@@IFSFILE':%trim(ifsfile):qshcmd);
qshcmd = %scanrpl('@@IFSOPT':%trim(ifsopt):qshcmd);
qshcmd = %scanrpl('@@CCSID':%trim(ccsid):qshcmd);
qshcmd = %scanrpl('@@PRTSPLF':%trim(prtsplf):qshcmd);
qshcmd = %scanrpl('@@PRTUSRDTA':%trim(prtusrdta):qshcmd);
qshcmd = %scanrpl('@@PRTTXT':%trim(prttxt):qshcmd);
qshcmd = %scanrpl('@@PRTHOLD':%trim(prthold):qshcmd);
qshcmd = %scanrpl('@@PRTOUTQ':%trim(prtoutq):qshcmd);
qshcmd = %scanrpl('@@OUTFILE':%trim(outfile):qshcmd);
qshcmd = %scanrpl('@@MBROPT':%trim(mbropt):qshcmd);
qshcmd = %scanrpl('@@PASEJOBNAM':%trim(pasejobnam):qshcmd);

// If promptcmd = *YES add ? to ptompt CL command
if (%trim(promptcmd)='*YES');
qshcmd = '? ' + qshcmd;
endif;

// Run CL command
QcmdExc(%trim(qshcmd):%Len(qshcmd));

// Call QSHGETPARR to return parm values
// by extracting from QTEMP/STDOUTQSH outfile
// which holds stdout from Qsh/Pase call
QshGetParr(rtnparm01:rtnparm02:rtnparm03:
rtnparm04:rtnparm05:rtnparm06:rtnparm07:
rtnparm08:rtnparm09:rtnparm10);

// Set return values
//rtnparm01='';
//rtnparm02='';
//rtnparm03='';
//rtnparm04='';
//rtnparm05='';
//rtnparm06='';
//rtnparm07='';
//rtnparm08='';
//rtnparm09='';
//rtnparm10='';

// Ran successfully
Return 0;

On-Error;
// Error occurred
Return -2;
EndMon;

End-Proc RunClCmd;
End-Proc QshCall;

0 comments on commit 8ae5a16

Please sign in to comment.