[mapserver-commits] r9684 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-01-12 15:06:44 -0500 (Tue, 12 Jan 2010)
New Revision: 9684

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maporaclespatial.c
Log:
Fixed problem with the oracle driver w/FUNCTION=NONE (#3260)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-01-12 19:34:22 UTC (rev 9683)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-01-12 20:06:44 UTC (rev 9684)
@@ -15,6 +15,7 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- Fixed problem with the oracle driver w/FUNCTION=NONE (#3260)
 
 Version 5.6.1 (2010-01-08):
 ---------------------------

Modified: branches/branch-5-6/mapserver/maporaclespatial.c
===================================================================
--- branches/branch-5-6/mapserver/maporaclespatial.c	2010-01-12 19:34:22 UTC (rev 9683)
+++ branches/branch-5-6/mapserver/maporaclespatial.c	2010-01-12 20:06:44 UTC (rev 9684)
@@ -2026,7 +2026,7 @@
         
   /* do the actual binding */      
 
- if (success) {
+ if (success && function != FUNCTION_NONE ) { 
      success = TRY( hand,
             /* bind in srid */
             OCIBindByName( sthand->stmthp, &bnd2p,  hand->errhp, (text *) ":srid", strlen(":srid"),(ub1 *) srid,  strlen(srid)+1, SQLT_STR,