From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sat, 20 Oct 2007 01:25:11 +0000 (+0000)
Subject: committed Ludos fix
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76ba61a7ca1ad0fee6413d854dd06f33cb75416f;p=sope

committed Ludos fix


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1546 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-gdl1/Oracle8/ChangeLog b/sope-gdl1/Oracle8/ChangeLog
index 7a95da96..40f031a5 100644
--- a/sope-gdl1/Oracle8/ChangeLog
+++ b/sope-gdl1/Oracle8/ChangeLog
@@ -1,8 +1,17 @@
-2007-10-05	Ludovic Marcotte <ludovic@inverse.ca>
+2007-10-19  Ludovic Marcotte <ludovic@inverse.ca>
+
+ 	* We call OCITerminate() in OracleAdaptorChannel:
+	  -closeChannel:       
+	
+	* Some formatting cleanups.
+
+2007-10-05  Ludovic Marcotte <ludovic@inverse.ca>
 
 	* Fixed otest wrt bundle name.
+	
 	* Modified sqlFolderFormat so that for the c_deleted
 	  columns, we default the value to 0.
+	
 	* Added full CLOB support for reading / writing more
 	  than 4000 characters in a CLOB column.
 
diff --git a/sope-gdl1/Oracle8/OracleAdaptorChannel.m b/sope-gdl1/Oracle8/OracleAdaptorChannel.m
index 9dd236bc..bf090d1f 100644
--- a/sope-gdl1/Oracle8/OracleAdaptorChannel.m
+++ b/sope-gdl1/Oracle8/OracleAdaptorChannel.m
@@ -112,7 +112,7 @@
   // Oracle's doc says: "If you call OCIStmtFetch2() with the nrows parameter set to 0, this cancels the cursor."
   if (OCIStmtFetch2(_current_stm, _oci_err, (ub4)0, (ub4)OCI_FETCH_NEXT, (sb4)0, (ub4)OCI_DEFAULT))
     {
-      NSLog( @"Fetch cancellation failed");
+      NSLog(@"Fetch cancellation failed");
     }
   
   [self _cleanup];
@@ -131,7 +131,12 @@
       // We logoff from the database.
       if (OCILogoff(_oci_ctx, _oci_err))
 	{
-	  NSLog( @"FAILED: OCILogoff()");
+	  NSLog(@"FAILED: OCILogoff()");
+	}
+
+      if (OCITerminate(OCI_DEFAULT))
+	{
+	  NSLog(@"FAILED: OCITerminate()");
 	}
     }
 }
@@ -369,19 +374,19 @@
                     (dvoid * (*)(dvoid *, dvoid *, size_t))0,
                     (void (*)(dvoid *, dvoid *)) 0 ))
     {
-      NSLog( @"FAILED: OCIInitialize()");
+      NSLog(@"FAILED: OCIInitialize()");
       return NO;
     }
   
   if (OCIEnvInit((OCIEnv **)&_oci_env, (ub4)OCI_DEFAULT, (size_t)0, (dvoid **)0))
     {
-      NSLog( @"FAILED: OCIEnvInit()");
+      NSLog(@"FAILED: OCIEnvInit()");
       return NO;
     }
   
   if (OCIHandleAlloc((dvoid *)_oci_env, (dvoid *)&_oci_err, (ub4)OCI_HTYPE_ERROR, (size_t)0, (dvoid **)0))
     {
-      NSLog( @"FAILED: OCIHandleAlloc() on errhp");
+      NSLog(@"FAILED: OCIHandleAlloc() on errhp");
       return NO;
     }
   
@@ -398,7 +403,7 @@
   if (OCILogon(_oci_env, _oci_err, &_oci_ctx, (const OraText*)username, strlen(username),
 	       (const OraText*)password, strlen(password), (const OraText*)database, strlen(database)))
     {
-      NSLog( @"FAILED: OCILogon(). username = %s  password = %s"
+      NSLog(@"FAILED: OCILogon(). username = %s  password = %s"
 	    @"  database = %s", username, password, database);
       return NO;
     }