Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

esp/files/css/hpcc.css

@@ -75,6 +75,7 @@ form label{
     padding-top: 4px;
     font-weight:bold;
     height:20px;
+    color:rgb(71, 71, 71);
 }
 
 form textarea{
@@ -102,11 +103,27 @@ form li{
 form div{
     margin:4px 0 0 0;
 }
-
+form h1{
+    font-size: 1.5em;
+    margin-left:15px;
+}
 form h2{
     padding:5px 0;
+    color:rgb(22, 22, 22);
+}
+
+/* Double-color dashed line */
+        
+hr.dashedLine {
+    border: 0;
+    border-bottom: 1px dashed #ccc;
+    background-color: rgb(0, 170, 213);
+    background: none;
 }
 
+ h2 img:first-of-type{
+    margin-left:15px;
+}
 /*IDs************************/
 
 #myProgressBar{
@@ -182,17 +199,6 @@ vertical-align: middle;
 margin-left:-20px;
 }
 
-.rounded{
-    border-radius: 5px;
-    -moz-border-radius:10px;
-    -webkit-border-radius:10px;
-    -khtml-border-radius:10px;
-    box-shadow: inset 0 2px 0 #fff;
-    background:rgb(244,244,244);
-    padding:10px;
-    margin:10px 0;
-    border:solid 1px rgb(214,214,214); 
-}
 
 .pageOverlay{
     left: 0;
@@ -357,4 +363,4 @@ margin-left:-20px;
     left: 0;
     right: 0;
     height: auto;
-}
+}

esp/files/templates/DFUWUDetailsWidget.html

@@ -15,7 +15,6 @@
                     <span data-dojo-type="dijit.ToolbarSeparator"></span>
                 </div>
                 <div data-dojo-props="region: 'center'" data-dojo-type="dijit.layout.ContentPane">
-                    <div class="rounded">
                         <h2>
                             <img id="${id}ProtectedImage" src="img/locked.png" />&nbsp<img id="${id}StateIdImage" src="img/workunit.png" />&nbsp<span id="${id}Wuid" class="bold">WUID</span>&nbsp<span id="${id}CommandMessage2" class="bold">Command</span>
                         </h2>
@@ -84,10 +83,9 @@
                                 </li>
                             </ul>
                         </form>
-                    </div>
-                    <div class="rounded">
-                        <h1>Source</h1>
+                    <hr class="dashedLine">
                         <form>
+                            <h1>Source</h1>
                             <ul>
                                 <li>
                                     <label for="${id}SourceIP">IP:</label>
@@ -143,10 +141,9 @@
                                 </li>
                             </ul>
                         </form>
-                    </div>
-                    <div class="rounded">
-                        <h1>Target</h1>
+                    <hr class="dashedLine">
                         <form>
+                            <h1>Target</h1>
                             <ul>
                                 <li>
                                     <label for="${id}DestIP">IP:</label>
@@ -182,10 +179,9 @@
                                 </li>
                             </ul>
                         </form>
-                    </div>
-                    <div class="rounded">
-                        <h1>Other</h1>
+                        <hr class="dashedLine">
                         <form>
+                            <h1>Other</h1>
                             <ul>
                                 <li>
                                     <label for="${id}MonitorEventName">Monitor Event Name:</label>
@@ -213,7 +209,6 @@
                                 </li>
                             </ul>
                         </form>
-                    </div>
                 </div>
             </div>
             <div id="${id}_XML" title="XML" data-dojo-props="WUXml: true" data-dojo-type="ECLSourceWidget">

esp/services/ws_ecl/ws_ecl_service.cpp

@@ -2096,70 +2096,6 @@ int CWsEclBinding::getWsEcl2Form(CHttpRequest* request, CHttpResponse* response,
     return 0;
 }
 
