Changeset 8cae994

Timestamp:

10/17/11 11:59:52 (20 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

2959f8a

Parents:

c664814

git-author:

yomguy <yomguy@…> (10/17/11 11:59:52)

git-committer:

yomguy <yomguy@…> (10/17/11 11:59:52)

Message:

OAI fix : better id management (database id by default), split multiple coverage, repositoryName becomes settings.TELEMETA_ORGANIZATION

Location:

telemeta

Files:

• interop/oai.py (modified) (2 diffs)
• models/dublincore.py (modified) (5 diffs)
• models/location.py (modified) (1 diff)
• urls.py (modified) (1 diff)
• web/base.py (modified) (1 diff)

telemeta/interop/oai.py

@@ -409 +409 @@
             container.appendChild(self.make_record(id, dc, ctime))
 
+    def format_id_header(self, id):
+        organization = self.identity[0][1] 
+        if 'http' in id:
+            return ':'.join(['oai', organization.lower(), 'items', id.split('/')[-1]])
+        else:
+            return id
+    
     def list_records(self, from_time, until_time, token = None, ids_only = False):
         """Append ListIdentifiers or ListRecords result"""
@@ -457 +464 @@
                 dc, ctime = item
                 id, dc = self.parse_dc(dc)
+                id = self.format_id_header(id)
                 if id == None:
                     raise Exception("DataSource.list_records() didn't provide an 'identifier' dublin core element")

telemeta/models/dublincore.py

@@ -163 +163 @@
 
     resource = Resource(
+        Element('record_identifier', collection.public_id, related=collection),
         Element('identifier',       media_identifier(collection), related=collection),
         Element('type',             'Collection'),
@@ -214 +215 @@
 
     resource = Resource(
+        Element('record_identifier', item.public_id, related=item),
         Element('identifier',       media_identifier(item), related=item),
         Element('type',             'Sound'),
@@ -227 +229 @@
         date,
         Date(item.collection.year_published, refinement='issued'),
-        Element.multiple('coverage', item.location and item.location.fullnames(), 'spatial'),
+        Element.multiple('coverage', item.location and item.location.listnames(), 'spatial'),
         Element('coverage',         item.location_comment, 'spatial'),
         Element('rights',           item.collection.legal_rights, 'license'),
@@ -249 +251 @@
 def lookup_resource(media_id):
     try:
-        type, code = media_id.split(':', 1)
+        id = media_id.split(':')
+        type = id[-2]
+        code = id[-1]
     except ValueError:
         raise MalformedMediaIdentifier("Media identifier must be in type:code format")
     
-    if (type == 'collection'):
+    if (type == 'collection') or (type == 'collections'):
         try:
             return MediaCollection.objects.get(code=code)
         except MediaCollection.DoesNotExist:
             return None
-    elif (type == 'item'):
+    elif (type == 'item') or (type == 'items'):
         try:
             return MediaItem.objects.get(code=code)
@@ -265 +269 @@
                 return MediaItem.objects.get(old_code=code)
             except MediaItem.DoesNotExist:
-                return None
+                try:
+                    return MediaItem.objects.get(id=code)
+                except MediaItem.DoesNotExist:
+                    return None
     else:
         raise MalformedMediaIdentifier("No such type in media identifier: " + type)

telemeta/models/location.py

@@ -145 +145 @@
             names.append(u', '.join([unicode(l) for l in path]))
         return names
+        
+    def listnames(self):
+        names = []
+        for path in self.paths():
+            for l in path:
+                names.append(unicode(l))
+        return names
 
 class LocationType(ModelCore):

telemeta/urls.py

@@ -238 +238 @@
 
     # Authentication
-    url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
+    url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'},
         name="telemeta-login"),
     url(r'^logout/$', general_view.logout, name="telemeta-logout"),

telemeta/web/base.py

@@ -205 +205 @@
         host = request.META['HTTP_HOST']
         datasource  = TelemetaOAIDataSource()
-        repository_name = settings.TELEMETA_DESCRIPTION
+        repository_name = settings.TELEMETA_ORGANIZATION
         url         = 'http://' + host + request.path
         admin       = settings.ADMINS[0][1]