Changeset 1107

Timestamp:

08/28/07 23:08:02 (1 year ago)

Author:

sgillies

Message:

Improved load_place with use of transaction savepoints

Files:

• PleiadesEntity/trunk/Extensions/loader.py (modified) (11 diffs)
• PleiadesEntity/trunk/tests/LoadEntity.txt (modified) (5 diffs)

PleiadesEntity/trunk/Extensions/loader.py

@@ -35 +35 @@
-import lxml.etree as etree
-
+import transaction
+
-from Products.CMFCore.utils import getToolByName
-
@@ -43 +45 @@
-
-batlas_pattern = re.compile(r'batlas-(\w+)-(\w+)-(\w+)')
+
-
-def baident(identifier):
@@ -136 +139 @@
-    appropriate temporalAttestation children of the object at 
-    portalcontext."""
-
+
+
+
-    for tp in  xmlcontext.findall("{%s}timePeriod" % ADLGAZ):
-        tpn = tp.xpath("*[local-name()='timePeriodName']")
@@ -158 +163 @@
-        period=periods[tpnstr]
-        id=period_ids[tpnstr]
+        
-        try:
-            portalcontext.invokeFactory('TemporalAttestation',
@@ -167 +173 @@
-            raise EntityLoadError, "There is already a TemporalAttestation with id=%s in portal context = %s" % (id, portalcontext.Title())
-
-
+
+
+
+
-    srs =  xmlcontext.find("{%s}secondaryReferences" % AWMC)
-    if srs:
@@ -199 +208 @@
-                    raise
-                    #raise EntityLoadError, "There is already a SecondaryReference with id=%s in portal context" % id
-
+
+
+
-import sys
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    creators = [e.text for e in root.findall("{%s}creator" % DC)]
-    contributors = [e.text for e in root.findall("{%s}contributor" % DC)]
-    
-    # Rights
-    e = root.findall("{%s}rights" % DC)
-    if e:
@@ -223 +222 @@
-    else:
-        rights = None
-
-
-
+
+
+
+
+
-    nids = []
-    association_certainties = []
-
-
+
+
-    for e in root.findall("{%s}featureName" % ADLGAZ):
-        transliteration = e.findall("{%s}transliteration" % AWMC)[0].text
@@ -326 +328 @@
-            name = getattr(names.duplicates, nid)
-
+        wftool.doActionFor(name, "publish")
+         
-        nids.append(nid)
-        association_certainties.append(certainty)
@@ -333 +337 @@
-        
-        # SecondaryReferences associated with the name
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    for e in root.findall("{%s}spatialLocation" % ADLGAZ):
-        coords = e.findall("{%s}point" % GEORSS)[0].text
-
-locations
+portalcontext
-                    geometryType='Point',
-                    spatialCoordinates=str(coords),
@@ -348 +360 @@
-                    )
-        
+        wftool.doActionFor(getattr(portalcontext, lid), "publish")
-        lids.append(lid)
-        
-        # Time Periods associated with the location
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    try:
-ptidx = legaltypes.index(placeType
-except:
-raise EntityLoadError, "Invalid placeType  = %s" % placeType
+root = etree.parse(file).getroot(
+   
+creators, contributors, rights = parse_attrib_rights(root)
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        pid = places.invokeFactory('Place',
-                    id=id,
@@ -404 +440 @@
-                    )
-        p = getattr(places, pid)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                aid = p.invokeFactory('PlacefulAssociation',
-%s-%s" % (nid,lid)
+unnamed-%s" % lid
-                    placeType=placeType,
-certainty
+'certain'
-                    )
-                a = getattr(p, aid)
-                a.addReference(getattr(locations, lid), 'hasLocation')
+                wftool.doActionFor(a, "publish")
+            
+                # Secondary references for the place
+                parse_secondary_references(root, a, ptool, wftool)
+                #a.reindexObject()
+            
+            else:
+                for i, nid in enumerate(nids):
+                    # Get association certainty from XML
+                    certainty = association_certainties[i]
+                
+                    aid = p.invokeFactory('PlacefulAssociation',
+                        id="%s-%s" % (nid,lid),
+                        placeType=placeType,
+                        associationCertainty=certainty,
+                        )
+                    a = getattr(p, aid)
+                    a.addReference(getattr(locations, lid), 'hasLocation')
+                    a.addReference(getattr(names, nid), 'hasName')
+                    wftool.doActionFor(a, "publish")
+            
+                    # Secondary references for the place
+                    parse_secondary_references(root, a, ptool, wftool)
+                    #a.reindexObject()
+    
+        # If there are no locations, iterate over the names
+        if len(lids) == 0:
+            for nid in nids:
+                aid = p.invokeFactory('PlacefulAssociation',
+                        id="%s-unlocated" % nid,
+                        placeType=placeType,
+                        associationCertainty='certain',
+                        )
+                a = getattr(p, aid)
-                a.addReference(getattr(names, nid), 'hasName')
-
+        wftool.doActionFor(a, "publish")
-                # Secondary references for the place
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    return {'place_id': pid, 'location_ids': lids, 'name_ids': nids}
-

PleiadesEntity/trunk/tests/LoadEntity.txt

@@ -10 +10 @@
-Setup
------
+
+    >>> import transaction
+    >>> self.setRoles(('Manager',))
-
-    Enable types
@@ -28 +31 @@
-
-    >>> _ = folder.invokeFactory('Large Plone Folder', id='names')
+    >>> _ = folder.names.invokeFactory('Large Plone Folder', id='duplicates')
-    >>> _ = folder.invokeFactory('LocationContainer', id='locations')
-    >>> _ = folder.invokeFactory('PlaceContainer', id='places')
+
+    >>> transaction.commit()
-
-Load one entity
@@ -71 +77 @@
-    4
-    >>> [s.id for s in srs]
-65-a2-aphrodisias-ninoe', 'aphrodisias-2', 'aphrodisias-1', '
+batlas-65-a2-aphrodisias-ninoe', 're-aphrodisias-2', 'npauly-aphrodisias-1', 're-
-    >>> [s.Title for s in srs]
-    ['BAtlas 65 A2 Aphrodisias/Ninoe', 'RE Aphrodisias 2', 'NPauly Aphrodisias 1', 'RE Ninoe']
@@ -123 +129 @@
-    2
-    >>> [s.id for s in srs]
-aphrodisias-2', '
+re-aphrodisias-2', 'npauly-
-    >>> [s.Title for s in srs]
-    ['RE Aphrodisias 2', 'NPauly Aphrodisias 1']
@@ -291 +297 @@
-    {'description': 'An ancient fort, attested during the Roman period (modern location: Emeriye). Its ancient name is not known.', 'spatialCoordinates': '37.1751 31.7324 0.0', 'url': 'http://nohost/plone/Members/test_user_1_/places/638830', 'title': '638830', 'srs': 'EPSG:4326', 'geometryType': 'point', 'id': '638830'}
-
+
+Reload that entity
+------------------
+
+Reloading that entity should result in an error
+
+    >>> load_place(folder, "%s/batlas-65-2-24-frank.xml" % TEST_DATA)
+    Traceback (most recent call last):
+    ...
+    BadRequest: The id ... is invalid - it is already in use.
+
+
-Load one unlocated entity
--------------------------