[os-devel] SF.net SVN: ospace:[336] branches/ospace_0.5

[<da...@us...>]

Revision: 336
          http://ospace.svn.sourceforge.net/ospace/?rev=336&view=rev
Author:   dahaic
Date:     2013-02-02 17:45:09 +0000 (Sat, 02 Feb 2013)
Log Message:
-----------
Polish of tech parser code. [Lukc]

Modified Paths:
--------------
    branches/ospace_0.5/ChangeLog.txt
    branches/ospace_0.5/server/lib/ige/ospace/Rules/Techs.py

Modified: branches/ospace_0.5/ChangeLog.txt
===================================================================
--- branches/ospace_0.5/ChangeLog.txt	2012-10-30 17:09:36 UTC (rev 335)
+++ branches/ospace_0.5/ChangeLog.txt	2013-02-02 17:45:09 UTC (rev 336)
@@ -6,6 +6,9 @@
 - $Author$
 - $Revision$
 
+[2013-02-02]
+- Polishing of the code responsible for parsing of technologies [lukc]
+
 [2012-10-30]
 - Fixed bug in Morale overlay evaluation. [dahaic]
 

Modified: branches/ospace_0.5/server/lib/ige/ospace/Rules/Techs.py
===================================================================
--- branches/ospace_0.5/server/lib/ige/ospace/Rules/Techs.py	2012-10-30 17:09:36 UTC (rev 335)
+++ branches/ospace_0.5/server/lib/ige/ospace/Rules/Techs.py	2013-02-02 17:45:09 UTC (rev 336)
@@ -256,54 +256,57 @@
 			self.tech = Technology(int(attrs['id']), attrs['symbol'], techs)
 			setattr(Tech, attrs['symbol'], int(attrs['id']))
 			self.tech.set('name', attrs['name'])
-		elif self.state == 3 and name == 'structure':
-			self.tech.set('isStructure', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'discovery':
-			self.tech.set('isDiscovery', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'notdiscovery':
-			self.tech.set('isDiscovery', 0)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'starting':
-			self.tech.set('isStarting', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'notstarting':
-			self.tech.set('isStarting', 0)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'shipequip':
-			self.tech.set('isShipEquip', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'project':
-			self.tech.set('isProject', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'shiphull':
-			self.tech.set('isShipHull', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'mine':
-			self.tech.set('isMine', 1)
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'data':
-			for key in attrs.keys():
-				self.tech.set(key, attrs[key])
-		elif self.state == 3 and name == 'preresearch':
-			self.state = 4
-			self.text = ''
-		elif self.state == 3 and name == 'description':
-			self.state = 4
-			self.text = ''
-		elif self.state == 3 and name == 'flavor':
-			self.state = 4
-			self.text = ''
+		elif self.state == 3:
+			if name == 'structure':
+				self.tech.set('isStructure', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'discovery':
+				self.tech.set('isDiscovery', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'notdiscovery':
+				self.tech.set('isDiscovery', 0)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'starting':
+				self.tech.set('isStarting', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'notstarting':
+				self.tech.set('isStarting', 0)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'shipequip':
+				self.tech.set('isShipEquip', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'project':
+				self.tech.set('isProject', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'shiphull':
+				self.tech.set('isShipHull', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'mine':
+				self.tech.set('isMine', 1)
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'data':
+				for key in attrs.keys():
+					self.tech.set(key, attrs[key])
+			elif name == 'preresearch':
+				self.state = 4
+				self.text = ''
+			elif name == 'description':
+				self.state = 4
+				self.text = ''
+			elif name == 'flavor':
+				self.state = 4
+				self.text = ''
+			else:
+				raise 'Unsupported tag %s' % str(name)
 		else:
 			raise 'Unsupported tag %s' % str(name)
 
@@ -313,15 +316,16 @@
 		elif self.state == 3 and name == 'technology':
 			self.state = 2
 			#log.debug(repr(self.tech))
-		elif self.state == 4 and name == 'preresearch':
-			self.tech.textPreRsrch = self.text
-			self.state = 3
-		elif self.state == 4 and name == 'description':
-			self.tech.textDescr = self.text
-			self.state = 3
-		elif self.state == 4 and name == 'flavor':
-			self.tech.textFlavor = self.text
-			self.state = 3
+		elif self.state == 4:
+			if name == 'preresearch':
+				self.tech.textPreRsrch = self.text
+				self.state = 3
+			elif name == 'description':
+				self.tech.textDescr = self.text
+				self.state = 3
+			elif name == 'flavor':
+				self.tech.textFlavor = self.text
+				self.state = 3
 
 	def characters(self, text):
 		self.text += text

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.