transactd 1.2.0 → 2.0.0

data/source/global/tdclatl/RecordsetQuery.cpp

@@ -0,0 +1,118 @@
+/*=================================================================
+   Copyright (C) 2014 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+#include "stdafx.h"
+#include "RecordsetQuery.h"
+
+void CRecordsetQuery::setResult(IRecordsetQuery** retVal)
+{
+    this->QueryInterface(IID_IRecordsetQuery, (void**)retVal);
+}
+
+STDMETHODIMP CRecordsetQuery::Reset(IRecordsetQuery** retVal)
+{
+    m_qb.reset();
+    setResult(retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CRecordsetQuery::When(BSTR Name, BSTR Logic, VARIANT Value,
+                                   IRecordsetQuery** retVal)
+{
+    if (Value.vt != VT_BSTR)
+        VariantChangeType(&Value, &Value, 0, VT_BSTR);
+    m_qb.when(Name, Logic, Value.bstrVal);
+    setResult(retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CRecordsetQuery::And(BSTR Name, BSTR Logic, VARIANT Value,
+                                  IRecordsetQuery** retVal)
+{
+    if (Value.vt != VT_BSTR)
+        VariantChangeType(&Value, &Value, 0, VT_BSTR);
+    m_qb.and_(Name, Logic, Value.bstrVal);
+    setResult(retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CRecordsetQuery::Or(BSTR Name, BSTR Logic, VARIANT Value,
+                                 IRecordsetQuery** retVal)
+{
+    if (Value.vt != VT_BSTR)
+        VariantChangeType(&Value, &Value, 0, VT_BSTR);
+    m_qb.or_(Name, Logic, Value.bstrVal);
+    setResult(retVal);
+    return S_OK;
+}
+
+STDMETHODIMP CSortField::get_Name(BSTR* Value)
+{
+    return S_OK;
+}
+
+STDMETHODIMP CSortField::put_Name(BSTR Value)
+{
+    return S_OK;
+}
+
+STDMETHODIMP CSortField::get_Asc(VARIANT_BOOL* Value)
+{
+    return S_OK;
+}
+
+STDMETHODIMP CSortField::put_Asc(VARIANT_BOOL Value)
+{
+    return S_OK;
+}
+
+//------------------------------------------------------------------------
+STDMETHODIMP CSortFields::Add(BSTR Name, VARIANT_BOOL Asc)
+{
+    m_sortFields.add(Name, (Asc == -1));
+    return S_OK;
+}
+
+STDMETHODIMP CSortFields::get_Size(int* Value)
+{
+    *Value = (int)m_sortFields.size();
+    return S_OK;
+}
+
+STDMETHODIMP CSortFields::Item(int Index, ISortField** retVal)
+{
+    CComObject<CSortField>* obj;
+
+    CComObject<CSortField>::CreateInstance(&obj);
+    if (obj)
+    {
+        obj->m_sortField = m_sortFields[Index];
+
+        ISortField* fd;
+        obj->QueryInterface(IID_ISortField, (void**)&fd);
+        _ASSERTE(fd);
+        *retVal = fd;
+    }
+    return S_OK;
+}
+
+STDMETHODIMP CSortFields::Clear()
+{
+    m_sortFields.clear();
+    return S_OK;
+}

data/source/global/tdclatl/RecordsetQuery.h

@@ -0,0 +1,126 @@
+#pragma once
+/*=================================================================
+   Copyright (C) 2014 BizStation Corp All rights reserved.
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
+=================================================================*/
+#include "resource.h"
+
+#include "tdclatl_i.h"
+#include <bzs/db/protocol/tdap/client/groupQuery.h>
+
+using namespace ATL;
+
+class ATL_NO_VTABLE CRecordsetQuery
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CRecordsetQuery, &CLSID_RecordsetQuery>,
+      public IDispatchImpl<IRecordsetQuery, &IID_IRecordsetQuery,
+                           &LIBID_transactd, /*wMajor =*/1, /*wMinor =*/0>
+{
+
+    void setResult(IRecordsetQuery** retVal);
+
+public:
+    bzs::db::protocol::tdap::client::recordsetQuery m_qb;
+    CRecordsetQuery() {}
+
+    DECLARE_REGISTRY_RESOURCEID(IDR_RECORDSETQUERY)
+
+    BEGIN_COM_MAP(CRecordsetQuery)
+    COM_INTERFACE_ENTRY(IRecordsetQuery)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    HRESULT FinalConstruct() { return S_OK; }
+
+    void FinalRelease() {}
+
+public:
+    bzs::db::protocol::tdap::client::recordsetQuery& query() { return m_qb; };
+    STDMETHOD(Reset)(IRecordsetQuery** retVal);
+
+    STDMETHOD(When)(BSTR Name, BSTR Logic, VARIANT Value,
+                    IRecordsetQuery** retVal);
+    STDMETHOD(And)(BSTR Name, BSTR Logic, VARIANT Value,
+                   IRecordsetQuery** retVal);
+    STDMETHOD(Or)(BSTR Name, BSTR Logic, VARIANT Value,
+                  IRecordsetQuery** retVal);
+};
+
+class ATL_NO_VTABLE CSortField
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CSortField, &CLSID_SortField>,
+      public IDispatchImpl<ISortField, &IID_ISortField, &LIBID_transactd,
+                           /*wMajor =*/1, /*wMinor =*/0>
+{
+
+public:
+    bzs::db::protocol::tdap::client::sortField m_sortField;
+    CSortField() {}
+
+    BEGIN_COM_MAP(CSortField)
+    COM_INTERFACE_ENTRY(ISortField)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    HRESULT FinalConstruct() { return S_OK; }
+
+    void FinalRelease() {}
+
+public:
+    STDMETHOD(get_Name)(BSTR* Value);
+    STDMETHOD(put_Name)(BSTR Value);
+    STDMETHOD(get_Asc)(VARIANT_BOOL* Value);
+    STDMETHOD(put_Asc)(VARIANT_BOOL Value);
+};
+
+class ATL_NO_VTABLE CSortFields
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CSortFields, &CLSID_SortFields>,
+      public IDispatchImpl<ISortFields, &IID_ISortFields, &LIBID_transactd,
+                           /*wMajor =*/1, /*wMinor =*/0>
+{
+
+public:
+    bzs::db::protocol::tdap::client::sortFields m_sortFields;
+    CSortFields() {}
+
+    DECLARE_REGISTRY_RESOURCEID(IDR_SORTFIELDS)
+
+    BEGIN_COM_MAP(CSortFields)
+    COM_INTERFACE_ENTRY(ISortFields)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    HRESULT FinalConstruct() { return S_OK; }
+
+    void FinalRelease() {}
+
+public:
+    STDMETHOD(Add)(BSTR Name, VARIANT_BOOL Asc);
+    STDMETHOD(get_Size)(int* Value);
+    STDMETHOD(Item)(int Index, ISortField** retVal);
+    STDMETHOD(Clear)();
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(RecordsetQuery), CRecordsetQuery)
+OBJECT_ENTRY_AUTO(__uuidof(SortFields), CSortFields)

