浏览代码

Allow dataset as well as LEFT inside the LOG() expr

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 13 年之前
父节点
当前提交
8fb8333d8c
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      common/thorhelper/thorsoapcall.cpp
  2. 1 0
      ecl/hqlcpp/hqlhtcpp.cpp
  3. 1 1
      ecl/regress/soapcall12.ecl

+ 1 - 1
common/thorhelper/thorsoapcall.cpp

@@ -986,7 +986,7 @@ public:
             size32_t lenText;
             rtlDataAttr text;
             helperExtra->getLogText(lenText, text.refstr(), row);
-            logctx.CTXLOG("%s: user(%.*s)", wscCallTypeText(), lenText, text.getstr());
+            logctx.CTXLOG("%s: %.*s", wscCallTypeText(), lenText, text.getstr());
         }
     }
 

+ 1 - 0
ecl/hqlcpp/hqlhtcpp.cpp

@@ -16201,6 +16201,7 @@ ABoundActivity * HqlCppTranslator::doBuildActivitySOAP(BuildCtx & ctx, IHqlExpre
         if (dataset)
         {
             funcctx.addQuoted("const unsigned char * left = (const unsigned char *) _left;");
+            bindTableCursor(funcctx, dataset, "left");
             bindTableCursor(funcctx, dataset, "left", no_left, selSeq);
         }
         doBuildFunctionReturn(funcctx, unknownStringType, logText);

+ 1 - 1
ecl/regress/soapcall12.ecl

@@ -67,7 +67,7 @@ SOAPCALL('http://webservices.megacorp.com', 'WsAttributes', GetAttributeInRecord
 
 output(SOAPCALL(ds, 'http://webservices.megacorp.com', 'WsAttributesDs', GetAttributeInRecord, createInRecord2(LEFT.moduleName, LEFT.attr), dataset(GetAttributeOutRecord), LOG('megacorp:'+LEFT.moduleName+'.'+LEFT.attr)));
 
-output(SOAPCALL(ds, 'http://webservices.megacorp.com', 'WsAttributesDs', GetAttributeInRecord, createInRecord2(LEFT.moduleName, LEFT.attr), dataset(GetAttributeOutRecord), LOG,LOG(MIN),LOG('megacorp:'+LEFT.moduleName+'.'+LEFT.attr)));
+output(SOAPCALL(ds, 'http://webservices.megacorp.com', 'WsAttributesDs', GetAttributeInRecord, createInRecord2(LEFT.moduleName, LEFT.attr), dataset(GetAttributeOutRecord), LOG,LOG(MIN),LOG('megacorp:'+moduleName+'.'+attr)));
 
 
 output(HTTPCALL('http://webservices.megacorp.com', 'WsAttributesDs', 'blah', GetAttributeOutRecord, LOG,LOG(MIN),LOG('megacorp:xxx')));