Changeset 14361

Timestamp:

04/24/08 00:02:09 (3 months ago)

Author:

warmerdam

Message:

preliminary MSVC only solution for widechar text to utf-8 (#2339)

Files:

• branches/1.5/gdal/port/cpl_odbc.cpp (modified) (8 diffs)

branches/1.5/gdal/port/cpl_odbc.cpp

@@ -59 +59 @@
-#endif /* ndef SQLColumns_TABLE_CAT */
-
+#ifdef _MSC_VER
+#include "windows.h"
+#endif
+
-/************************************************************************/
-/*                           CPLODBCDriverInstaller()                   */
@@ -464 +468 @@
-        m_papszColTypeNames[iCol] = CPLStrdup((const char*)szName);
-
+//        CPLDebug( "ODBC", "%s %s %d", m_papszColNames[iCol], 
+//                  szName, m_panColType[iCol] );
-    }
-
@@ -696 +702 @@
-    for( iCol = 0; iCol < m_nColCount; iCol++ )
-    {
-2
+3
-        _SQLLEN cbDataLen;
-        SQLSMALLINT nFetchType = GetTypeMapping( m_panColType[iCol] );
-
-
-
+
+
+
+
+
+
-            nFetchType = SQL_C_CHAR;
-
@@ -734 +744 @@
-                if (nFetchType == SQL_C_CHAR) 
-                    while ((cbDataLen > 1) && (szWrkData[cbDataLen - 1] == 0)) 
- 
+
-            }
-                        
@@ -775 +785 @@
-                m_papszColValues[iCol] = (char *) 
-                    CPLRealloc( m_papszColValues[iCol], 
-1
+2
-                memcpy( m_papszColValues[iCol] + m_panColValueLengths[iCol], 
-                        szWrkData, nChunkLen );
-                m_panColValueLengths[iCol] += nChunkLen;
-                m_papszColValues[iCol][m_panColValueLengths[iCol]] = '\0';
+                m_papszColValues[iCol][m_panColValueLengths[iCol]+1] = '\0';
-            }
-        }
@@ -785 +796 @@
-        {
-            m_panColValueLengths[iCol] = cbDataLen;
-1
+2
-            memcpy( m_papszColValues[iCol], szWrkData, cbDataLen );
-            m_papszColValues[iCol][cbDataLen] = '\0';
+            m_papszColValues[iCol][cbDataLen+1] = '\0';
-        }
-
@@ -798 +810 @@
-            while ( iEnd > 0 && pszTarget[iEnd - 1] == ' ' )
-                pszTarget[--iEnd] = '\0';
+        }
+
+        // Convert WCHAR to UTF-8, assuming the WCHAR is UCS-2.
+        if( nFetchType == SQL_C_WCHAR && m_papszColValues[iCol] != NULL 
+            && m_panColValueLengths[iCol] > 0 )
+        {
+#ifdef _MSC_VER
+            wchar_t *pwszSrc = (wchar_t *) m_papszColValues[iCol];
+            int  nMaxChars = m_panColValueLengths[iCol]+1;
+            size_t nOutChars;
+
+            m_papszColValues[iCol] = (char *) CPLMalloc( nMaxChars );
+
+            nOutChars = WideCharToMultiByte( CP_UTF8, 0, pwszSrc, -1,
+                                             m_papszColValues[iCol], nMaxChars,
+                                             NULL, NULL );
+            if( nOutChars == ((size_t) -1) || nOutChars == 0 )
+            {
+                CPLDebug( "ODBC", 
+                          "WideCharToMultiByte(%S/%d) failed!: %d / %s", 
+                          pwszSrc,
+                          m_panColValueLengths[iCol] / 2,
+                          (int) nOutChars, 
+                          m_papszColValues[iCol] );
+
+                CPLFree( m_papszColValues[iCol] );
+                m_papszColValues[iCol] = NULL;
+                m_panColValueLengths[iCol] = 0;
+            }
+            else
+                m_panColValueLengths[iCol] = nOutChars;
+
+            CPLFree( pwszSrc );
+
+#endif /* def _MSC_VER */
-        }
-    }
@@ -1510 +1557 @@
-        case SQL_VARCHAR:
-        case SQL_LONGVARCHAR:
+            return SQL_C_CHAR;
+
-        case SQL_WCHAR:
-        case SQL_WVARCHAR:
-        case SQL_WLONGVARCHAR:
-
+W
-
-        case SQL_DECIMAL: