[mapserver-commits] r8449 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2009-01-23 10:10:03 -0500 (Fri, 23 Jan 2009)
New Revision: 8449

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/maporaclespatial.c
Log:
Fixed Blobs not filtered in OracleSpatial Attribute/WFS queries (#2829)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-01-21 18:56:42 UTC (rev 8448)
+++ trunk/mapserver/HISTORY.TXT	2009-01-23 15:10:03 UTC (rev 8449)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- Fixed Blobs not filtered in OracleSpatial Attribute/WFS queries (#2829)
+
 - Fixed memory leak of map::setProjection in PHP/MapScript (#2861)
 
 - Fixed "internal PHP GC memory leaks" in PHP/MapScript (#2767)

Modified: trunk/mapserver/maporaclespatial.c
===================================================================
--- trunk/mapserver/maporaclespatial.c	2009-01-21 18:56:42 UTC (rev 8448)
+++ trunk/mapserver/maporaclespatial.c	2009-01-23 15:10:03 UTC (rev 8449)
@@ -1918,6 +1918,7 @@
 int msOracleSpatialLayerGetItems( layerObj *layer )
 {
     char *rzt = "";
+    ub2 rzttype = 0;
     char *flk = "";
     int function = 0;
     int version = 0;
@@ -2000,6 +2001,8 @@
     for (i = 0; i <= layer->numitems; i++)
     {
         success = TRY( hand, OCIParamGet ((dvoid*) dthand->stmthp, (ub4)OCI_HTYPE_STMT,hand->errhp,(dvoid*)&pard, (ub4)i+1))
+               && TRY( hand, OCIAttrGet ((dvoid *) pard,(ub4) OCI_DTYPE_PARAM,(dvoid*)&rzttype,(ub4 *)0, (ub4) OCI_ATTR_DATA_TYPE, hand->errhp ))
+               && TRY( hand, OCIParamGet ((dvoid*) dthand->stmthp, (ub4)OCI_HTYPE_STMT,hand->errhp,(dvoid*)&pard, (ub4)i+1))
                && TRY( hand, OCIAttrGet ((dvoid *) pard,(ub4) OCI_DTYPE_PARAM,(dvoid*)&rzt,(ub4 *)&flk_len, (ub4) OCI_ATTR_NAME, hand->errhp ));
 
         flk = (char *)malloc(sizeof(char*) * flk_len+1);
@@ -2025,7 +2028,14 @@
             }
             else
             {
+              if (rzttype!=OCI_TYPECODE_BLOB) 
+              {
                 strcpy(layer->items[count_item], flk);
+              }
+              else
+              {
+                strcpy(layer->items[count_item], "null");
+              }
             }
             count_item++;
         }