bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2026-04-05 17:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

preparing for database consolidation

Browse Source
This commit is contained in:
SJ
2013-04-28 14:18:09 +02:00
parent 8e27aea28d
commit 742aa27260
11 changed files with 49 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pilerimport.c
View File

@@ -523,15 +523,9 @@ int main(int argc, char **argv){
return ERR;
}
mysql_init(&(sdata.mysql));
mysql_options(&(sdata.mysql), MYSQL_OPT_CONNECT_TIMEOUT, (const char*)&cfg.mysql_connect_timeout);
if(mysql_real_connect(&(sdata.mysql), cfg.mysqlhost, cfg.mysqluser, cfg.mysqlpwd, cfg.mysqldb, cfg.mysqlport, cfg.mysqlsocket, 0) == 0){
printf("error: cant connect to mysql server\n");
return ERR;
}
mysql_real_query(&(sdata.mysql), "SET NAMES utf8", strlen("SET NAMES utf8"));
mysql_real_query(&(sdata.mysql), "SET CHARACTER SET utf8", strlen("SET CHARACTER SET utf8"));
if(open_database(&sdata, &cfg) == ERR) return 0;
if(create_prepared_statements(&sdata, &data) == ERR){
rc = ERR;
@@ -555,7 +549,7 @@ int main(int argc, char **argv){
if(data.folder == 0){
printf("error: cannot get/add folder '%s'\n", folder);
mysql_close(&(sdata.mysql));
close_database(&sdata);
return 0;
}
@@ -585,7 +579,7 @@ int main(int argc, char **argv){
ENDE:
close_prepared_statements(&data);
mysql_close(&(sdata.mysql));
close_database(&sdata);
if(quiet == 0) printf("\n");