data/source/global/tdclatl/Table.cpp

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "stdafx.h"
@@ -21,13 +21,11 @@
 #include "Database.h"
 #include "DbDef.h"
 #include "TableDef.h"
-#include "Field.h"
 #include "QueryBase.h"
+#include <bzs/db/protocol/tdap/client/fields.h>
 
 using namespace bzs::db::protocol::tdap;
 
-
-
 short CTableTd::GetFieldNum(VARIANT* Index)
 {
     short index = -1;
@@ -139,19 +137,19 @@ STDMETHODIMP CTableTd::put_Vbin(VARIANT Index, BSTR Value)
 
 STDMETHODIMP CTableTd::get_TableDef(ITableDef** Value)
 {
-    CComObject<CTableDef> *piObj;
+    CComObject<CTableDef>* piObj;
     CComObject<CTableDef>::CreateInstance(&piObj);
-	if (piObj)
-	{
-		m_tabledef = const_cast<tabledef*>(m_tb->tableDef());
-		piObj->m_tabledefPtr = &m_tabledef;
-		_ASSERTE(m_db);
-		ITableDef* tbd;
-		piObj->QueryInterface(IID_ITableDef, (void**)&tbd);
-		_ASSERTE(tbd);
-		*Value = tbd;
-	}else
-		*Value = 0;
+    if (piObj)
+    {
+        m_tabledef = const_cast<tabledef*>(m_tb->tableDef());
+        piObj->m_tabledefPtr = &m_tabledef;
+        ITableDef* tbd;
+        piObj->QueryInterface(IID_ITableDef, (void**)&tbd);
+        _ASSERTE(tbd);
+        *Value = tbd;
+    }
+    else
+        *Value = 0;
     return S_OK;
 }
 
@@ -211,13 +209,13 @@ STDMETHODIMP CTableTd::Seek(eLockType lockBias)
 
 STDMETHODIMP CTableTd::SeekGreater(VARIANT_BOOL orEqual, eLockType lockBias)
 {
-    m_tb->seekGreater(orEqual,(ushort_td)lockBias);
+    m_tb->seekGreater(orEqual, (ushort_td)lockBias);
     return S_OK;
 }
 
 STDMETHODIMP CTableTd::SeekLessThan(VARIANT_BOOL orEqual, eLockType lockBias)
 {
-    m_tb->seekLessThan(orEqual,(ushort_td)lockBias);
+    m_tb->seekLessThan(orEqual, (ushort_td)lockBias);
     return S_OK;
 }
 
@@ -245,9 +243,10 @@ STDMETHODIMP CTableTd::get_RecordLength(long* Value)
     return S_OK;
 }
 
