Changeset 1398

Timestamp:

09/08/08 18:32:03 (2 months ago)

Author:

sgillies

Message:

Use a object modified subscriber instead of attribute setter hacks, test the subscribers

Files:

• PleiadesEntity/trunk/content/Name.py (modified) (2 diffs)
• PleiadesEntity/trunk/event.py (modified) (3 diffs)
• PleiadesEntity/trunk/tests/Entities.txt (modified) (2 diffs)
• PleiadesEntity/trunk/tests/test_docfiles.py (modified) (1 diff)

PleiadesEntity/trunk/content/Name.py

@@ -117 +117 @@
-
-    meta_type = 'Name'
-
+#
-
-    schema = Name_schema
@@ -134 +134 @@
-        """
-        return [t.getId() for t in self.getTemporalAttestations()]
-
-    security.declarePublic('setNameTransliterated')
-    def setNameTransliterated(self,value):
-        """
-        """
-        if len(value) == 0:
-            REQUEST = self.REQUEST
-            tNameLanguage = REQUEST.get('nameLanguage', None)
-            tNameAttested = REQUEST.get('nameAttested', None)
-            if tNameLanguage and tNameAttested:
-                t = transliterate_name(tNameLanguage, tNameAttested)
-            else:
-                t = ''
-        else:
-            t = value
-        if t:
-            self.getField('nameTransliterated').set(self, t)
-            self.getField('title').set(self, t)
-
-    security.declarePublic('setNameAttested')
-    def setNameAttested(self,value):
-        """
-        """
-        self.getField('nameAttested').set(self, value)
-        self.setNameTransliterated('')
-
-    security.declareProtected(View, 'getTemporalAttestations')

PleiadesEntity/trunk/event.py

@@ -4 +4 @@
-from Products.PleiadesEntity.content.interfaces import ITemporalAttestation \
-    , ILocation, IName, IFeature, IPlace
+from Products.PleiadesEntity.Extensions.ws_transliteration import transliterate_name
-
-
@@ -12 +13 @@
-        ob = aq_parent(child)
-        if ILocation.providedBy(ob):
-            ob.reindexObject()
-            locationChangeSubscriber(ob, event)
-        elif IName.providedBy(ob):
-            ob.reindexObject()
-            nameChangeSubscriber(ob, event)
-        elif IFeature.providedBy(ob):
-            ob.reindexObject()
-            featureChangeSubscriber(ob, event)
-        elif IPlace.providedBy(ob):
@@ -28 +26 @@
-@adapter(IName, IObjectModifiedEvent)
-def nameChangeSubscriber(obj, event):
+    nameAttested = obj.getNameAttested()
+    nameLanguage = obj.getNameLanguage()
+    if nameAttested and nameLanguage:
+        t = transliterate_name(nameLanguage, nameAttested)
+        obj.getField('nameTransliterated').set(obj, t)
+    obj.getField('title').set(obj, obj.getNameTransliterated())
+    obj.reindexObject()
-    for f in obj.getBRefs('hasName'):
-        f.reindexObject()
-        featureChangeSubscriber(f, event)
-        #for p in f.getBRefs('hasFeature'):
-        #    p.reindexObject()
-
-@adapter(ILocation, IObjectModifiedEvent)
-def locationChangeSubscriber(obj, event):
+    obj.reindexObject()
-    for f in obj.getBRefs('hasLocation'):
-        f.reindexObject()
-        featureChangeSubscriber(f, event)
-        #for p in f.getBRefs('hasFeature'):
-        #    p.reindexObject()
-
-@adapter(IFeature, IObjectModifiedEvent)
-def featureChangeSubscriber(obj, event):
+    obj.reindexObject()
-    for p in obj.getBRefs('hasFeature'):
-        p.reindexObject()
+
+

PleiadesEntity/trunk/tests/Entities.txt

@@ -11 +11 @@
-Add entities
-
-title=u'Civitas Non', nameTransliterated=u'Civitas Non', nameAttested=u'Civitas Non', nameLanguage='la
+nameAttested=u'\u1f08\u03c6\u03c1\u03bf\u03b4\u03b9\u03c3\u03b9\u1f71\u03c2', nameLanguage='grc
-    >>> lid = locations.invokeFactory('Location')
-    >>> pid = places.invokeFactory('Place')
@@ -33 +33 @@
-
-    >>> p.Title()
-Civitas Non
+Aphrodisias
-
-Test the geo adapters

PleiadesEntity/trunk/tests/test_docfiles.py

@@ -45 +45 @@
-    'WSTransliteration.txt',
-    'WSValidation.txt',
+    'subscribers.txt',
-    'LoadEntity.txt',
-    'BatchLoad.txt'