Changeset 529

Timestamp:

02/08/10 18:55:30 (7 months ago)

Author:

olivier

Message:

(start to) fix displaying multiple location paths

Location:

trunk/telemeta

Files:

• models/crem.py (modified) (1 diff)
• models/dublincore.py (modified) (1 diff)
• templates/telemeta_default/mediaitem_detail.html (modified) (1 diff)

trunk/telemeta/models/crem.py

@@ -633 +633 @@
         return None                    
 
-    def sequences(self):
-        sequence = []
+    def paths(self):
+        #FIXME: need to handle multiple (polyhierarchical) paths
+        path = []
         location = self
         while location:
-            sequence.append(location)
-            location = location.parent()
-        return sequence
+            path.append(location)
+            try:
+                location = location.ancestors(direct=True)[0]
+            except IndexError:
+                location = None
+        return [path]
 
     def fullnames(self):
-        
-        return u', '.join([unicode(l) for l in self.sequence()])
+        names = []
+        for path in self.paths():
+            names.append(u', '.join([unicode(l) for l in path]))
+        return names
 
 class LocationType(ModelCore):

trunk/telemeta/models/dublincore.py

@@ -212 +212 @@
         date,
         Date(item.collection.year_published, refinement='issued'),
-        Element('coverage',         item.location.fullname(), 'spatial'),
+        Element.multiple('coverage', item.location.fullnames(), 'spatial'),
         Element('coverage',         item.location_comment, 'spatial'),
         Element('rights',           item.collection.legal_rights, 'license'),

trunk/telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -147 +147 @@
                 {% if item.location %}
                     <dt>{% trans "Location" %}</dt>
-                    <dd>{{ item.location.fullname }}</dd>
+                    <dd>{{ item.location.fullnames|join:"<br/>" }}</dd>
                 {% endif %}
                 {% dl_field item "location_comment" %}