Changeset d113d3 in git

Timestamp:

Jun 17, 2005, 11:25:17 AM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

559396511a24a530616d6e6f0515acad72817234

Parents:

bf5590544366352bc842f5dc754a381cef5c7e0b

Message:

*bricken: + attributions


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

Location:

modules/openmathserver

Files:

• context.py (modified) (1 diff)
• objects.py (modified) (2 diffs)
• omxmlreader.py (modified) (1 diff)

modules/openmathserver/context.py

@@ -71 +71 @@
         return self.XMLEncoder.encode(body)
     def XMLEncodeObject(self, obj):
-        return obj.XMLencode(self)
+        #TODO: Make Attribution List attributes
+        #TODO: Make all objects __hash__ and __eq__
+        if (len(obj.attributes)==0):
+            return obj.XMLencode(self)
+        else:
+            toencode=copy(obj)
+            toencode.attributes={}
+            #FIXME: look on order
+            attribution=OMAttribution(*([OMAttributePair(k,obj.attributes[k])\
+                for k in obj.attributes])+[toencode])
+            return attribution.XMLencode(self)
+            
 class SimpleXMLEncoder(object):
     def encode(self, string):

modules/openmathserver/objects.py

@@ -1 +1 @@
 from omexceptions import *
 from exceptions import *
+from copy import copy
 import base64
 #TODO: OMOBJ, OME, OMATTR
@@ -245 +246 @@
         "FIXME: maybe it should also be able to encode as reference"
         return context.XMLEncodeObject(self.ref)
+class OMAttributePair(OMObjectBase):
+    def __init__(self,key, value):
+        super(OMAttributePair,self).__init__()
+        self.key=key
+        self.value=value
+    def getChildren(self):
+        return [self.key, self.value]
+    XMLtag = "OMATP"
+    def evaluate(self, context):
+        return OMAttributePair(context.evaluate(self.key),\
+            context.evaluate(self.value))
+class OMAttribution(OMObjectBase):
+    def __init__(self, *args):
+        super(OMAttribution,self).__init__()
+        self.attr=list(args[:-1])
+        self.value=args[-1]
+    def getChildren(self):
+        #print type(self.attr)
+        #print type(self.value)
+        return self.attr+[self.value]
+    def evaluate(self, context):
+        value=copy(self.value)
+        value.attributes=copy(value.attributes)
+        for a in self.attr:
+            ae=context.evaluate(a)
+            value.attributes[ae.key]=ae.value
+        return value
+    XMLtag="OMATTR"
 if __name__=='__main__':
     from context import *

modules/openmathserver/omxmlreader.py

@@ -98 +98 @@
             else:
                 raise UnresolvedReference
+        if (node.nodeName=="OMATP"):
+            children=[self.buildFromNode(c) for c in node.childNodes]
+            assert(len(children)==2)
+            erg=OMAttributePair(children[0],children[1])
+        if (node.nodeName=="OMATTR"):
+            children=[self.buildFromNode(c) for c in node.childNodes]
+            erg=OMAttribution(*children)
         if None==erg:
             raise NotImplementedError