From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 16 Jan 2011 17:21:15 +0000 (+0000)
Subject: yoweb-scrape: wip new flag and ocean functionality - IslandFlagInfo
X-Git-Tag: 6.8.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=c6872f2d692d1a4cc990cd0e46631e765760141b

yoweb-scrape: wip new flag and ocean functionality - IslandFlagInfo
---

diff --git a/yoweb-scrape b/yoweb-scrape
index 53da06e..a2add10 100755
--- a/yoweb-scrape
+++ b/yoweb-scrape
@@ -590,6 +590,19 @@ class IslandExtendedInfo(IslandBasicInfo):
 		return `(self.ocean, self.islandid, self.name,
 			self.yoweb_url, self.flagid)`
 
+class IslandFlagInfo(IslandExtendedInfo):
+	def __init__(self, ocean, islename):
+		IslandExtendedInfo.__init__(self, ocean, islename)
+		self.flag = None
+		self._collect_flag()
+
+	def _collect_flag(self):
+		if self.flagid is None: return
+		self.flag = FlagInfo(self.flagid, 1800)
+
+	def __str__(self):
+		return IslandExtendedInfo.__str__(self) + '; ' + str(self.flag)
+
 class OceanInfo():
 	# Public data attributes:
 	#   oi.islands[islename] = IslandInfo(...)
@@ -1326,7 +1339,7 @@ def do_standings_crew_of(args, bu):
 def do_ocean(args, bu):
 	if (len(args)): bu('ocean takes no further arguments')
 	fetcher.default_ocean()
-	oi = OceanInfo(IslandExtendedInfo)
+	oi = OceanInfo(IslandFlagInfo)
 	print oi
 	for islename in sorted(oi.islands.keys()):
 		isle = oi.islands[islename]