summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/CVS/Entries8
-rw-r--r--src/data/data.cpp4
-rw-r--r--src/data/data.h4
-rw-r--r--src/data/data_base.cpp2
-rw-r--r--src/data/data_base.h2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/data/CVS/Entries b/src/data/CVS/Entries
index 1c04c12..f4f473a 100644
--- a/src/data/CVS/Entries
+++ b/src/data/CVS/Entries
@@ -3,8 +3,8 @@
/con.h/1.7/Mon Feb 21 01:55:49 2005//
/con_base.cpp/1.7/Fri Jan 7 21:17:53 2005//
/con_base.h/1.8/Mon Feb 21 01:55:49 2005//
-/data.cpp/1.13/Fri Feb 25 00:52:24 2005//
-/data.h/1.10/Fri Feb 25 00:52:24 2005//
-/data_base.cpp/1.15/Sun Mar 6 20:44:47 2005//
-/data_base.h/1.12/Sun Mar 6 20:44:47 2005//
+/data.cpp/1.12/Mon Feb 21 01:55:49 2005//
+/data.h/1.9/Mon Feb 21 01:55:49 2005//
+/data_base.cpp/1.14/Mon Feb 21 01:55:49 2005//
+/data_base.h/1.11/Mon Feb 21 01:55:49 2005//
D
diff --git a/src/data/data.cpp b/src/data/data.cpp
index fa509dd..fe994ea 100644
--- a/src/data/data.cpp
+++ b/src/data/data.cpp
@@ -80,13 +80,13 @@ data::parse_result( MYSQL_RES* p_result, vector<string>& vec_elements )
}
void
-data::insert_user_data( string s_user, string s_query, map<string,string> insert_map )
+data::insert_user_data( string s_user, string s_query, hashmap<string> insert_map )
{
insert_query( s_query, insert_map );
}
void
-data::insert_query( string s_query, map<string,string> map_insert )
+data::insert_query( string s_query, hashmap<string> map_insert )
{
vector<string> vec_elements = map_queries[s_query];
vector<string>::iterator iter = vec_elements.begin();
diff --git a/src/data/data.h b/src/data/data.h
index a6ca90f..a9a75f2 100644
--- a/src/data/data.h
+++ b/src/data/data.h
@@ -14,14 +14,14 @@ class data : public data_base // data implementation used in data.h
private:
MYSQL_RES* select_query( string s_query, string s_where_rule, vector<string>& vec_elements );
hashmap<string> parse_result( MYSQL_RES* p_result, vector<string>& vec_elements );
- void insert_query( string s_query, map<string,string> map_insert );
+ void insert_query( string s_query, hashmap<string> map_insert );
string secure_query( string s_mysql_query );
public:
data( );
~data( );
hashmap<string> select_user_data( string s_user, string s_query );
- void insert_user_data( string s_user, string s_query, map<string,string> insert_map );
+ void insert_user_data( string s_user, string s_query, hashmap<string> insert_map );
void update_user_data( string s_user, string s_query, hashmap<string> update_map );
};
diff --git a/src/data/data_base.cpp b/src/data/data_base.cpp
index 8150608..05f4e0a 100644
--- a/src/data/data_base.cpp
+++ b/src/data/data_base.cpp
@@ -47,7 +47,7 @@ data_base::data_base( )
}
}
-void data_base::init_connections()
+void data_base::initialize_connections()
{
int i_min_con = tool::string2int( wrap::CONF->get_elem("chat.database.mincon") ),
i_max_con = tool::string2int( wrap::CONF->get_elem("chat.database.maxcon") );
diff --git a/src/data/data_base.h b/src/data/data_base.h
index 79f5630..1da5ce7 100644
--- a/src/data/data_base.h
+++ b/src/data/data_base.h
@@ -36,7 +36,7 @@ public:
data_base();
~data_base();
- void init_connections();
+ void initialize_connections();
virtual hashmap<string> select_user_data( string s_user, string s_query );
virtual void insert_user_data( string s_user, string s_query, hashmap<string> insert_map );
virtual void update_user_data( string s_user, string s_query, hashmap<string> update_map );