Merge remote-tracking branch 'origin/candidate-9.10.x'

jakesmith · jakesmith · commit dbdc559ffee5 · 2025-01-23T17:19:42.000Z
Signed-off-by: Jake Smith &lt;jake.smith@lexisnexisrisk.com&gt;

# Conflicts:
#	version.cmake
diff --git a/comms/Dali.cpp b/comms/Dali.cpp
@@ -691,11 +691,11 @@ class CDali : public IDali, public CUnknown
         return localfiles.size();
     }
 
-    IWorkunit* Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug)
+    IWorkunit* Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug, bool rawECL)
     {
         CComInitialize com;
         StlLinked<IWorkunit> resultWu;
-        SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, false, maxRunTime, debug);
+        SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, false, maxRunTime, debug, rawECL);
         return resultWu.get();
     }
 
@@ -1109,7 +1109,7 @@ class CDali : public IDali, public CUnknown
     {
         CComInitialize com;
         bool retVal = false;
-        if (SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, noCommonPrivateAttributes, maxRunTime, debug))
+        if (SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, noCommonPrivateAttributes, maxRunTime, debug, false))
         {
             retVal = BlockUntilComplete(m_config, resultWu->GetWuid());
 
@@ -1221,12 +1221,14 @@ class CDali : public IDali, public CUnknown
         }
     }
 
-    bool SubmitEcl(const CString &cluster, const CString & queue, WUAction _action, const CString & attrQualifiedLabel, const CString & _ecl, const CString & path, const CString label, int resultLimit, StlLinked<IWorkunit> &resultWu, const CString & debugString, bool archive, bool noCommonPrivateAttributes, int maxRunTime, bool debug)
+    bool SubmitEcl(const CString &cluster, const CString & queue, WUAction _action, const CString & attrQualifiedLabel, const CString & _ecl, const CString & path, const CString label, int resultLimit, StlLinked<IWorkunit> &resultWu, const CString & debugString, bool archive, bool noCommonPrivateAttributes, int maxRunTime, bool debug, bool rawECL)
     {
         bool isXml = false;
         bool isArchive = false;
         CString ecl = _ecl;
         std::_tstring queryName;
+
+        if (!rawECL)
         {//  ECL or XML
             CComInitialize com;
             CComPtr<ISAXXMLReader> pRdr; 
@@ -1248,7 +1250,7 @@ class CDali : public IDali, public CUnknown
             }
         }
 
-        if (!isXml && !boost::algorithm::iequals(static_cast<const TCHAR *>(cluster), _T("Local")))
+        if (!rawECL && !isXml && !boost::algorithm::iequals(static_cast<const TCHAR *>(cluster), _T("Local")))
         {
             CComPtr<IEclCC> eclcc = CreateIEclCC();
             if (_action != WUActionExecuteExisting && eclcc)
diff --git a/comms/Dali.h b/comms/Dali.h
@@ -84,7 +84,7 @@ __interface IDali : public IUnknown
     IWorkunit *GetXGMMLWorkunit(const CString &filePath) const;
     signed GetResultData(const CString & wuid, int sequence, __int64 start, int count, ITable * result, __int64 &total) const;
     void MonitorState(const CString & wuid) const;	//Notifications come thru "IWorkunit.on_refresh_connect"
-    IWorkunit * Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug);
+    IWorkunit * Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug, bool rawECL);
     IWorkunit * Schedule(const CString &cluster, const CString & queue, const CString & attrQualifiedLabel, const CString & ecl, const CString & when, const CString & label, int resultLimit, const CString & debugSettings, bool archive);
     bool CheckComplexity(const CString &cluster, const CString & queue, const CString & ecl, const CString &module, const CString &attribute, std::_tstring & result, CEclExceptionVector & errorResults);
     void GetDependancies(const CString &cluster, const CString & queue, const CString & ecl, const CString &module, const CString &attribute, AttributeVector & results, CEclExceptionVector & errorResults);
