From e54b36f8a5836781a4edeb6d7778c43c8c04594d Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Wed, 17 May 2006 22:25:06 +0000
Subject: [PATCH] More changes to fix defect 162934 (need to pass
 FLM_NO_TIMEOUT).

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@413 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 flaim/src/fdbcnfig.cpp | 2 +-
 flaim/src/flindex.cpp  | 4 ++--
 flaim/src/flsweep.cpp  | 4 ++--
 flaim/src/frebuild.cpp | 2 +-
 flaim/src/imonrec.cpp  | 6 +++---
 flaim/src/imonutil.cpp | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flaim/src/fdbcnfig.cpp b/flaim/src/fdbcnfig.cpp
index 811b133..804e3f6 100644
--- a/flaim/src/fdbcnfig.cpp
+++ b/flaim/src/fdbcnfig.cpp
@@ -565,7 +565,7 @@ Transmission_Error:
 
 			bDbInitialized = TRUE;
 			if (RC_BAD( rc = fdbInit( pDb, FLM_UPDATE_TRANS,
-				0, 5 | FLM_AUTO_TRANS, &bStartedTrans)))
+				0, FLM_AUTO_TRANS | FLM_NO_TIMEOUT, &bStartedTrans)))
 			{
 				goto Exit;
 			}
diff --git a/flaim/src/flindex.cpp b/flaim/src/flindex.cpp
index d2d0862..e997024 100644
--- a/flaim/src/flindex.cpp
+++ b/flaim/src/flindex.cpp
@@ -307,7 +307,7 @@ Transmission_Error:
 	}
 
 	if (RC_BAD( rc = fdbInit( pDb, FLM_UPDATE_TRANS,
-		FDB_TRANS_GOING_OK, FLM_AUTO_TRANS | 15, &bStartedTrans)))
+		FDB_TRANS_GOING_OK, FLM_AUTO_TRANS | FLM_NO_TIMEOUT, &bStartedTrans)))
 	{
 		goto Exit;
 	}
@@ -531,7 +531,7 @@ Transmission_Error:
 	}
 
 	if (RC_BAD( rc = fdbInit( pDb, FLM_UPDATE_TRANS,
-		FDB_TRANS_GOING_OK, FLM_AUTO_TRANS | 15, &bStartedTrans)))
+		FDB_TRANS_GOING_OK, FLM_AUTO_TRANS | FLM_NO_TIMEOUT, &bStartedTrans)))
 	{
 		goto Exit;
 	}
diff --git a/flaim/src/flsweep.cpp b/flaim/src/flsweep.cpp
index 85121d9..f11a0ee 100644
--- a/flaim/src/flsweep.cpp
+++ b/flaim/src/flsweep.cpp
@@ -703,9 +703,9 @@ RCODE DbWalk::UpdateRecord(
 
 	rc = ( pRecord)
 			? FlmRecordModify( m_pDb, m_SwpInfo.uiContainer,
-										uiDrn, pRecord, FLM_AUTO_TRANS | 25)
+										uiDrn, pRecord, FLM_AUTO_TRANS | FLM_NO_TIMEOUT)
 			: FlmRecordDelete( m_pDb,	m_SwpInfo.uiContainer,
-										uiDrn, FLM_AUTO_TRANS | 25);
+										uiDrn, FLM_AUTO_TRANS | FLM_NO_TIMEOUT);
 	if( RC_BAD( rc))
 	{
 		goto Exit;
diff --git a/flaim/src/frebuild.cpp b/flaim/src/frebuild.cpp
index 9041640..34746f6 100644
--- a/flaim/src/frebuild.cpp
+++ b/flaim/src/frebuild.cpp
@@ -228,7 +228,7 @@ RCODE flmDbRebuildFile(
 	bFdbInitialized = TRUE;
 	if (RC_BAD( fdbInit( pDb, FLM_UPDATE_TRANS,
 									FDB_DONT_RESET_DIAG,
-									FLM_AUTO_TRANS | 5, &bStartedTrans)))
+									FLM_AUTO_TRANS | FLM_NO_TIMEOUT, &bStartedTrans)))
 	{
 		goto Exit;
 	}
diff --git a/flaim/src/imonrec.cpp b/flaim/src/imonrec.cpp
index 6e04ba1..d1b793c 100644
--- a/flaim/src/imonrec.cpp
+++ b/flaim/src/imonrec.cpp
@@ -223,7 +223,7 @@ void F_ProcessRecordPage::addRecord(
 		goto Exit;
 	}
 
-	uiAutoTrans = FLM_AUTO_TRANS | 5;  // Wait at most 5 seconds
+	uiAutoTrans = FLM_AUTO_TRANS | FLM_NO_TIMEOUT;
 	if (RC_BAD( rc = FlmRecordAdd( hDb, uiContainer, &uiDrn, pRec, uiAutoTrans)))
 	{
 		displayRecordPage( pFlmSession, hDb, pszDbKey, pRec, bReadOnly,rc);
@@ -350,7 +350,7 @@ void F_ProcessRecordPage::modifyRecord(
 		goto Exit;
 	}
 
-	uiAutoTrans = FLM_AUTO_TRANS | 5;  // Wait at most 5 seconds
+	uiAutoTrans = FLM_AUTO_TRANS | FLM_NO_TIMEOUT;
 	if (RC_BAD( rc = FlmRecordModify( hDb, uiContainer, uiDrn, pRec, uiAutoTrans)))
 	{
 		displayRecordPage( pFlmSession, hDb, pszDbKey, pRec, bReadOnly, rc);
@@ -595,7 +595,7 @@ void F_ProcessRecordPage::deleteRecord(
 	if (RC_OK( rc = FlmRecordRetrieve(
 		hDb, uiContainer, uiDrn, FO_EXACT, (FlmRecord **)&pRec, &uiDrn)))
 	{
-		uiAutoTrans = FLM_AUTO_TRANS | 5;  // Wait at most 5 seconds
+		uiAutoTrans = FLM_AUTO_TRANS | FLM_NO_TIMEOUT;
 		if (RC_BAD( rc = FlmRecordDelete( hDb, uiContainer, uiDrn, uiAutoTrans)))
 		{
 			uiRc = rc;
diff --git a/flaim/src/imonutil.cpp b/flaim/src/imonutil.cpp
index 9823566..70d2eab 100644
--- a/flaim/src/imonutil.cpp
+++ b/flaim/src/imonutil.cpp
@@ -4361,7 +4361,7 @@ RCODE F_RecordMgrPage::display(
 			else
 			{
 				rc = FlmRecordModify( hDb, uiContainer, uiDrn, pInRec, 
-					FLM_AUTO_TRANS | 5);
+					FLM_AUTO_TRANS | FLM_NO_TIMEOUT);
 			}
 		}
 	}
@@ -4380,7 +4380,7 @@ RCODE F_RecordMgrPage::display(
 			else
 			{
 				rc = FlmRecordAdd( hDb, uiContainer, &uiDrn, pInRec, 
-					FLM_AUTO_TRANS | 5);
+					FLM_AUTO_TRANS | FLM_NO_TIMEOUT);
 			}
 		}
 	}