Patch level :2.2 206

Files correlati     :xvagadll.dll
Ricompilazione Demo : [ ]
Commento            :riportate modifiche dalla 2.1 per le ricerche via odbc


git-svn-id: svn://10.65.10.50/trunk@13456 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2005-10-25 17:38:30 +00:00
parent 7fcf9ccfb4
commit 476fa7d01f

View File

@ -3,6 +3,8 @@
#include "xvt.h" #include "xvt.h"
#if wxUSE_ODBC
class TwxConnectionDlg : public wxDialog class TwxConnectionDlg : public wxDialog
{ {
protected: protected:
@ -31,8 +33,6 @@ TwxConnectionDlg::TwxConnectionDlg() : wxDialog(NULL, wxID_ANY, "ODBC",
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE) wxDEFAULT_DIALOG_STYLE)
{ {
wxBoxSizer* ctlTopSizer = new wxBoxSizer(wxVERTICAL);
wxSizer* ctlTextSizer = new wxFlexGridSizer(4, 2, 8, 8); wxSizer* ctlTextSizer = new wxFlexGridSizer(4, 2, 8, 8);
AddString(ctlTextSizer, 1001, "Dsn", &_strDsn); AddString(ctlTextSizer, 1001, "Dsn", &_strDsn);
AddString(ctlTextSizer, 1002, "User", &_strUsr); AddString(ctlTextSizer, 1002, "User", &_strUsr);
@ -41,6 +41,7 @@ TwxConnectionDlg::TwxConnectionDlg() : wxDialog(NULL, wxID_ANY, "ODBC",
wxSizer* ctlButtonSizer = CreateButtonSizer(wxOK | wxCANCEL); wxSizer* ctlButtonSizer = CreateButtonSizer(wxOK | wxCANCEL);
wxBoxSizer* ctlTopSizer = new wxBoxSizer(wxVERTICAL);
ctlTopSizer ->Add(ctlTextSizer, 0, wxALIGN_CENTER); ctlTopSizer ->Add(ctlTextSizer, 0, wxALIGN_CENTER);
ctlTopSizer ->Add(ctlButtonSizer, 0, wxALIGN_CENTER); ctlTopSizer ->Add(ctlButtonSizer, 0, wxALIGN_CENTER);
@ -150,7 +151,7 @@ ULONG xvt_odbc_execute(XVT_ODBC handle, const char* sql, ODBC_CALLBACK cb, void*
{ {
case DB_DATA_TYPE_DATE: case DB_DATA_TYPE_DATE:
{ {
db->GetData(c+1, SQL_C_WXCHAR, buffer, BUF_SIZE, &cbReturned); db->GetData(c+1, SQL_C_CHAR, buffer, BUF_SIZE, &cbReturned);
int d = 0, m = 0, y = 0; int d = 0, m = 0, y = 0;
int n = sscanf(buffer, "%04d-%02d-%02d", &y, &m, &d); int n = sscanf(buffer, "%04d-%02d-%02d", &y, &m, &d);
if (n == 3 && d > 0) if (n == 3 && d > 0)
@ -160,7 +161,7 @@ ULONG xvt_odbc_execute(XVT_ODBC handle, const char* sql, ODBC_CALLBACK cb, void*
} }
break; break;
default: default:
db->GetData(c+1, SQL_C_WXCHAR, buffer, BUF_SIZE, &cbReturned); db->GetData(c+1, SQL_C_CHAR, buffer, BUF_SIZE, &cbReturned);
break; break;
} }
if (cbReturned != SQL_NULL_DATA) if (cbReturned != SQL_NULL_DATA)
@ -197,3 +198,24 @@ ULONG xvt_odbc_execute(XVT_ODBC handle, const char* sql, ODBC_CALLBACK cb, void*
return nCount; return nCount;
} }
#else
XVT_ODBC xvt_odbc_get_connection(const char* dsn, const char* usr, const char* pwd, const char* dir)
{
SORRY_BOX();
return XVT_ODBC(0);
}
BOOLEAN xvt_odbc_free_connection(XVT_ODBC handle)
{
return FALSE;
}
ULONG xvt_odbc_execute(XVT_ODBC handle, const char* sql, ODBC_CALLBACK cb, void* jolly)
{
return 0;
}
#endif