MS

Database/Adapters/MSSQLServer.vb

@@ -346,7 +346,7 @@ Public Class MSSQLServer
 
         Catch ex As Exception
             Logger.Error(ex)
-            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject)
+            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", pSqlCommandObject.CommandText)
             Throw ex
         Finally
             MaybeCommitTransaction(oTransaction, pTransactionMode)

Windream/Helpers.vb

@@ -63,46 +63,50 @@ Public Class Helpers
         End Select
     End Function
 
-    Friend Shared Function ConvertIndexValue(Type As Integer, Value As String) As Object
+    Friend Shared Function ConvertIndexValue(Type As Integer, pValue As String) As Object
         ' Leerzeichen an Anfang und Ende entfernen
-        Value = Value.Trim()
+        pValue = pValue.Trim()
 
         Select Case Type
             Case INDEX_TYPE_HASH
-                Return Value
+                Return pValue
             Case INDEX_TYPE_STRING
-                Return Value
+                Return pValue
             Case INDEX_TYPE_VECTOR_STRING
-                Return Value
+                Return pValue
             Case INDEX_TYPE_INTEGER
-                Value = Value.Replace(" ", String.Empty)
-                Return Convert.ToInt32(Value)
+                pValue = pValue.Replace(" ", String.Empty)
+                Return Convert.ToInt32(pValue)
             Case INDEX_TYPE_VECTOR_INTEGER
-                Value = Value.Replace(" ", String.Empty)
-                Return Convert.ToInt32(Value)
+                pValue = pValue.Replace(" ", String.Empty)
+                Return Convert.ToInt32(pValue)
             Case INDEX_TYPE_VECTOR_INTEGER_64BIT
-                Value = Value.Replace(" ", String.Empty)
-                Return Convert.ToInt64(Value)
+                pValue = pValue.Replace(" ", String.Empty)
+                Return Convert.ToInt64(pValue)
             Case INDEX_TYPE_VECTOR_BOOLEAN
-                Return Convert.ToBoolean(Value)
+                Return Convert.ToBoolean(pValue)
             Case INDEX_TYPE_BOOLEAN
-                Return Convert.ToBoolean(Value)
+                Return Convert.ToBoolean(pValue)
             Case INDEX_TYPE_DATE
-                Return Convert.ToDateTime(Value)
+                Return Convert.ToDateTime(pValue)
             Case INDEX_TYPE_DATE_TIME
-                Return Convert.ToDateTime(Value)
+                Return Convert.ToDateTime(pValue)
             Case INDEX_TYPE_TIME
-                Return Convert.ToDateTime(Value)
+                Return Convert.ToDateTime(pValue)
             Case INDEX_TYPE_VECTOR_DATE_TIME
-                Return Convert.ToDateTime(Value)
+                Return Convert.ToDateTime(pValue)
             Case INDEX_TYPE_VECTOR_DATE
-                Return Convert.ToDateTime(Value)
+                Return Convert.ToDateTime(pValue)
             Case INDEX_TYPE_FLOAT
-                Return Convert.ToDouble(Value)
+                Return Convert.ToDouble(pValue)
             Case INDEX_TYPE_VECTOR_FLOAT
-                Return Convert.ToDouble(Value)
+                Return Convert.ToDouble(pValue)
+            Case INDEX_TYPE_CURRENCY
+                'Wegen currency muß ein eigenes Objekt vom typ Variant erzeugt werden
+                Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(pValue))
+                Return pValue
             Case Else
-                Return Value
+                Return pValue
         End Select
     End Function