-STDMETHODIMP CTableTd::get_RecordCount(long* Value)
+STDMETHODIMP CTableTd::RecordCount(VARIANT_BOOL estimate,
+                                   VARIANT_BOOL fromCurrent, long* Value)
 {
-    *Value = m_tb->recordCount();
+    *Value = m_tb->recordCount((estimate == -1), (fromCurrent == -1));
     return S_OK;
 }
 
@@ -305,12 +304,6 @@ STDMETHODIMP CTableTd::FindPrev(VARIANT_BOOL notIncCurrent)
     return S_OK;
 }
 
-STDMETHODIMP CTableTd::get_Filter(BSTR* Value)
-{
-    *Value = ::SysAllocString(m_tb->filterStr());
-    return S_OK;
-}
-
 STDMETHODIMP CTableTd::put_Filter(BSTR Value)
 {
     m_tb->setFilter(Value, m_filterRejectCount, m_filterGetCount);
@@ -363,7 +356,6 @@ STDMETHODIMP CTableTd::CommitBulkInsert()
 {
     m_tb->commitBulkInsert(false);
     return S_OK;
-
 }
 
 STDMETHODIMP CTableTd::get_FilterGetCount(long* Value)
@@ -390,26 +382,28 @@ STDMETHODIMP CTableTd::put_FilterRejectCount(long Value)
     return S_OK;
 }
 
-STDMETHODIMP CTableTd::Field(VARIANT Index, IField** Value)
+STDMETHODIMP CTableTd::Field(VARIANT Index, IField** retVal)
 {
 
     short index = GetFieldNum(&Index);
     if (index < 0)
         return Error("Invalid index", IID_ITable);
 
-    CComObject<CField> *piObj;
-    CComObject<CField>::CreateInstance(&piObj);
-	if (piObj)
-	{
-		piObj->m_tb = m_tb;
-		piObj->m_index = index;
-		IField* tbd;
-		piObj->QueryInterface(IID_IField, (void**)&tbd);
-		_ASSERTE(tbd);
-		*Value = piObj;
-	}
-	else
-		*Value = 0;
+    if (m_fieldObj == NULL)
+    {
+        CComObject<CField>::CreateInstance(&m_fieldObj);
+        if (m_fieldObj)
+            m_fieldObj->AddRef();
+    }
+    if (m_fieldObj)
+    {
+        client::fields fds(*m_tb);
+        m_fieldObj->m_fd = fds[index];
+        IField* fd;
+        m_fieldObj->QueryInterface(IID_IField, (void**)&fd);
+        _ASSERTE(fd);
+        *retVal = fd;
+    }
     return S_OK;
 }
 
@@ -489,15 +483,13 @@ STDMETHODIMP CTableTd::TdapErr(OLE_HANDLE hWnd, BSTR* Value)
 {
     if (Value)
     {
-        wchar_t tmp[512] =
-        {NULL};
+        wchar_t tmp[512] = { NULL };
         m_tb->tdapErr((HWND)hWnd, tmp);
         *Value = ::SysAllocString(tmp);
     }
     else
         m_tb->tdapErr((HWND)hWnd);
     return S_OK;
-
 }
 
 STDMETHODIMP CTableTd::Unlock_(unsigned int bm)
@@ -602,23 +594,28 @@ STDMETHODIMP CTableTd::SmartUpdate(void)
 
 STDMETHODIMP CTableTd::KeyValueDescription(BSTR* Value)
 {
-	wchar_t tmp[8192];
-	m_tb->keyValueDescription(tmp, 8192);
-	*Value = tmp;
-	return S_OK;
+    wchar_t tmp[8192];
+    m_tb->keyValueDescription(tmp, 8192);
+    *Value = tmp;
+    return S_OK;
 }
 
 STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value)
 {
-	if (Value)
-	{
-		CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
-		if (p)
-		{	
-			m_tb->setQuery(&p->query());
-			return S_OK;
-		}
-	}
-	return S_FALSE;
-	
+    if (Value)
+    {
+        CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
+        if (p)
+        {
+            m_tb->setQuery(&p->query());
+            return S_OK;
+        }
+    }
+    return S_FALSE;
+}
+
+STDMETHODIMP CTableTd::FieldNumByName(BSTR Name, short* Value)
+{
+    *Value = m_tb->fieldNumByName(Name);
+    return S_FALSE;
 }

data/source/global/tdclatl/Table.h

@@ -13,51 +13,54 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "resource.h"
 
 #include "tdclatl_i.h"
-#include <bzs/db/protocol/tdap/client/table.h>
-
+#include "Field.h"
+#include <bzs/db/protocol/tdap/client/trdboostapi.h>
 using namespace ATL;
 
