Changeset 6d4e11a

Timestamp:

01/19/10 18:37:06 (3 years ago)

Author:

olivier <>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

dcb9160

Parents:

576e960

git-author:

olivier <> (01/19/10 18:37:06)

git-committer:

olivier <> (01/19/10 18:37:06)

Message:

fix crem models DOM export and add support for embedding foreign keys

Location:

telemeta

Files:

• models/crem.py (modified) (2 diffs)
• tests/model_tests.py (modified) (1 diff)

telemeta/models/crem.py

@@ -36 +36 @@
 from django.db import models
 import cremquery as query
+from xml.dom.minidom import getDOMImplementation
 
 class ModelCore(models.Model):
@@ -75 +76 @@
         return fields_list
 
-    def get_dom_element_name(cls):
+    @classmethod
+    def get_dom_name(cls):
         "Convert the class name to a DOM element name"
         clsname = cls.__name__
         return clsname[0].lower() + clsname[1:]
-    get_dom_element_name = classmethod(get_dom_element_name)
+
+    @staticmethod
+    def get_dom_field_name(field_name):
+        "Convert the class name to a DOM element name"
+        tokens = field_name.split('_')
+        name = tokens[0]
+        for t in tokens[1:]:
+            name += t[0].upper() + t[1:]
+        return name
 
     def to_dom(self):
         "Return the DOM representation of this media object"
         impl = getDOMImplementation()
-        root = self.get_dom_element_name()
+        root = self.get_dom_name()
         doc = impl.createDocument(None, root, None)
         top = doc.documentElement
-        top.setAttribute("id", self.id)
+        top.setAttribute("id", str(self.id))
         fields = self.to_dict()
         for name, value in fields.iteritems():
-            element = doc.createElement(name)
+            element = doc.createElement(self.get_dom_field_name(name))
+            if isinstance(value, models.Model):
+                element.setAttribute('key', str(value.pk))
             value = unicode(value)
             element.appendChild(doc.createTextNode(value))

telemeta/tests/model_tests.py

@@ -255 +255 @@
         else:
             self.fail("No exception raised")
-        
+       
+    def testDomForeignKey(self):
+        doc = self.item_4.to_dom()
+        self.assertEquals(doc.getElementsByTagName('collection')[0].getAttribute('key'), str(self.persepolis.id))
+