diff --git a/eclide/ChildBuilderFrame.cpp b/eclide/ChildBuilderFrame.cpp
@@ -362,17 +362,17 @@ class CBuilderFrame :
         return true;
     }
 
-    void OnButtonGo(Dali::WUAction action, bool selected)
+    void OnButtonGo(Dali::WUAction action, bool selected, bool rawECL)
     {
         CString ecl;
         if (selected)
             m_dlgview.GetSource(ecl, selected);
         else
             m_dlgview.GetSource(ecl);
-        ExecEcl(action, ecl, m_dlgview.IsScheduled(), m_dlgview.IsLabeled());
+        ExecEcl(action, ecl, m_dlgview.IsScheduled(), m_dlgview.IsLabeled(), false, false, rawECL);
     }
 
-    void ExecEcl(Dali::WUAction action, const CString &_ecl, bool isScheduled=false, bool isLabeled=false, bool isDebug=false, bool supressPath=false)
+    void ExecEcl(Dali::WUAction action, const CString &_ecl, bool isScheduled=false, bool isLabeled=false, bool isDebug=false, bool supressPath=false, bool rawECL=false)
     {
         bool isSaved = false;
         if (CComPtr<IEclCC> eclcc = CreateIEclCC())
@@ -456,7 +456,7 @@ class CBuilderFrame :
         }
         else if (action != Dali::WUActionGenerate)
         {
-            result->ExecEcl(m_dlgview.GetCluster(), m_dlgview.GetQueue(), action, attrQualifiedLabel.c_str(), ecl, supressPath ? _T("") : m_dlgview.GetPath(), when.c_str(), label, m_dlgview.GetResultLimit(), debugStr.c_str(), m_dlgview.IsArchive(), m_dlgview.GetMaxRuntime(), isDebug);
+            result->ExecEcl(m_dlgview.GetCluster(), m_dlgview.GetQueue(), action, attrQualifiedLabel.c_str(), ecl, supressPath ? _T("") : m_dlgview.GetPath(), when.c_str(), label, m_dlgview.GetResultLimit(), debugStr.c_str(), m_dlgview.IsArchive(), m_dlgview.GetMaxRuntime(), isDebug, rawECL);
             GetIConfig(QUERYBUILDER_CFG)->Set(GLOBAL_QUEUE, m_dlgview.GetQueue());
             GetIConfig(QUERYBUILDER_CFG)->Set(GLOBAL_CLUSTER, m_dlgview.GetCluster());
         }
diff --git a/eclide/EclDlgBuilder.cpp b/eclide/EclDlgBuilder.cpp
@@ -738,8 +738,6 @@ void CBuilderDlg::OnFileSaveAs(UINT /*uNotifyCode*/, int /*nID*/, HWND /*hWnd*/)
 
 void CBuilderDlg::OnEclGo(UINT /*uNotifyCode*/, int nID, HWND /*hWnd*/)
 {
-    bool prevArchive = m_archive;
-
     switch(nID)
     {
     case ID_ECL_GO:
@@ -752,8 +750,7 @@ void CBuilderDlg::OnEclGo(UINT /*uNotifyCode*/, int nID, HWND /*hWnd*/)
         break;
     case ID_ECL_NOARCHIV_GO:
     case ID_GO_SUBMITNOARCHIV:
-        m_archive = false;
-        m_owner->OnButtonGo(Dali::WUActionRun);
+        m_owner->OnButtonGo(Dali::WUActionRun, false, true);
         break;
     case ID_GO_COMPILE:
         m_owner->OnButtonGo(Dali::WUActionCompile);
@@ -779,8 +776,6 @@ void CBuilderDlg::OnEclGo(UINT /*uNotifyCode*/, int nID, HWND /*hWnd*/)
         ATLASSERT(false);
         break;
     }
-
-    m_archive = prevArchive;
 }
 
 void CBuilderDlg::OnEclGenerate(UINT /*uNotifyCode*/, int nID, HWND /*hWnd*/)