-
-
-class ATL_NO_VTABLE CTableTd : public CComObjectRootEx<CComSingleThreadModel>,
-    public CComCoClass<CTableTd, &CLSID_Table>,
-    public IDispatchImpl<ITable, &IID_ITable, &LIBID_transactd, /* wMajor = */ 1, /* wMinor = */ 0>
+class ATL_NO_VTABLE CTableTd
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CTableTd, &CLSID_Table>,
+      public IDispatchImpl<ITable, &IID_ITable, &LIBID_transactd,
+                           /* wMajor = */ 1, /* wMinor = */ 0>
 {
 
     int m_filterRejectCount;
     int m_filterGetCount;
-	bzs::db::protocol::tdap::tabledef* m_tabledef;
+    bzs::db::protocol::tdap::tabledef* m_tabledef;
     short GetFieldNum(VARIANT* Index);
     CComBSTR m_str;
+    CComObject<CField>* m_fieldObj;
 
 public:
-	CTableTd():m_tb(NULL),m_db(NULL), m_filterRejectCount(1), m_filterGetCount(0){}
-
+    CTableTd() : m_filterRejectCount(1), m_filterGetCount(0), m_fieldObj(NULL)
+    {
+    }
 
-    bzs::db::protocol::tdap::client::table* m_tb;
-	bzs::db::protocol::tdap::client::database* m_db;
+    bzs::db::protocol::tdap::client::table_ptr m_tb;
 
-    BEGIN_COM_MAP(CTableTd) 
-		COM_INTERFACE_ENTRY(ITable) 
-		COM_INTERFACE_ENTRY(IDispatch) 
-	END_COM_MAP()
+    BEGIN_COM_MAP(CTableTd)
+    COM_INTERFACE_ENTRY(ITable)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    HRESULT FinalConstruct() {return S_OK;}
+    HRESULT FinalConstruct() { return S_OK; }
 
-	void FinalRelease(){if (m_tb) m_tb->release();};
+    void FinalRelease()
+    {
+        if (m_fieldObj)
+            m_fieldObj->Release();
+    };
 
 public:
-
-
     STDMETHOD(get_Text)(VARIANT Index, BSTR* Value);
     STDMETHOD(get_Vlng)(VARIANT Index, int* Value);
     STDMETHOD(put_Text)(VARIANT Index, BSTR Value);
@@ -78,7 +81,8 @@ public:
     STDMETHOD(SeekByBookMark)(long Value, eLockType lockBias);
     STDMETHOD(get_Percentage)(long* Value);
     STDMETHOD(get_RecordLength)(long* Value);
-    STDMETHOD(get_RecordCount)(long* Value);
+    STDMETHOD(RecordCount)(VARIANT_BOOL estimate, VARIANT_BOOL fromCurrent,
+                           long* Value);
     STDMETHOD(SeekByPercentage)(long Value);
     STDMETHOD(get_KeyNum)(short* Value);
     STDMETHOD(get_Stat)(eStatus* eStatus);
@@ -92,14 +96,13 @@ public:
     STDMETHOD(FindLast)();
     STDMETHOD(FindNext)(VARIANT_BOOL notIncCurrent);
     STDMETHOD(FindPrev)(VARIANT_BOOL notIncCurrent);
-    STDMETHOD(get_Filter)(BSTR* Value);
     STDMETHOD(put_Filter)(BSTR Value);
     STDMETHOD(get_V64)(VARIANT Index, __int64* Value);
     STDMETHOD(put_V64)(VARIANT Index, __int64 Value);
     STDMETHOD(UpDate)(eUpdateType ncc);
     STDMETHOD(StepFirst)(eLockType lockBias);
-	STDMETHOD(StepLast)(eLockType lockBias);
-	STDMETHOD(StepPrev)(eLockType lockBias);
+    STDMETHOD(StepLast)(eLockType lockBias);
+    STDMETHOD(StepPrev)(eLockType lockBias);
     STDMETHOD(StepNext)(eLockType lockBias);
 
     STDMETHOD(AbortBulkInsert)();
@@ -139,7 +142,7 @@ public:
     STDMETHOD(get_MyDateTimeValueByBtrv)(VARIANT_BOOL* Value);
     STDMETHOD(get_ValiableFormatType)(VARIANT_BOOL* Value);
     STDMETHOD(SmartUpdate)(void);
-	STDMETHOD(KeyValueDescription)(BSTR* Value);
-	STDMETHOD(SetQuery)(IQueryBase* Value);
-
+    STDMETHOD(KeyValueDescription)(BSTR* Value);
+    STDMETHOD(SetQuery)(IQueryBase* Value);
+    STDMETHOD(FieldNumByName)(BSTR Name, short* Value);
 };