Fix purchase limits for mall item searches.

src/kol/data/Patterns.py

@@ -165,8 +165,11 @@
 	# Rumpus Room patterns.
 	'rumpusRoomFurniture' : r'rump([0-9])_([0-9])\.gif',
 
-	# Mall patterns.
-	'mallItemSearchResult' : r'<a[^<>]*href="mallstore\.php\?whichstore=(?P<storeId>[0-9]+)&searchitem=(?P<itemId>[0-9]+)&searchprice=(?P<price>[0-9]+)"><b>(?P<storeName>[^<>]+)<\/b><\/a>[^<>]*<\/td><td[^<>]*>(?P<quantity>[0-9,]+)<\/td><td[^<>]*>[^<>]*(?P<limit>[0-9,]*)[^<>]*<\/td>',	
+	# Mall search patterns.
+	"mallItemSearchResult" : r'<tr class="graybelow(.*?)<\/tr>',
+	"mallItemSearchDetails" : r'<a[^<>]*href="mallstore\.php\?whichstore=(?P<storeId>[0-9]+)&searchitem=(?P<itemId>[0-9]+)&searchprice=(?P<price>[0-9]+)"><b>(?P<storeName>[^<>]+)<\/b><\/a>[^<>]*<\/td><td[^<>]*>(?P<quantity>[0-9,]+)<\/td><td[^<>]*>(?:&nbsp;)*(?P<limit>[0-9,]*)[^<>]*<\/td>',
+
+	# Mall purchase patterns.
 	"cantAffordItem" : r"<td>You can't afford that item\.<\/td>",
 	"mallNoItemAtThatPrice" : r"<td>This store doesn't have that item at that price\.",
 	"cantBuyItemIgnoreList" : r"<td>That player will not sell to you, because you are on his or her ignore list\.<\/td>",

src/kol/request/MallItemSearchRequest.py

@@ -43,7 +43,10 @@ def __init__(self, session, searchQuery, category=CATEGORY_ALL, noLimits=False,
 	def parseResponse(self):
 		items = []
 		itemMatchPattern = PatternManager.getOrCompilePattern('mallItemSearchResult')
-		for match in itemMatchPattern.finditer(self.responseText):
+		itemDetailsPattern = PatternManager.getOrCompilePattern('mallItemSearchDetails')
+		for itemMatch in itemMatchPattern.finditer(self.responseText):
+			matchText = itemMatch.group(1)
+			match = itemDetailsPattern.search(matchText)
 			itemId = int(match.group('itemId'))
 			try:
 				item = ItemDatabase.getItemFromId(itemId, self.session)
@@ -55,6 +58,8 @@ def parseResponse(self):
 				if len(limit) > 0:
 					limit = int(limit)
 				item["limit"] = limit
+				if matchText.find('limited"') >= 0:
+					item["hitLimit"] = True
 				items.append(item)
 			except ItemNotFoundError, inst:
 				Report.info("itemdatabase", "Unrecognized item found in mall search: %s" % itemId, inst)