diff --git a/eclide/EclDlgBuilder.h b/eclide/EclDlgBuilder.h
@@ -15,7 +15,7 @@ enum BUM
 //  ===========================================================================
 __interface IEclBuilderSlot : public ISourceSlot
 {
-    void OnButtonGo(Dali::WUAction action, bool selected = false);
+    void OnButtonGo(Dali::WUAction action, bool selected = false, bool rawECL = false);
 };
 
 class CBuilderDlg : 
diff --git a/eclide/ResultView.cpp b/eclide/ResultView.cpp
@@ -2420,7 +2420,7 @@ class CMultiResultView :
     int GetTabCount();
     void CloseAllTabs();
     void DestroyWindow();
-    void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugString, bool archive, int maxRuntime, bool debug);
+    void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugString, bool archive, int maxRuntime, bool debug, bool rawECL);
     void PublishESDL(const std::_tstring & desdlID, const std::_tstring & desdlVersion);
     void SetDeleteWorkunit(bool bDelete=true);
     void PostSelectRibbon();
@@ -2552,10 +2552,10 @@ void CMultiResultView::RenameColumn(unsigned col, const std::_tstring& newname)
         m_tabs[n]->RenameColumn(col, newname);
 }
 
-void CMultiResultView::ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR * debugString, bool archive, int maxRuntime, bool debug)
+void CMultiResultView::ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR * debugString, bool archive, int maxRuntime, bool debug, bool rawECL)
 {
     m_launchDebugger = debug;
-    CEclExec::ExecEcl(clusterName, queueName, action, attrQualifiedLabel, eclSource, eclPath, scheduled, label, resultLimit, debugString, archive, maxRuntime, debug);
+    CEclExec::ExecEcl(clusterName, queueName, action, attrQualifiedLabel, eclSource, eclPath, scheduled, label, resultLimit, debugString, archive, maxRuntime, debug, rawECL);
 }
 
 void CMultiResultView::PublishESDL(const std::_tstring & desdlID, const std::_tstring & desdlVersion)
diff --git a/eclide/ResultView.h b/eclide/ResultView.h
@@ -87,7 +87,7 @@ __interface IResultViewer :	public ISearchable, public IUnknown
     bool ToggleHexColumnDisplay(int column=-1);
     void RenameColumn(unsigned col, const std::_tstring& newname);
     bool UpdateUI(CCmdUI * cui);
-    void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *qualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugString, bool archive, int maxRuntime, bool debug);
+    void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *qualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugString, bool archive, int maxRuntime, bool debug, bool rawECL);
     void PublishESDL(const std::_tstring & desdlID, const std::_tstring & desdlVersion);
     void SetDeleteWorkunit(bool bDelete=true);
     void PostSelectRibbon();
diff --git a/wlib/EclExec.cpp b/wlib/EclExec.cpp
@@ -5,15 +5,15 @@
 #include <RecursiveMutex.h> //clib
 #include "Thread.h" //clib
 
-void CEclExec::ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugSettings, bool archive, int maxRunTime, bool debug)
+void CEclExec::ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugSettings, bool archive, int maxRunTime, bool debug, bool rawECL)
 {
 	if (scheduled && scheduled[0])
 	{
 		clib::thread run(__FUNCTION__, boost::bind(&EclSchedule, this, std::make_pair(clusterName, queueName), std::make_pair(action, attrQualifiedLabel), std::make_pair(eclSource, scheduled), label, resultLimit, debugSettings, archive, maxRunTime));
 	}
 	else
 	{
-		BindLimitStruct bls = {archive, maxRunTime, debug};
+		BindLimitStruct bls = {archive, maxRunTime, debug, rawECL};
 		clib::thread run(__FUNCTION__, boost::bind(&EclGo, this, std::make_pair(clusterName, queueName), std::make_pair(action, attrQualifiedLabel), eclSource, eclPath, label, resultLimit, debugSettings, bls));
 	}
 }