-void CWsEclBinding::addParameterToWorkunit(IWorkUnit * workunit, IConstWUResult &vardef, IResultSetMetaData &metadef, const char *varname, IPropertyTree *valtree)
-{
-    if (!varname || !*varname)
-        return;
-
-    Owned<IWUResult> var = workunit->updateVariableByName(varname);
-    if (!vardef.isResultScalar())
-    {
-        StringBuffer ds;
-        if (valtree->hasChildren())
-            toXML(valtree, ds);
-        else
-        {
-            const char *val = valtree->queryProp(NULL);
-            if (val)
-                decodeXML(val, ds);
-        }
-        if (ds.length())
-            var->setResultRaw(ds.length(), ds.str(), ResultFormatXml);
-    }
-    else
-    {
-        const char *val = valtree->queryProp(NULL);
-        if (val && *val)
-        {
-            switch (metadef.getColumnDisplayType(0))
-            {
-                case TypeBoolean:
-                    var->setResultBool(strieq(val, "1") || strieq(val, "true") || strieq(val, "on"));
-                    break;
-                case TypeInteger:
-                    var->setResultInt(_atoi64(val));
-                    break;
-                case TypeUnsignedInteger:
-                    var->setResultInt(_atoi64(val));
-                    break;
-                case TypeReal:
-                    var->setResultReal(atof(val));
-                    break;
-                case TypeSet:
-                case TypeDataset:
-                case TypeData:
-                    var->setResultRaw(strlen(val), val, ResultFormatRaw);
-                    break;
-                case TypeUnicode: {
-                    MemoryBuffer target;
-                    convertUtf(target, UtfReader::Utf16le, strlen(val), val, UtfReader::Utf8);
-                    var->setResultUnicode(target.toByteArray(), (target.length()>1) ? target.length()/2 : 0);
-                    }
-                    break;
-                case TypeString:
-                case TypeUnknown:
-                default:
-                    var->setResultString(val, strlen(val));
-                    break;
-                    break;
-            }
-
-            var->setResultStatus(ResultStatusSupplied);
-        }
-    }
-}
-
-
 int CWsEclBinding::submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinfo, const char *xml, StringBuffer &out, unsigned flags, const char *viewname, const char *xsltname)
 {
     Owned <IWorkUnitFactory> factory = getSecWorkUnitFactory(*context.querySecManager(), *context.queryUser());
@@ -2192,22 +2128,7 @@ int CWsEclBinding::submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinf
         start=start->queryPropTree("Envelope");
     if (start->hasProp("Body"))
         start=start->queryPropTree("Body/*[1]");
-
-    Owned<IResultSetFactory> resultSetFactory(getResultSetFactory(context.queryUserId(), context.queryPassword()));
-    Owned<IPropertyTreeIterator> it = start->getElements("*");
-    ForEach(*it)
-    {
-        IPropertyTree &eclparm=it->query();
-        const char *varname = eclparm.queryName();
-
-        IConstWUResult *vardef = wsinfo.wu->getVariableByName(varname);
-        if (vardef)
-        {
-            Owned<IResultSetMetaData> metadef = resultSetFactory->createResultSetMeta(vardef);
-            if (metadef)
-                addParameterToWorkunit(workunit.get(), *vardef, *metadef, varname, &eclparm);
-        }
-    }
+    workunit->setXmlParams(LINK(start));
 
     workunit->schedule();
     workunit.clear();

esp/services/ws_ecl/ws_ecl_service.hpp

@@ -170,8 +170,6 @@ public:
 
     int submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinfo, const char *xml, StringBuffer &out, unsigned flags, const char *viewname=NULL, const char *xsltname=NULL);
 
-    void addParameterToWorkunit(IWorkUnit * workunit, IConstWUResult &vardef, IResultSetMetaData &metadef, const char *varname, IPropertyTree *valtree);
-    
     void handleHttpPost(CHttpRequest *request, CHttpResponse *response);
     void handleJSONPost(CHttpRequest *request, CHttpResponse *response);