Changeset bf5590 in git

Timestamp:

Jun 16, 2005, 3:56:04 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d113d3aba56b6d8664654dbfaeeae4b356a2527e

Parents:

e96c8d9e582eb49287c771aa36dd19744761bfa8

Message:

*bricken: OMOBJ


git-svn-id: file:///usr/local/Singular/svn/trunk@8376 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

modules/openmathserver

Files:

• objects.py (modified) (3 diffs)
• omxmlreader.py (modified) (3 diffs)

modules/openmathserver/objects.py

@@ -1 +1 @@
 from omexceptions import *
 from exceptions import *
+import base64
+#TODO: OMOBJ, OME, OMATTR
 #from cd import *
 class XMLAttribute(object):
@@ -105 +107 @@
         closing="".join(["</"+self.XMLtag+">"])
         return "".join([opening,body,closing])
+class OMObject(OMObjectBase):
+    def __init__(self, children):
+        super(OMObject,self).__init__()
+        self.children=children
+    def getChildren(self):
+        return self.__children
+    def setChildren(self,children):
+        self.__children=children
+    XMLtag="OMOBJ"
+    def evaluate(self, context):
+        return OMObject([context.evaluate(c) for c in self.children])
 class OMVar(OMObjectBase):
     def __init__(self,name):
@@ -214 +227 @@
     def getBody(self):
         return self.value
+class OMByteArray(SimpleValue):
+    def __init__(self,value):
+        super(OMByteArray,self).__init__(value)
+    def __str__(self):
+        return "OMByteArray("+repr(self.value)+")"
+    def parse(self, value):
+        return value
+    XMLtag="OMB"
+    def getBody(self):
+        return base64.encodestring(self.value)
 class OMRef(OMObjectBase):
     def __init__(self, ref):

modules/openmathserver/omxmlreader.py

@@ -3 +3 @@
 from xml.dom import Node
 import xml.dom as dom
+import base64
 #from 
 from StringIO import StringIO
@@ -52 +53 @@
             #print "data", content
             erg=OMString(content)
+        if (node.nodeName=="OMB"):
+            content=get_text_in_children(node)
+            #print "data", content
+            erg=OMByteArray(base64.decodestring(content))
         if (node.nodeName=="OMV"):
             name=node.getAttribute("name") #node.attributes["name"]
@@ -75 +80 @@
             children=[self.buildFromNode(c) for c in node.childNodes]
             erg= OMApply(children[0],children[1:])
+        if (node.nodeName=="OMOBJ"):
+            children=[self.buildFromNode(c) for c in node.childNodes]
+            erg= OMObject(children)
         if (node.nodeName=="OMBIND"):
             children=[self.buildFromNode(c) for c in node.childNodes]