From owner-p4-projects@FreeBSD.ORG  Sat Jun 23 10:54:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4343016A421; Sat, 23 Jun 2007 10:54:30 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 044E116A400
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 10:54:30 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id E5C7A13C43E
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 10:54:29 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5NAsTVd019713
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 10:54:29 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5NAsT1S019708
	for perforce@freebsd.org; Sat, 23 Jun 2007 10:54:29 GMT
	(envelope-from andrew@freebsd.org)
Date: Sat, 23 Jun 2007 10:54:29 GMT
Message-Id: <200706231054.l5NAsT1S019708@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122199 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jun 2007 10:54:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=122199

Change 122199 by andrew@andrew_hermies on 2007/06/23 10:54:13

	Read in the facund data types from the network
	Fix a typo send -> sent

Affected files ...

.. //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#6 edit

Differences ...

==== //depot/projects/soc2007/andrew-update/frontend/facund/network/__init__.py#6 (text+ko) ====

@@ -24,6 +24,7 @@
 # SUCH DAMAGE.
 #
 
+import facund
 import socket
 import threading
 import xml.sax.handler
@@ -32,6 +33,9 @@
 	'''A class that works as a client with the Facund XML IPC'''
 	def __init__(self, server):
 		self.isReady = False
+
+		self.__data = None
+
 		self.bufSize = 1024
 		self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 		self.socket.connect(server)
@@ -71,16 +75,49 @@
 	
 	def startElement(self, name, attributes):
 		print "> " + name + " " + str(attributes.items())
-		if self.isReady and name == "pong":
-			self.socket.send("<call name=\"ping\" id=\"1\"/>")
+
+		if name == "data":
+			data_type = None
+			data = None
+			for attr in attributes.items():
+				if attr[0] == "type":
+					# TODO: If data_type is not None then raise exception
+					data_type = attr[1]
+
+			if data_type == "bool":
+				data = facund.Bool()
+			elif data_type == "int":
+				data = facund.Int()
+			elif data_type == "unsigned int":
+				data = facund.UInt()
+			elif data_type == "string":
+				data = facund.String()
+			elif data_type == "array":
+				data = facund.Array()
+
+			# TODO: Check if data == None
+			data.setParent(self.__data)
+			self.__data = data
 
-		if name == "facund-server":
+		elif name == "facund-server":
 			self.__connected_lock.acquire()
 
 	def endElement(self, name):
 		print "< " + name
-		# The server send a close message
-		if name == "facund-server":
+		
+		if name == "data":
+			data = self.__data.getParent()
+			if data is not None:
+				self.__data = data
+
+		elif name == "response":
+			print str(self.__data)
+
+		elif name == "facund-server":
+			# The server sent a close message
 			self.__connected_lock.release()
 			self.canClose = True
 
+	def characters(self, text):
+		print "==> " + text
+		self.__data.setData(text)