Changeset 14369

Timestamp:

04/29/08 23:51:40 (4 months ago)

Author:

warmerdam

Message:

track drivers returning UTF8 strings (RFC23)

Files:

• trunk/gdal/ogr/ogr_core.h (modified) (4 diffs)
• trunk/gdal/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp (modified) (1 diff)

trunk/gdal/ogr/ogr_core.h

@@ -210 +210 @@
-  /** String of ASCII chars */                  OFTString = 4,
-  /** Array of strings */                       OFTStringList = 5,
-
-
+
-  /** Raw Binary data */                        OFTBinary = 8,
-  /** Date */                                   OFTDate = 9,
@@ -244 +243 @@
-    double      Real;
-    char       *String;
-    /* wchar    *WideString; */
-    
-    struct {
@@ -260 +258 @@
-        char    **paList;
-    } StringList;
-
-    /*
-    union {
-        int   nCount;
-        wchar *paList;
-    } WideStringList;
-    */
-
-    struct {
@@ -306 +297 @@
-#define OLCDeleteFeature       "DeleteFeature"
-#define OLCFastSetNextByIndex  "FastSetNextByIndex"
+#define OLCStringsAsUTF8       "StringsAsUTF8"
-
-#define ODsCCreateLayer        "CreateLayer"

trunk/gdal/ogr/ogrsf_frmts/gml/ogrgmllayer.cpp

@@ -339 +339 @@
-    }
-
+    else if( EQUAL(pszCap,OLCStringsAsUTF8) )
+        return TRUE;
+
-    else 
-        return FALSE;

trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp

@@ -314 +314 @@
-        return (bHasPostGISGeometry && nSRSId != -2) && m_poAttrQuery == NULL;
-
+    else if( EQUAL(pszCap,OLCStringsAsUTF8) )
+        return TRUE;
+
-    else
-        return FALSE;

trunk/gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp

@@ -1503 +1503 @@
-        return bHasPostGISGeometry;
-
+    else if( EQUAL(pszCap,OLCStringsAsUTF8) )
+        return TRUE;
+
-    else
-        return FALSE;