[mapserver-commits] r9003 - trunk/mapserver

[svn at osgeo.org]

Author: hobu
Date: 2009-05-05 16:47:22 -0400 (Tue, 05 May 2009)
New Revision: 9003

Modified:
   trunk/mapserver/mapsde.c
Log:
oops, try again on #3001 and actually use NCLOB instead of CLOB

Modified: trunk/mapserver/mapsde.c
===================================================================
--- trunk/mapserver/mapsde.c	2009-05-05 20:43:48 UTC (rev 9002)
+++ trunk/mapserver/mapsde.c	2009-05-05 20:47:22 UTC (rev 9003)
@@ -607,10 +607,15 @@
     msSDELayerInfo *sde;
 
     SE_BLOB_INFO blobval;
+
 #ifdef SE_CLOB_TYPE
     SE_CLOB_INFO clobval;
 #endif
 
+#ifdef SE_NCLOB_TYPE
+    SE_NCLOB_INFO nclobval;
+#endif
+
 #ifdef SE_NSTRING_TYPE
     SE_WCHAR* wide=NULL;
 #endif
@@ -800,10 +805,32 @@
                             "SE_stream_get_clob()");
                 return(MS_FAILURE);
             }
-            break;
-            
+            break;    
 #endif
 
+#ifdef SE_CLOB_TYPE
+
+        case SE_NCLOB_TYPE:
+            status = SE_stream_get_nclob(sde->connPoolInfo->stream, (short) (i+1), &nclobval);
+            if(status == SE_SUCCESS) {
+                shape->values[i] = (char *)malloc(sizeof(char)*nclobval.nclob_length);
+                shape->values[i] = memcpy(  shape->values[i],
+                                            nclobval.nclob_buffer, 
+                                            nclobval.nclob_length);
+                SE_nclob_free(&nclobval);
+            }
+            else if (status == SE_NULL_VALUE) {
+                shape->values[i] = strdup(MS_SDE_NULLSTRING);
+            }
+            else {
+                sde_error(  status,  
+                            "sdeGetRecord()", 
+                            "SE_stream_get_nclob()");
+                return(MS_FAILURE);
+            }
+            break;    
+#endif
+
         case SE_BLOB_TYPE:
             status = SE_stream_get_blob(sde->connPoolInfo->stream, (short) (i+1), &blobval);
             if(status == SE_SUCCESS) {