- Merged Auction Search and Register. It seen to work fine, so you can test those.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12301 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 98 insertions, 14 deletions

diff --git a/src/char_sql/int_auction.c b/src/char_sql/int_auction.c
index 5d2a7fa9e..463115b10 100644
--- a/src/char_sql/int_auction.c
+++ b/src/char_sql/int_auction.c
@@ -17,6 +17,10 @@
 #include <string.h>

 #include <stdlib.h>

 

+// This is set to limit the search result

+// On iRO, no one uses auctions, so there is no way to know

+#define MAX_SEARCH_RESULTS 30

+

 static DBMap* auction_db_ = NULL; // int auction_id -> struct auction_data*

 

 void auction_delete(struct auction_data *auction);

@@ -29,7 +33,7 @@ time_t calc_times(void)
 	return mktime(localtime(&temp));

 }

 

-void inter_auction_save(struct auction_data *auction)

+void auction_save(struct auction_data *auction)

 {

 	int j;

 	StringBuf buf;

@@ -39,8 +43,8 @@ void inter_auction_save(struct auction_data *auction)
 		return;

 

 	StringBuf_Init(&buf);

-	StringBuf_Printf(&buf, "UPDATE `%s` SET `seller_id` = '%d', `seller_name` = ?, `buyer_id` = '%d', `buyer_name` = ?, `price` = '%d', `buynow` = '%d', `hours` = '%d', `timestamp` = '%d', `nameid` = '%d', `refine` = '%d', `attribute` = '%d'",

-		auction_db, auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, auction->timestamp, auction->item.nameid, auction->item.refine, auction->item.attribute);

+	StringBuf_Printf(&buf, "UPDATE `%s` SET `seller_id` = '%d', `seller_name` = ?, `buyer_id` = '%d', `buyer_name` = ?, `price` = '%d', `buynow` = '%d', `hours` = '%d', `timestamp` = '%d', `nameid` = '%d', `item_name` = ?, `type` = '%d', `refine` = '%d', `attribute` = '%d'",

+		auction_db, auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);

 	for( j = 0; j < MAX_SLOTS; j++ )

 		StringBuf_Printf(&buf, ", `card%d` = '%d'", j, auction->item.card[j]);

 	StringBuf_Printf(&buf, " WHERE `auction_id` = '%d'", auction->auction_id);

@@ -49,6 +53,7 @@ void inter_auction_save(struct auction_data *auction)
 	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))

 	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))

 	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))

+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))

 	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )

 	{

 		SqlStmt_ShowDebug(stmt);

@@ -61,6 +66,7 @@ void inter_auction_save(struct auction_data *auction)
 static bool auction_create(struct auction_data *auction)

 {

 	int j;

+

 	StringBuf buf;

 	SqlStmt* stmt;

 

@@ -68,11 +74,11 @@ static bool auction_create(struct auction_data *auction)
 		return false;

 

 	StringBuf_Init(&buf);

-	StringBuf_Printf(&buf, "INSERT INTO `%s` (`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,`price`,`buynow`,`hours`,`timestamp`,`nameid`,`refine`,`attribute`");

+	StringBuf_Printf(&buf, "INSERT INTO `%s` (`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`", auction_db);

 	for( j = 0; j < MAX_SLOTS; j++ )

 		StringBuf_Printf(&buf, ",`card%d`", j);

-	StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%d','%d','%d','%d'",

-		auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, auction->timestamp, auction->item.nameid, auction->item.refine, auction->item.attribute);

+	StringBuf_Printf(&buf, ") VALUES ('%d',?,'%d',?,'%d','%d','%d','%d','%d',?,'%d','%d','%d'",

+		auction->seller_id, auction->buyer_id, auction->price, auction->buynow, auction->hours, auction->timestamp, auction->item.nameid, auction->type, auction->item.refine, auction->item.attribute);

 	for( j = 0; j < MAX_SLOTS; j++ )

 		StringBuf_Printf(&buf, ",'%d'", auction->item.card[j]);

 	StringBuf_AppendStr(&buf, ")");

@@ -80,19 +86,26 @@ static bool auction_create(struct auction_data *auction)
 	stmt = SqlStmt_Malloc(sql_handle);

 	if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))

 	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, auction->seller_name, strnlen(auction->seller_name, NAME_LENGTH))

-	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH)) )

+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, auction->buyer_name, strnlen(auction->buyer_name, NAME_LENGTH))

+	||  SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, auction->item_name, strnlen(auction->item_name, ITEM_NAME_LENGTH))

+	||  SQL_SUCCESS != SqlStmt_Execute(stmt) )

 	{

 		SqlStmt_ShowDebug(stmt);

 		auction->auction_id = 0;

 	}

 	else

 	{

+		struct auction_data *auction_;

+

 		auction->item.amount = 1;

 		auction->item.identify = 1;

 

 		auction->auction_id = (unsigned int)SqlStmt_LastInsertId(stmt);

 		auction->auction_end_timer = add_timer( gettick() + ((auction->timestamp - (unsigned int)calc_times) * 1000) , auction_end_timer, auction->auction_id, 0);

-		idb_put(auction_db_, auction->auction_id, auction);

+

+		CREATE(auction_, struct auction_data, 1);

+		memcpy(auction_, auction, sizeof(struct auction_data));

+		idb_put(auction_db_, auction_->auction_id, auction_);

 	}

 

 	SqlStmt_Free(stmt);

