Mercurial > traipse_dev

diff orpg/chat/chat_msg.py @ 135:dcf4fbe09b70 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Traipse Beta 'OpenRPG' {091010-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Beta) Added Bookmarks Fix to Remote Admin Commands Minor fix to text based Server Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager default_manifest.xml renamed to default_upmana.xml Cleaner clode for saved repositories New TrueDebug Class in orpg_log (See documentation for usage) Mercurial's hgweb folder is ported to upmana **Pretty important update that can help remove thousands of dead children from your gametree. **Children, <forms />, <group_atts />, <horizontal />, <cols />, <rows />, <height />, etc... are all tags now. Check your gametree and look for dead children!! **New Gamtree Recusion method, mapping, and context sensitivity. !!Alpha - Watch out for infinite loops!!
author sirebral
date Tue, 10 Nov 2009 14:11:28 -0600
parents 449a8900f9ac
children bf799efe7a8a
line wrap: on
line diff
--- a/orpg/chat/chat_msg.py	Fri Sep 25 20:47:16 2009 -0500
+++ b/orpg/chat/chat_msg.py	Tue Nov 10 14:11:28 2009 -0600
@@ -31,8 +31,8 @@
 
 from orpg.orpgCore import *
 from chat_version import CHAT_VERSION
-from orpg.tools.orpg_log import logger
-from orpg.tools.decorators import debugging
+from orpg.tools.orpg_log import logger, debug
+from xml.etree.ElementTree import tostring, fromstring
 
 CHAT_MESSAGE = 1
 WHISPER_MESSAGE = 2
@@ -42,64 +42,43 @@
 WHISPER_EMOTE_MESSAGE = 6
 
 class chat_msg:
-    @debugging
-    def __init__(self,xml_text="<chat type=\"1\" version=\""+CHAT_VERSION+"\" alias=\"\" ></chat>"):
-        self.chat_dom = None
+    
+    def __init__(self, xml_text="<chat type='1' version='"+CHAT_VERSION+"' alias='' ></chat>"):
+        self.chat_dom = None
         self.takexml(xml_text)
 
-    @debugging
     def __del__(self):
         if self.chat_dom:
             self.chat_dom.unlink()
 
-    @debugging
-    def toxml(self):
-        return component.get('xml').toxml(self.chat_dom)
+    def toxml(self):
+        return tostring(self.chat_dom)
 
-    @debugging
     def takexml(self,xml_text):
-        xml_dom = component.get('xml').parseXml(xml_text)
-        node_list = xml_dom.getElementsByTagName("chat")
-        if len(node_list) < 1:
-            print "Warning: no <chat/> elements found in DOM."
-        else:
-            if len(node_list) > 1:
-                print "Found more than one instance of <" + self.tagname + "/>.  Taking first one"
-            self.takedom(node_list[0])
-
-    @debugging
-    def takedom(self,xml_dom):
-        if self.chat_dom:
-            self.text_node = None
-            self.chat_dom.unlink()
-        self.chat_dom = xml_dom
-        self.text_node = component.get('xml').safe_get_text_node(self.chat_dom)
+        xml_dom = fromstring(xml_text)
+        self.takedom(xml_dom)
 
-    @debugging
-    def set_text(self,text):
-        text = component.get('xml').strip_text(text)
-        self.text_node._set_nodeValue(text)
-
-    @debugging
+    def takedom(self, xml_dom):
+        self.chat_dom = xml_dom
+        self.text_node = xml_dom.text
+    
+    def set_text(self, text):
+        self.chat_dom.text = text
+    
     def set_type(self,type):
-        self.chat_dom.setAttribute("type",str(type))
-
-    @debugging
+        self.chat_dom.set("type", str(type))
+    
     def get_type(self):
-        return int(self.chat_dom.getAttribute("type"))
+        return int(self.chat_dom.get("type"))
 
-    @debugging
     def set_alias(self,alias):
-        self.chat_dom.setAttribute("alias",alias)
+        self.chat_dom.set("alias",alias)
 
-    @debugging
     def get_alias(self):
-        return self.chat_dom.getAttribute("alias")
+        return self.chat_dom.get("alias")
 
-    @debugging
     def get_text(self):
-        return self.text_node._get_nodeValue()
+        return self.text_node
 
-    @debugging
     def get_version(self):
-        return self.chat_dom.getAttribute("version")
+        return self.chat_dom.get("version")