Browse files

Merge pull request #1682 from afishbeck/run_format

gh-1367 Fix ecl run formatting

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
  • Loading branch information...
2 parents 6f98ab4 + f2c1649 commit 61227fc3e062ad9bd0e69c7b4458fd70566d6c97 @richardkchapman richardkchapman committed Feb 24, 2012
View
2 common/fileview2/fvresultset.cpp
@@ -3361,7 +3361,7 @@ extern "C" FILEVIEW_API unsigned getResultCursorXml(IStringVal & ret, IResultSet
text.append("<Dataset");
if (name)
- text.append(" name=\"").append(name).append("\" ");
+ text.append(" name='").append(name).append('\'');
if (schemaName)
text.append(" xmlSchema=\"").append(schemaName).append("\" ");
text.append(">").newline();
View
2 ecl/eclcmd/eclcmd_common.hpp
@@ -68,6 +68,8 @@ typedef IEclCommand *(*EclCommandFactory)(const char *cmdname);
#define ECLOPT_INPUT "--input"
#define ECLOPT_INPUT_S "-in"
+#define ECLOPT_NOROOT "--noroot"
+
#define ECLOPT_WUID "--wuid"
#define ECLOPT_WUID_S "-wu"
#define ECLOPT_CLUSTER "--cluster"
View
6 ecl/eclcmd/eclcmd_core.cpp
@@ -432,7 +432,7 @@ class EclCmdPublish : public EclCmdWithEclTarget
class EclCmdRun : public EclCmdWithEclTarget
{
public:
- EclCmdRun() : optWaitTime((unsigned)-1)
+ EclCmdRun() : optWaitTime((unsigned)-1), optNoRoot(false)
{
optObj.accept = eclObjWuid | eclObjArchive | eclObjSharedObject | eclObjWuid | eclObjQuery;
}
@@ -456,6 +456,8 @@ class EclCmdRun : public EclCmdWithEclTarget
continue;
if (iter.matchOption(optWaitTime, ECLOPT_WAIT))
continue;
+ if (iter.matchFlag(optNoRoot, ECLOPT_NOROOT))
+ continue;
if (EclCmdWithEclTarget::matchCommandLineOption(iter, true)!=EclCmdOptionMatch)
return false;
}
@@ -506,6 +508,7 @@ class EclCmdRun : public EclCmdWithEclTarget
Owned<IClientWURunRequest> req = client->createWURunRequest();
req->setCloneWorkunit(true);
+ req->setNoRootTag(optNoRoot);
StringBuffer wuid;
StringBuffer queryset;
@@ -588,6 +591,7 @@ class EclCmdRun : public EclCmdWithEclTarget
StringAttr optName;
StringAttr optInput;
unsigned optWaitTime;
+ bool optNoRoot;
};
class EclCmdActivate : public EclCmdWithQueryTarget
View
1 esp/scm/ws_workunits.ecm
@@ -490,6 +490,7 @@ ESPrequest WURunRequest
string Cluster;
int Wait(-1);
[rows(15)] string Input;
+ bool NoRootTag(0);
};
ESPresponse [exceptions_inline] WURunResponse
View
2 esp/services/ws_workunits/ws_workunitsService.cpp
@@ -1019,7 +1019,7 @@ bool CWsWorkunitsEx::onWURun(IEspContext &context, IEspWURunRequest &req, IEspWU
case WUStateUnknown:
{
SCMStringBuffer result;
- getFullWorkUnitResultsXML(context.queryUserId(), context.queryPassword(), cw.get(), result, false, ExceptionSeverityInformation);
+ getFullWorkUnitResultsXML(context.queryUserId(), context.queryPassword(), cw.get(), result, false, ExceptionSeverityInformation, req.getNoRootTag());
resp.setResults(result.str());
break;
}

0 comments on commit 61227fc

Please sign in to comment.