- move db_mysql and db_unixodbc str2val implementation to the DB core,

  remove the duplicated implementation in the modules
  (preparation for query copy problem)
- introduced a small regression for the unixodbc in the NULL value handling
  that needs to be fixed


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5322 689a6050-402a-0410-94f2-e92a70836424

lib/srdb1/db_val.c

@@ -0,0 +1,138 @@
+/*
+ * $Id$ 
+ *
+ * Copyright (C) 2001-2003 FhG Fokus
+ * Copyright (C) 2008-2009 1&1 Internet AG
+ *
+ * This file is part of Kamailio, a free SIP server.
+ *
+ * Kamailio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version
+ *
+ * Kamailio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "db_ut.h"
+
+/*!
+ * \brief Convert a str to a db value, copy strings
+ *
+ * Convert a str to a db value, does not copy strings.
+ * \param _t destination value type
+ * \param _v destination value
+ * \param _s source string
+ * \param _l string length
+ * \return 0 on success, negative on error
+ */
+int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l)
+{
+	static str dummy_string = {"", 0};
+	
+	if (!_v) {
+		LM_ERR("invalid parameter value\n");
+		return -1;
+	}
+	/* A NULL string is a NULL value, otherwise its an empty value */
+	if (!_s) {
+		memset(_v, 0, sizeof(db_val_t));
+			/* Initialize the string pointers to a dummy empty
+			 * string so that we do not crash when the NULL flag
+			 * is set but the module does not check it properly
+			 */
+		VAL_STRING(_v) = dummy_string.s;
+		VAL_STR(_v) = dummy_string;
+		VAL_BLOB(_v) = dummy_string;
+		VAL_TYPE(_v) = _t;
+		VAL_NULL(_v) = 1;
+		return 0;
+	}
+	VAL_NULL(_v) = 0;
+
+	switch(_t) {
+	case DB_INT:
+		LM_DBG("converting INT [%s]\n", _s);
+		if (db_str2int(_s, &VAL_INT(_v)) < 0) {
+			LM_ERR("error while converting integer value from string\n");
+			return -2;
+		} else {
+			VAL_TYPE(_v) = DB_INT;
+			return 0;
+		}
+		break;
+
+	case DB_BIGINT:
+		LM_DBG("converting BIGINT [%s]\n", _s);
+		if (db_str2longlong(_s, &VAL_BIGINT(_v)) < 0) {
+			LM_ERR("error while converting big integer value from string\n");
+			return -3;
+		} else {
+			VAL_TYPE(_v) = DB_BIGINT;
+			return 0;
+		}
+		break;
+
+	case DB_BITMAP:
+		LM_DBG("converting BITMAP [%s]\n", _s);
+		if (db_str2int(_s, &VAL_INT(_v)) < 0) {
+			LM_ERR("error while converting bitmap value from string\n");
+			return -4;
+		} else {
+			VAL_TYPE(_v) = DB_BITMAP;
+			return 0;
+		}
+		break;
+	
+	case DB_DOUBLE:
+		LM_DBG("converting DOUBLE [%s]\n", _s);
+		if (db_str2double(_s, &VAL_DOUBLE(_v)) < 0) {
+			LM_ERR("error while converting double value from string\n");
+			return -5;
+		} else {
+			VAL_TYPE(_v) = DB_DOUBLE;
+			return 0;
+		}
+		break;
+
+		case DB_STRING:
+			LM_DBG("converting STRING [%s]\n", _s);
+			VAL_STRING(_v) = _s;
+			VAL_TYPE(_v) = DB_STRING;
+			return 0;
+
+		case DB_STR:
+			LM_DBG("converting STR [%.*s]\n", _l, _s);
+			VAL_STR(_v).s = (char*)_s;
+			VAL_STR(_v).len = _l;
+			VAL_TYPE(_v) = DB_STR;
+			return 0;
+
+		case DB_DATETIME:
+			LM_DBG("converting DATETIME [%s]\n", _s);
+			if (db_str2time(_s, &VAL_TIME(_v)) < 0) {
+				LM_ERR("error while converting datetime value from string\n");
+				return -6;
+			} else {
+				VAL_TYPE(_v) = DB_DATETIME;
+				return 0;
+			}
+			break;
+
+		case DB_BLOB:
+			LM_DBG("converting BLOB [%.*s]\n", _l, _s);
+			VAL_BLOB(_v).s = (char*)_s;
+			VAL_BLOB(_v).len = _l;
+			VAL_TYPE(_v) = DB_BLOB;
+			return 0;
+	}
+	return -7;
+}
+

lib/srdb1/db_val.h

@@ -28,7 +28,8 @@
  * This file defines data structures that represents values in the database.
  * Several datatypes are recognized and converted by the database API.
  * Available types: DB_INT, DB_DOUBLE, DB_STRING, DB_STR, DB_DATETIME, DB_BLOB and DB_BITMAP
- * It also provides some macros for convenient access to this values.
+ * It also provides some macros for convenient access to this values,
+ * and a function to convert a str to a value.
  * \ingroup db
  */
 
@@ -165,4 +166,17 @@ typedef struct {
 #define VAL_BITMAP(dv) ((dv)->val.bitmap_val)
 
 
+/**
+ * \brief Convert a str to a db value, copy strings
+ *
+ * Convert a str to a db value, does not copy strings.
+ * \param _t destination value type
+ * \param _v destination value
+ * \param _s source string
+ * \param _l string length
+ * \return 0 on success, negative on error
+ */
+int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l);
+
+
 #endif /* DB_VAL_H */