mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed code to use a single FlmDbSystem object. Fixed utilities so that they build using FTK.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@405 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-05-10 22:27:54 +00:00
parent 62e33bcd7d
commit 8df295d049
30 changed files with 289 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xflaim/src/fqsort.cpp
View File

@@ -464,15 +464,13 @@ F_QueryResultSet::~F_QueryResultSet()
}
if (m_pResultSetDb)
{
F_DbSystem dbSystem;
if (m_pResultSetDb->getTransType() != XFLM_NO_TRANS)
{
m_pResultSetDb->transAbort();
}
m_pResultSetDb->Release();
m_pResultSetDb = NULL;
(void)dbSystem.dbRemove( m_szResultSetDibName, NULL, NULL, TRUE);
gv_pXFlmDbSystem->dbRemove( m_szResultSetDibName, NULL, NULL, TRUE);
}
if (m_hMutex != F_MUTEX_NULL)
@@ -490,7 +488,6 @@ RCODE F_QueryResultSet::initResultSet(
{
RCODE rc = NE_XFLM_OK;
XFLM_CREATE_OPTS createOpts;
F_DbSystem dbSystem;
FLMUINT uiNum = (FLMUINT)this;
flmAssert( !m_pResultSetDb);
@@ -509,8 +506,9 @@ RCODE F_QueryResultSet::initResultSet(
// Generate a random file name
f_sprintf( m_szResultSetDibName, "%x.db", (unsigned)uiNum);
if (RC_OK( rc = dbSystem.dbCreate( m_szResultSetDibName, NULL, NULL,
NULL, NULL, &createOpts, TRUE, (IF_Db **)&m_pResultSetDb)))
if (RC_OK( rc = gv_pXFlmDbSystem->dbCreate( m_szResultSetDibName,
NULL, NULL, NULL, NULL, &createOpts,
TRUE, (IF_Db **)&m_pResultSetDb)))
{
break;
}