[Csp-commits] svn:csp r1301 - in trunk/CSP/SimData: . SimData

[<sv...@ww...>]

Author: mkrose
Date: 2004-11-07 12:11:04 -0800 (Sun, 07 Nov 2004)
New Revision: 1301

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/SimData/Parse.py
Log:
In Parse.py, convert more unicode strings to ascii before calling
extension methods.  Swig 1.3.22 no longer accepts unicode strings
when std::string or char* is expected.  Also a small fix for error
reporting.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1301

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-11-07 09:23:42 UTC (rev 1300)
+++ trunk/CSP/SimData/CHANGES.current	2004-11-07 20:11:04 UTC (rev 1301)
@@ -1,16 +1,22 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2004-11-07: onsight
+ * In Parse.py, convert more unicode strings to ascii before calling
+   extension methods.  Swig 1.3.22 no longer accepts unicode strings
+   when std::string or char* is expected.  Also a small fix for error
+   reporting.
+
 2004-10-17: delta
  * Fix a few asserts making vs angry (Thread.h).
- 
+
  * Fix a few cast warnings under vs.
- 
+
  * Added a SIMDATA_EXPORT on TaggedRecordRegistry.
- 
- * Added prefix:: to <classname> in macro SIMDATA_REGISTER_INNER_INTERFACE 
-   (InterfaceRegistry.h).  
- 
+
+ * Added prefix:: to <classname> in macro SIMDATA_REGISTER_INNER_INTERFACE
+   (InterfaceRegistry.h).
+
 2004-10-09: onsight
  * Fix Timer::reset().
 

Modified: trunk/CSP/SimData/SimData/Parse.py
===================================================================
--- trunk/CSP/SimData/SimData/Parse.py	2004-11-07 09:23:42 UTC (rev 1300)
+++ trunk/CSP/SimData/SimData/Parse.py	2004-11-07 20:11:04 UTC (rev 1301)
@@ -320,7 +320,7 @@
 	
 	def end(self):
 		self._element = SimData.Real()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class ECEFHandler(SimpleHandler):
 
@@ -329,7 +329,7 @@
 	
 	def end(self):
 		self._element = SimData.ECEF()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class LLAHandler(SimpleHandler):
 
@@ -338,7 +338,7 @@
 	
 	def end(self):
 		self._element = SimData.LLA()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class UTMHandler(SimpleHandler):
 
@@ -347,7 +347,7 @@
 	
 	def end(self):
 		self._element = SimData.UTM()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class VectorHandler(SimpleHandler):
 
@@ -356,7 +356,7 @@
 	
 	def end(self):
 		self._element = SimData.Vector3()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 
 class MatrixHandler(SimpleHandler):
@@ -366,7 +366,7 @@
 	
 	def end(self):
 		self._element = SimData.Matrix3()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class QuatHandler(SimpleHandler):
 
@@ -375,7 +375,7 @@
 	
 	def end(self):
 		self._element = SimData.Quaternion()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 class DateHandler(SimpleHandler):
 
@@ -384,7 +384,7 @@
 	
 	def end(self):
 		self._element = SimData.SimDate()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 
 
 class StringHandler(SimpleHandler):
@@ -426,10 +426,10 @@
 
 #		# FIXME this will break if the enum attribute doesn't exist in an Object,
 #		# since it will not be linked to an enumeration
-# 		ext = self.getObjectAttribute(obj, name, None)
-# 		if ext is None:
-# 			raise XMLSyntax, "Object enumeration member undefined (no Enumeration class)"
-# 		ext.parseXML(self._c)
+#		ext = self.getObjectAttribute(obj, name, None)
+#		if ext is None:
+#			raise XMLSyntax, "Object enumeration member undefined (no Enumeration class)"
+#		ext.parseXML(self._c.encode('ascii'))
 
 
 class PathHandler(SimpleHandler):
@@ -483,10 +483,10 @@
 
 	def assign(self, interface, obj, name):
 		ext = SimData.External()
-		ext.setSource(self._element)
+		ext.setSource(self._element.encode('ascii'))
 		interface.set(obj, name, ext)	
 # 		ext = self.getObjectAttribute(obj, name, SimData.External())
-# 		ext.setSource(self._element)
+# 		ext.setSource(self._element.encode('ascii'))
 
 
 class KeyHandler(SimpleHandler):
@@ -761,7 +761,7 @@
 	def end(self):
 		self._element = self._object
 		self.checkAssigned()
-		self._element.parseXML(self._c)
+		self._element.parseXML(self._c.encode('ascii'))
 		self._element.convertXML()
 
 	def checkAssigned(self):
@@ -836,16 +836,22 @@
 			line = locator.getLineNumber()
 			public = locator.getPublicId()
 			system = locator.getSystemId()
-			print "In source file \"%s\" [line %d, col %d]" % (path, line, column),
+			if column is None:
+				print "In source file \"%s\" [line %d]" % (path, line),
+			else:
+				print "In source file \"%s\" [line %d, col %d]" % (path, line, column),
 			if public is not None or system is not None:
 				print " - %s, %s" % (public, system)
 			print
 			print "Exception:", e
-			type, value, traceback = sys.exc_info()
+			type_, value, traceback = sys.exc_info()
 		 	log = open("error.log", "wt")
 			if log is not None:
-				print >>log, "%s[%d:%d] - %s, %s" % (path, line, column, public, system)
-				print_exception(type, value, traceback, file=open("error.log", "wt"))
+				if column is None:
+					print >>log, "%s[%d] - %s, %s" % (path, line, public, system)
+				else:
+					print >>log, "%s[%d:%d] - %s, %s" % (path, line, column, public, system)
+				print_exception(type_, value, traceback, file=open("error.log", "wt"))
 				print "Exception traceback saved to error.log"
 			else:
 				raise