-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use sockets #154
Use sockets #154
Conversation
camel/src/main/java/com/github/theprez/manzan/ManzanMessageFormatter.java
Outdated
Show resolved
Hide resolved
camel/src/main/java/com/github/theprez/manzan/routes/event/WatchMsgEvent.java
Show resolved
Hide resolved
camel/src/main/java/com/github/theprez/manzan/routes/event/WatchMsgEvent.java
Show resolved
Hide resolved
@@ -33,8 +33,9 @@ public String format(final Map<String, Object> _mappings) { | |||
ret = ret.replace("\\n", "\n").replace("\\t", "\t"); | |||
|
|||
for (final Entry<String, Object> repl : _mappings.entrySet()) { | |||
ret = ret.replace("$" + repl.getKey() + "$", "" + repl.getValue()); | |||
String jsonIndicator ="$json:" + repl.getKey() + "$"; | |||
final String key = repl.getKey().toUpperCase(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This makes the key match case insensitive
|
||
/qsys.lib/${BUILDLIB}.lib/%.module: src/%.sqlc | ||
system "CRTSQLCI OBJ(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$^') COMMIT(*NONE) DATFMT(*ISO) TIMFMT(*ISO) DBGVIEW(*SOURCE) CVTCCSID(*JOB) COMPILEOPT('INCDIR(''src'')') SQLPATH(${BUILDLIB}) DFTRDBCOL(${BUILDLIB}) OPTION(*SQL)" | ||
system "CRTSQLCPPI OBJ(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$^') COMMIT(*NONE) DATFMT(*ISO) TIMFMT(*ISO) DBGVIEW(*SOURCE) CVTCCSID(*JOB) COMPILEOPT('INCDIR(''src'')') SQLPATH(${BUILDLIB}) DFTRDBCOL(${BUILDLIB}) OPTION(*SQL)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The program uses cpp functions now, so we need to use CRTSQLCPPI instead
|
||
/qsys.lib/${BUILDLIB}.lib/%.pgm: | ||
system "CRTPGM PGM(${BUILDLIB}/$*) MODULE($(patsubst %.module,$(BUILDLIB)/%,$(notdir $^))) ACTGRP(*CALLER)" | ||
|
||
/qsys.lib/${BUILDLIB}.lib/%.module: src/%.cpp src/mzversion.h | ||
system "CRTCPPMOD MODULE(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$<') OPTION(*EVENTF) SYSIFCOPT(*IFS64IO) DBGVIEW(*SOURCE) TERASPACE(*YES *TSIFC) STGMDL(*SNGLVL) DTAMDL(*p128) DEFINE(DEBUG_ENABLED)" | ||
system "CRTCPPMOD MODULE(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$<') OPTION(*EVENTF) SYSIFCOPT(*IFS64IO) DBGVIEW(*SOURCE) TERASPACE(*YES *TSIFC) STGMDL(*SNGLVL) DTAMDL(*p128) DEFINE(DEBUG_ENABLED) OUTPUT(*PRINT) TGTCCSID(*JOB)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding TGTCCSID(*JOB) seemed to resolve encoding issues
camel/src/main/java/com/github/theprez/manzan/routes/event/WatchMsgEvent.java
Show resolved
Hide resolved
camel/src/main/java/com/github/theprez/manzan/routes/event/WatchMsgEvent.java
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Great work
Thank you to @SanjulaGanepola for helping me to work out some extremely weird ccsid issues which were fixed by adding
TGTCCSID(*JOB)
in the makefile