Changeset 451866d

Timestamp:

10/18/11 21:18:51 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

994ebb4

Parents:

fd2dd02 (diff), 86d17e9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (10/18/11 21:18:51)

git-committer:

yomguy <yomguy@…> (10/18/11 21:18:51)

Message:

yomguy 2011-10-18 fix blank item.code (now recorded as None, not )
yomguy 2011-10-18 fix wrong login url, add internal id to dublincore, fix OAI identifiers
yomguy 2011-10-17 revert ipauth to django.contrib.auth
yomguy 2011-10-17 OAI fix : better id management (database id by default), split multiple coverage, repositoryName becomes settings.TELEMETA_ORGANIZATION

Files:

• telemeta/interop/oai.py (modified) (2 diffs)
• telemeta/models/dublincore.py (modified) (5 diffs)
• telemeta/models/location.py (modified) (1 diff)
• telemeta/models/media.py (modified) (2 diffs)
• telemeta/urls.py (modified) (1 diff)
• telemeta/web/base.py (modified) (4 diffs)
• .bzrignore (added)
• telemeta/htdocs/timeside/js/controller.js (added)
• telemeta/htdocs/timeside/js/core.js (added)
• telemeta/htdocs/timeside/js/markerlist.js (added)
• telemeta/htdocs/timeside/js/soundprovider.js (added)
• telemeta/htdocs/timeside/js/util.js (added)

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:
+            id = id.split('/')[-1]
+        return ':'.join(['oai', organization.lower(), 'items', id])
+    
     def list_records(self, from_time, until_time, token = None, ids_only = False):
         """Append ListIdentifiers or ListRecords result"""
@@ -457 +463 @@
                 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

@@ -164 +164 @@
     resource = Resource(
         Element('identifier',       media_identifier(collection), related=collection),
+        Element('identifier',       collection.public_id, related=collection),
         Element('type',             'Collection'),
         Element('title',            collection.title),
@@ -215 +216 @@
     resource = Resource(
         Element('identifier',       media_identifier(item), related=item),
+        Element('identifier',       item.public_id, related=item),
         Element('type',             'Sound'),
         Element('title',            title),
@@ -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/models/media.py

@@ -259 +259 @@
     
     # Archiving data
-    code                  = CharField(_('code'), unique=True, null=True)
-    old_code              = CharField(_('old code'), unique=False, null=True, blank=True)
+    code                  = CharField(_('code'), unique=True, blank=True)
+    old_code              = CharField(_('old code'), unique=False, blank=True)
     track                 = CharField(_('item number'))
     creator_reference     = CharField(_('reference'))
@@ -326 +326 @@
         return title
 
+
 class MediaItemForm(ModelForm):
     class Meta:
         model = MediaItem
+    def clean_code(self):
+        return self.cleaned_data['code'] or None
         
 class MediaItemKeyword(ModelCore):

telemeta/urls.py

@@ -240 +240 @@
     url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
         name="telemeta-login"),
+    #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]
@@ -518 +518 @@
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():
+                form.save()
                 code = form.cleaned_data['code']
                 if not code:
-                    code = public_id
-                form.save()
+                    code = str(item.id)
                 if form.files:
                     self.cache_data.delete_item_data(code)
@@ -554 +554 @@
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item)
             if form.is_valid():
+                form.save()
+                item.set_revision(request.user)
                 code = form.cleaned_data['code']
                 if not code:
-                    code = public_id
-                form.save()
-                item.set_revision(request.user)
+                    code = str(item.id)
                 return HttpResponseRedirect('/items/'+code)
         else:
@@ -572 +572 @@
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=new_item)
             if form.is_valid():
+                form.save()
                 code = form.cleaned_data['code']
                 if not code:
-                    code = public_id
-                form.save()
+                    code = str(new_item.id)
                 new_item.set_revision(request.user)
                 return HttpResponseRedirect('/items/'+code)