@@ -169,7 +182,6 @@ void auction_delete(struct auction_data *auction)
 	if( auction->auction_end_timer != -1 )

 		delete_timer(auction->auction_end_timer, auction_end_timer);

 

-	aFree(auction);

 	idb_remove(auction_db_, auction_id);

 }

 

@@ -184,10 +196,10 @@ void inter_auctions_fromsql(void)
 

 	StringBuf_Init(&buf);

 	StringBuf_AppendStr(&buf, "SELECT `auction_id`,`seller_id`,`seller_name`,`buyer_id`,`buyer_name`,"

-		"`price`,`buynow`,`hours`,`timestamp`,`nameid`,`refine`,`attribute`");

+		"`price`,`buynow`,`hours`,`timestamp`,`nameid`,`item_name`,`type`,`refine`,`attribute`");

 	for( i = 0; i < MAX_SLOTS; i++ )

 		StringBuf_Printf(&buf, ",`card%d`", i);

-	StringBuf_Printf(&buf, " FROM `%s` ORDER BY `id` DESC", auction_db);

+	StringBuf_Printf(&buf, " FROM `%s` ORDER BY `auction_id` DESC", auction_db);

 

 	if( SQL_ERROR == Sql_Query(sql_handle, StringBuf_Value(&buf)) )

 		Sql_ShowDebug(sql_handle);

@@ -209,15 +221,18 @@ void inter_auctions_fromsql(void)
 

 		item = &auction->item;

 		Sql_GetData(sql_handle, 9, &data, NULL); item->nameid = atoi(data);

-		Sql_GetData(sql_handle,10, &data, NULL); item->refine = atoi(data);

-		Sql_GetData(sql_handle,11, &data, NULL); item->attribute = atoi(data);

+		Sql_GetData(sql_handle,10, &data, NULL); safestrncpy(auction->item_name, data, ITEM_NAME_LENGTH);

+		Sql_GetData(sql_handle,11, &data, NULL); auction->type = atoi(data);

+

+		Sql_GetData(sql_handle,12, &data, NULL); item->refine = atoi(data);

+		Sql_GetData(sql_handle,13, &data, NULL); item->attribute = atoi(data);

 

 		item->identify = 1;

 		item->amount = 1;

 

 		for( i = 0; i < MAX_SLOTS; i++ )

 		{

-			Sql_GetData(sql_handle, 12 + i, &data, NULL);

+			Sql_GetData(sql_handle, 14 + i, &data, NULL);

 			item->card[i] = atoi(data);

 		}

 

@@ -233,6 +248,75 @@ void inter_auctions_fromsql(void)
 	Sql_FreeResult(sql_handle);

 }

 

+static void mapif_Auction_sendlist(int fd, int account_id, short count, unsigned char *buf)

+{

+	int len = (sizeof(struct auction_data) * count) + 8;

+

+	WFIFOHEAD(fd, len);

+	WFIFOW(fd,0) = 0x3850;

+	WFIFOW(fd,2) = len;

+	WFIFOL(fd,4) = account_id;

+	memcpy(WFIFOP(fd,8), buf, len - 8);

+	WFIFOSET(fd,len);

+}

+

+static void mapif_parse_Auction_requestlist(int fd)

+{

+	char searchtext[NAME_LENGTH];

+	int account_id = RFIFOL(fd,4), len = sizeof(struct auction_data);

+	unsigned int price = RFIFOL(fd,10);

+	short type = RFIFOW(fd,8);

+	unsigned char buf[MAX_SEARCH_RESULTS * sizeof(struct auction_data)];

+	DBIterator* iter;

+	DBKey key;

+	struct auction_data *auction;

+	short i = 0;

+

+	memcpy(searchtext, RFIFOP(fd,14), NAME_LENGTH);

+

+	iter = auction_db_->iterator(auction_db_);

+	for( auction = iter->first(iter,&key); iter->exists(iter) && i < MAX_SEARCH_RESULTS; auction = iter->next(iter,&key) )

+	{

+		if( (type == 0 && auction->type != IT_ARMOR && auction->type != IT_PETARMOR) || 

+			(type == 1 && auction->type != IT_WEAPON) ||

+			(type == 2 && auction->type != IT_CARD) ||

+			(type == 3 && auction->type != IT_ETC) ||

+			(type == 4 && auction->price > price) ||

+			(type == 5 && strstr(auction->item_name, searchtext)) )

+			continue;

+

+		memcpy(WBUFP(buf, i * len), auction, len);

+		i++;

+	}

+	iter->destroy(iter);

+

+	mapif_Auction_sendlist(fd, account_id, i, buf);

+}

+

+static void mapif_parse_Auction_register(int fd)

+{

+	int account_id = RFIFOL(fd,4);

+	struct auction_data auction;

+

+	memcpy(&auction, RFIFOP(fd,8), sizeof(struct auction_data));

+	auction_create(&auction);

+}

+

+/*==========================================

+ * Packets From Map Server

+ *------------------------------------------*/

+int inter_auction_parse_frommap(int fd)

+{

+	switch(RFIFOW(fd,0))

+	{

+		case 0x3050: mapif_parse_Auction_requestlist(fd); break;

+		case 0x3051: mapif_parse_Auction_register(fd); break;

+		default:

+			return 0;

+	}

+	return 1;

+}

+

 int inter_auction_sql_init(void)

 {

 	auction_db_ = idb_alloc(DB_OPT_RELEASE_DATA);