[mapserver-commits] r11739 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-20 13:45:31 -0700 (Fri, 20 May 2011)
New Revision: 11739

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/maporaclespatial.c
Log:
Fixed the query handling problem with the Oracle spatial driver (#3878)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-20 20:45:03 UTC (rev 11738)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-05-20 20:45:31 UTC (rev 11739)
@@ -15,6 +15,8 @@
 Version 6.0.1 (SVN branch-6-0):
 ---------------------------
 
+- Fixed the query handling problem with the Oracle spatial driver (#3878)
+
 - Fixed potential crash with AVERAGE resampling and crazy reprojection (#3886)
 
 - Fix for the warnings in mapunion.c (#3880)

Modified: branches/branch-6-0/mapserver/maporaclespatial.c
===================================================================
--- branches/branch-6-0/mapserver/maporaclespatial.c	2011-05-20 20:45:03 UTC (rev 11738)
+++ branches/branch-6-0/mapserver/maporaclespatial.c	2011-05-20 20:45:31 UTC (rev 11739)
@@ -2210,7 +2210,10 @@
             OCIStmtExecute( hand->svchp, sthand->stmthp, hand->errhp, (ub4)ARRAY_SIZE, (ub4)0, (OCISnapshot *)NULL, (OCISnapshot *)NULL, (ub4)OCI_STMT_SCROLLABLE_READONLY ) )
                &&  TRY( hand,
             /* get rows fetched */
-            OCIAttrGet( (dvoid *)sthand->stmthp, (ub4)OCI_HTYPE_STMT, (dvoid *)&sthand->rows_fetched, (ub4 *)0, (ub4)OCI_ATTR_ROW_COUNT, hand->errhp ) );
+            OCIAttrGet( (dvoid *)sthand->stmthp, (ub4)OCI_HTYPE_STMT, (dvoid *)&sthand->rows_fetched, (ub4 *)0, (ub4)OCI_ATTR_ROW_COUNT, hand->errhp ) )
+            && TRY( hand,
+            /* get rows count */
+            OCIAttrGet( (dvoid *)sthand->stmthp, (ub4)OCI_HTYPE_STMT, (dvoid *)&sthand->rows_count, (ub4 *)0, (ub4)OCI_ATTR_ROW_COUNT, hand->errhp ) );
     }
 
     if (!success)