@@ -84,7 +84,7 @@ void CEclExec::EclGo(CComPtr<CEclExec> t, std::pair<std::_tstring, std::_tstring
 {
 	CString wuid;
 	StlLinked<Dali::IDali> server = Dali::AttachDali();
-	StlLinked<Dali::IWorkunit> workunit = server->Submit(clusterQueue.first.c_str(), clusterQueue.second.c_str(), actionAttrQualifiedLabel.first, actionAttrQualifiedLabel.second.c_str(), ecl, path, label, resultLimit, debugSettings, bls.archive, bls.maxRunTime, bls.debug);
+	StlLinked<Dali::IWorkunit> workunit = server->Submit(clusterQueue.first.c_str(), clusterQueue.second.c_str(), actionAttrQualifiedLabel.first, actionAttrQualifiedLabel.second.c_str(), ecl, path, label, resultLimit, debugSettings, bls.archive, bls.maxRunTime, bls.debug, bls.rawECL);
 	if ( workunit.isLinked() )
 	{
 		UpdateDefaultCluster(clusterQueue.first.c_str());
@@ -100,7 +100,7 @@ void CEclExec::EclGoNoRefCount(CEclExec * t, CString cluster, CString queue, Dal
 {
 	CString wuid;
 	StlLinked<Dali::IDali> server = Dali::AttachDali();
-	StlLinked<Dali::IWorkunit> workunit = server->Submit(cluster, queue, action, attrQualifiedLabel, ecl, path, _T(""), 0, _T(""), false, 0, false);
+	StlLinked<Dali::IWorkunit> workunit = server->Submit(cluster, queue, action, attrQualifiedLabel, ecl, path, _T(""), 0, _T(""), false, 0, false, false);
 	if ( workunit.isLinked() )
 	{
 		UpdateDefaultCluster(cluster);
diff --git a/wlib/EclExec.h b/wlib/EclExec.h
@@ -13,7 +13,7 @@ class WLIB_API CEclExec : public CUnknown, public boost::signals::trackable
     {
     }
 
-    virtual void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugSettings, bool archive, int maxRunTime=0, bool debug=false);
+    virtual void ExecEcl(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath, const TCHAR *scheduled, const TCHAR *label, int resultLimit, const TCHAR *debugSettings, bool archive, int maxRunTime=0, bool debug=false, bool rawECL=false);
     virtual void ExecEclNoRefCount(const TCHAR *clusterName, const TCHAR *queueName, Dali::WUAction action, const TCHAR *attrQualifiedLabel, const TCHAR *eclSource, const TCHAR *eclPath);
 
     virtual void WorkunitCreated(Dali::IWorkunit * src);
@@ -37,6 +37,7 @@ class WLIB_API CEclExec : public CUnknown, public boost::signals::trackable
         bool archive;
         int maxRunTime;
         bool debug;
+        bool rawECL;
     };
     static void EclGo(CComPtr<CEclExec> bf, std::pair<std::_tstring, std::_tstring> clusterQueue, std::pair<Dali::WUAction, std::_tstring> actionAttrQualifiedLabel, CString ecl, CString path, CString label, int resultLimit, CString debugSettings, BindLimitStruct bls);
     static void EclGoNoRefCount(CEclExec * bf, CString cluster, CString queue, Dali::WUAction action, CString attrQualifiedLabel, CString ecl, CString path);

Original file line number	Diff line number	Diff line change
`@@ -691,11 +691,11 @@ class CDali : public IDali, public CUnknown`
`691`	`691`	`return localfiles.size();`
`692`	`692`	`}`
`693`	`693`
`694`		`- IWorkunit* Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug)`
	`694`	`+ IWorkunit* Submit(const CString &cluster, const CString & queue, WUAction action, const CString & attrQualifiedLabel, const CString & ecl, const CString & path, const CString & label, int resultLimit, const CString & debugSettings, bool archive, int maxRunTime, bool debug, bool rawECL)`
`695`	`695`	`{`
`696`	`696`	`CComInitialize com;`
`697`	`697`	`StlLinked<IWorkunit> resultWu;`
`698`		`- SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, false, maxRunTime, debug);`
	`698`	`+ SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, false, maxRunTime, debug, rawECL);`
`699`	`699`	`return resultWu.get();`
`700`	`700`	`}`
`701`	`701`
`@@ -1109,7 +1109,7 @@ class CDali : public IDali, public CUnknown`
`1109`	`1109`	`{`
`1110`	`1110`	`CComInitialize com;`
`1111`	`1111`	`bool retVal = false;`
`1112`		`- if (SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, noCommonPrivateAttributes, maxRunTime, debug))`
	`1112`	`+ if (SubmitEcl(cluster, queue, action, attrQualifiedLabel, ecl, path, label, resultLimit, resultWu, debugSettings, archive, noCommonPrivateAttributes, maxRunTime, debug, false))`
`1113`	`1113`	`{`
`1114`	`1114`	`retVal = BlockUntilComplete(m_config, resultWu->GetWuid());`
`1115`	`1115`
`@@ -1221,12 +1221,14 @@ class CDali : public IDali, public CUnknown`
`1221`	`1221`	`}`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`		`- bool SubmitEcl(const CString &cluster, const CString & queue, WUAction _action, const CString & attrQualifiedLabel, const CString & _ecl, const CString & path, const CString label, int resultLimit, StlLinked<IWorkunit> &resultWu, const CString & debugString, bool archive, bool noCommonPrivateAttributes, int maxRunTime, bool debug)`
	`1224`	`+ bool SubmitEcl(const CString &cluster, const CString & queue, WUAction _action, const CString & attrQualifiedLabel, const CString & _ecl, const CString & path, const CString label, int resultLimit, StlLinked<IWorkunit> &resultWu, const CString & debugString, bool archive, bool noCommonPrivateAttributes, int maxRunTime, bool debug, bool rawECL)`
`1225`	`1225`	`{`
`1226`	`1226`	`bool isXml = false;`
`1227`	`1227`	`bool isArchive = false;`
`1228`	`1228`	`CString ecl = _ecl;`
`1229`	`1229`	`std::_tstring queryName;`
	`1230`	`+`
	`1231`	`+ if (!rawECL)`
`1230`	`1232`	`{// ECL or XML`
`1231`	`1233`	`CComInitialize com;`
`1232`	`1234`	`CComPtr<ISAXXMLReader> pRdr;`
`@@ -1248,7 +1250,7 @@ class CDali : public IDali, public CUnknown`
`1248`	`1250`	`}`
`1249`	`1251`	`}`
`1250`	`1252`
`1251`		`- if (!isXml && !boost::algorithm::iequals(static_cast<const TCHAR *>(cluster), _T("Local")))`
	`1253`	`+ if (!rawECL && !isXml && !boost::algorithm::iequals(static_cast<const TCHAR *>(cluster), _T("Local")))`
`1252`	`1254`	`{`
`1253`	`1255`	`CComPtr<IEclCC> eclcc = CreateIEclCC();`
`1254`	`1256`	`if (_action != WUActionExecuteExisting && eclcc)`
Original file line number	Diff line number	Diff line change
`@@ -362,17 +362,17 @@ class CBuilderFrame :`
`362`	`362`	`return true;`
`363`	`363`	`}`
`364`	`364`
`365`		`- void OnButtonGo(Dali::WUAction action, bool selected)`
	`365`	`+ void OnButtonGo(Dali::WUAction action, bool selected, bool rawECL)`
`366`	`366`	`{`
`367`	`367`	`CString ecl;`
`368`	`368`	`if (selected)`
`369`	`369`	`m_dlgview.GetSource(ecl, selected);`
`370`	`370`	`else`
`371`	`371`	`m_dlgview.GetSource(ecl);`
`372`		`- ExecEcl(action, ecl, m_dlgview.IsScheduled(), m_dlgview.IsLabeled());`
	`372`	`+ ExecEcl(action, ecl, m_dlgview.IsScheduled(), m_dlgview.IsLabeled(), false, false, rawECL);`
`373`	`373`	`}`
`374`	`374`
`375`		`- void ExecEcl(Dali::WUAction action, const CString &_ecl, bool isScheduled=false, bool isLabeled=false, bool isDebug=false, bool supressPath=false)`
	`375`	`+ void ExecEcl(Dali::WUAction action, const CString &_ecl, bool isScheduled=false, bool isLabeled=false, bool isDebug=false, bool supressPath=false, bool rawECL=false)`
`376`	`376`	`{`
`377`	`377`	`bool isSaved = false;`
`378`	`378`	`if (CComPtr<IEclCC> eclcc = CreateIEclCC())`
`@@ -456,7 +456,7 @@ class CBuilderFrame :`
`456`	`456`	`}`
`457`	`457`	`else if (action != Dali::WUActionGenerate)`
`458`	`458`	`{`
`459`		`- result->ExecEcl(m_dlgview.GetCluster(), m_dlgview.GetQueue(), action, attrQualifiedLabel.c_str(), ecl, supressPath ? _T("") : m_dlgview.GetPath(), when.c_str(), label, m_dlgview.GetResultLimit(), debugStr.c_str(), m_dlgview.IsArchive(), m_dlgview.GetMaxRuntime(), isDebug);`
	`459`	`+ result->ExecEcl(m_dlgview.GetCluster(), m_dlgview.GetQueue(), action, attrQualifiedLabel.c_str(), ecl, supressPath ? _T("") : m_dlgview.GetPath(), when.c_str(), label, m_dlgview.GetResultLimit(), debugStr.c_str(), m_dlgview.IsArchive(), m_dlgview.GetMaxRuntime(), isDebug, rawECL);`
`460`	`460`	`GetIConfig(QUERYBUILDER_CFG)->Set(GLOBAL_QUEUE, m_dlgview.GetQueue());`
`461`	`461`	`GetIConfig(QUERYBUILDER_CFG)->Set(GLOBAL_CLUSTER, m_dlgview.GetCluster());`
`462`	`462`	`}`
Original file line number	Diff line number	Diff line change
`@@ -738,8 +738,6 @@ void CBuilderDlg::OnFileSaveAs(UINT /uNotifyCode/, int /nID/, HWND /hWnd/)`
`738`	`738`
`739`	`739`	`void CBuilderDlg::OnEclGo(UINT /uNotifyCode/, int nID, HWND /hWnd/)`
`740`	`740`	`{`
`741`		`- bool prevArchive = m_archive;`
`742`		`-`
`743`	`741`	`switch(nID)`
`744`	`742`	`{`
`745`	`743`	`case ID_ECL_GO:`
`@@ -752,8 +750,7 @@ void CBuilderDlg::OnEclGo(UINT /uNotifyCode/, int nID, HWND /hWnd/)`
`752`	`750`	`break;`
`753`	`751`	`case ID_ECL_NOARCHIV_GO:`
`754`	`752`	`case ID_GO_SUBMITNOARCHIV:`
`755`		`- m_archive = false;`
`756`		`- m_owner->OnButtonGo(Dali::WUActionRun);`
	`753`	`+ m_owner->OnButtonGo(Dali::WUActionRun, false, true);`
`757`	`754`	`break;`
`758`	`755`	`case ID_GO_COMPILE:`
`759`	`756`	`m_owner->OnButtonGo(Dali::WUActionCompile);`
`@@ -779,8 +776,6 @@ void CBuilderDlg::OnEclGo(UINT /uNotifyCode/, int nID, HWND /hWnd/)`
`779`	`776`	`ATLASSERT(false);`
`780`	`777`	`break;`
`781`	`778`	`}`
`782`		`-`
`783`		`- m_archive = prevArchive;`
`784`	`779`	`}`
`785`	`780`
`786`	`781`	`void CBuilderDlg::OnEclGenerate(UINT /uNotifyCode/, int nID, HWND /hWnd/)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ enum BUM`
`15`	`15`	`// ===========================================================================`
`16`	`16`	`__interface IEclBuilderSlot : public ISourceSlot`
`17`	`17`	`{`
`18`		`- void OnButtonGo(Dali::WUAction action, bool selected = false);`
	`18`	`+ void OnButtonGo(Dali::WUAction action, bool selected = false, bool rawECL = false);`
`19`	`19`	`};`
`20`	`20`
`21`	`21`	`class CBuilderDlg :`
Original file line number	Diff line number	Diff line change
`@@ -2420,7 +2420,7 @@ class CMultiResultView :`
`2420`	`2420`	`int GetTabCount();`
`2421`	`2421`	`void CloseAllTabs();`
`2422`	`2422`	`void DestroyWindow();`
`2423`		`- void ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugString, bool archive, int maxRuntime, bool debug);`
	`2423`	`+ void ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugString, bool archive, int maxRuntime, bool debug, bool rawECL);`
`2424`	`2424`	`void PublishESDL(const std::_tstring & desdlID, const std::_tstring & desdlVersion);`
`2425`	`2425`	`void SetDeleteWorkunit(bool bDelete=true);`
`2426`	`2426`	`void PostSelectRibbon();`
`@@ -2552,10 +2552,10 @@ void CMultiResultView::RenameColumn(unsigned col, const std::_tstring& newname)`
`2552`	`2552`	`m_tabs[n]->RenameColumn(col, newname);`
`2553`	`2553`	`}`
`2554`	`2554`
`2555`		`-void CMultiResultView::ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugString, bool archive, int maxRuntime, bool debug)`
	`2555`	`+void CMultiResultView::ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugString, bool archive, int maxRuntime, bool debug, bool rawECL)`
`2556`	`2556`	`{`
`2557`	`2557`	`m_launchDebugger = debug;`
`2558`		`- CEclExec::ExecEcl(clusterName, queueName, action, attrQualifiedLabel, eclSource, eclPath, scheduled, label, resultLimit, debugString, archive, maxRuntime, debug);`
	`2558`	`+ CEclExec::ExecEcl(clusterName, queueName, action, attrQualifiedLabel, eclSource, eclPath, scheduled, label, resultLimit, debugString, archive, maxRuntime, debug, rawECL);`
`2559`	`2559`	`}`
`2560`	`2560`
`2561`	`2561`	`void CMultiResultView::PublishESDL(const std::_tstring & desdlID, const std::_tstring & desdlVersion)`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`#include <RecursiveMutex.h> //clib`
`6`	`6`	`#include "Thread.h" //clib`
`7`	`7`
`8`		`-void CEclExec::ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugSettings, bool archive, int maxRunTime, bool debug)`
	`8`	`+void CEclExec::ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugSettings, bool archive, int maxRunTime, bool debug, bool rawECL)`
`9`	`9`	`{`
`10`	`10`	`if (scheduled && scheduled[0])`
`11`	`11`	`{`
`12`	`12`	`clib::thread run(__FUNCTION__, boost::bind(&EclSchedule, this, std::make_pair(clusterName, queueName), std::make_pair(action, attrQualifiedLabel), std::make_pair(eclSource, scheduled), label, resultLimit, debugSettings, archive, maxRunTime));`
`13`	`13`	`}`
`14`	`14`	`else`
`15`	`15`	`{`
`16`		`- BindLimitStruct bls = {archive, maxRunTime, debug};`
	`16`	`+ BindLimitStruct bls = {archive, maxRunTime, debug, rawECL};`
`17`	`17`	`clib::thread run(__FUNCTION__, boost::bind(&EclGo, this, std::make_pair(clusterName, queueName), std::make_pair(action, attrQualifiedLabel), eclSource, eclPath, label, resultLimit, debugSettings, bls));`
`18`	`18`	`}`
`19`	`19`	`}`
`@@ -84,7 +84,7 @@ void CEclExec::EclGo(CComPtr<CEclExec> t, std::pair<std::_tstring, std::_tstring`
`84`	`84`	`{`
`85`	`85`	`CString wuid;`
`86`	`86`	`StlLinked<Dali::IDali> server = Dali::AttachDali();`
`87`		`- StlLinked<Dali::IWorkunit> workunit = server->Submit(clusterQueue.first.c_str(), clusterQueue.second.c_str(), actionAttrQualifiedLabel.first, actionAttrQualifiedLabel.second.c_str(), ecl, path, label, resultLimit, debugSettings, bls.archive, bls.maxRunTime, bls.debug);`
	`87`	`+ StlLinked<Dali::IWorkunit> workunit = server->Submit(clusterQueue.first.c_str(), clusterQueue.second.c_str(), actionAttrQualifiedLabel.first, actionAttrQualifiedLabel.second.c_str(), ecl, path, label, resultLimit, debugSettings, bls.archive, bls.maxRunTime, bls.debug, bls.rawECL);`
`88`	`88`	`if ( workunit.isLinked() )`
`89`	`89`	`{`
`90`	`90`	`UpdateDefaultCluster(clusterQueue.first.c_str());`
`@@ -100,7 +100,7 @@ void CEclExec::EclGoNoRefCount(CEclExec * t, CString cluster, CString queue, Dal`
`100`	`100`	`{`
`101`	`101`	`CString wuid;`
`102`	`102`	`StlLinked<Dali::IDali> server = Dali::AttachDali();`
`103`		`- StlLinked<Dali::IWorkunit> workunit = server->Submit(cluster, queue, action, attrQualifiedLabel, ecl, path, _T(""), 0, _T(""), false, 0, false);`
	`103`	`+ StlLinked<Dali::IWorkunit> workunit = server->Submit(cluster, queue, action, attrQualifiedLabel, ecl, path, _T(""), 0, _T(""), false, 0, false, false);`
`104`	`104`	`if ( workunit.isLinked() )`
`105`	`105`	`{`
`106`	`106`	`UpdateDefaultCluster(cluster);`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class WLIB_API CEclExec : public CUnknown, public boost::signals::trackable`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- virtual void ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugSettings, bool archive, int maxRunTime=0, bool debug=false);`
	`16`	`+ virtual void ExecEcl(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR eclPath, const TCHAR scheduled, const TCHAR label, int resultLimit, const TCHAR debugSettings, bool archive, int maxRunTime=0, bool debug=false, bool rawECL=false);`
`17`	`17`	`virtual void ExecEclNoRefCount(const TCHAR clusterName, const TCHAR queueName, Dali::WUAction action, const TCHAR attrQualifiedLabel, const TCHAR eclSource, const TCHAR *eclPath);`
`18`	`18`
`19`	`19`	`virtual void WorkunitCreated(Dali::IWorkunit * src);`
`@@ -37,6 +37,7 @@ class WLIB_API CEclExec : public CUnknown, public boost::signals::trackable`
`37`	`37`	`bool archive;`
`38`	`38`	`int maxRunTime;`
`39`	`39`	`bool debug;`
	`40`	`+ bool rawECL;`
`40`	`41`	`};`
`41`	`42`	`static void EclGo(CComPtr<CEclExec> bf, std::pair<std::_tstring, std::_tstring> clusterQueue, std::pair<Dali::WUAction, std::_tstring> actionAttrQualifiedLabel, CString ecl, CString path, CString label, int resultLimit, CString debugSettings, BindLimitStruct bls);`
`42`	`43`	`static void EclGoNoRefCount(CEclExec * bf, CString cluster, CString queue, Dali::WUAction action, CString attrQualifiedLabel, CString ecl, CString path);`