Changeset 2444cce

Timestamp:

05/02/12 10:54:02 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

c8cdfbe

Parents:

3e16749

git-author:

yomguy <yomguy@…> (05/02/12 10:54:02)

git-committer:

yomguy <yomguy@…> (05/02/12 10:54:02)

Message:

fix Format (LAM) and enums, linked in item

Location:

telemeta

Files:

• migrations/0010_auto__add_wheeldiameter__add_originalformat__del_field_format_tape_num.py (added)
• migrations/0011_auto__del_field_format_item.py (added)
• models/__init__.py (modified) (1 diff)
• models/enum.py (modified) (2 diffs)
• models/format.py (added)
• models/media.py (modified) (3 diffs)
• views/base.py (modified) (1 diff)

telemeta/models/__init__.py

@@ -43 +43 @@
 from dublincore import *
 from language import *
+from format import *
 

telemeta/models/enum.py

@@ -164 +164 @@
 
 # Tape formats
+class WheelDiameter(Enumeration):
+    "Tape wheel diameter (cm)"
+
+    class Meta(MetaEnumeration):
+        db_table = 'tape_wheel_diameter'
+        verbose_name = _("tape wheel diameter (cm)")
+
 class TapeLength(Enumeration):
     "Tape length (cm)"
@@ -192 +199 @@
         verbose_name = _("tape vendor")
 
+class OriginalFormat(Enumeration):
+    "Original format"
+
+    class Meta(MetaEnumeration):
+        db_table = 'original_format'
+        verbose_name = _("original format")
+

telemeta/models/media.py

@@ -50 +50 @@
 from telemeta.models.enum import *
 from telemeta.models.language import *
+from telemeta.models.format import *
 from django.db import models
 
@@ -347 +348 @@
     track                 = CharField(_('item number'))
     creator_reference     = CharField(_('reference'))
+    original_format       = ForeignKey(Format, related_name="item",
+                                       verbose_name=_('orinal format'), blank=True,
+                                        null=True, on_delete=models.SET_NULL)
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
@@ -676 +680 @@
         verbose_name_plural = _('fonds related media')
 
-
-class Format(ModelCore):
-    """ Physical format object as proposed by the LAM"""
-
-    item = ForeignKey(MediaItem, related_name="formats", verbose_name=_('item'))
-    original_code = CharField(_('original code'), required=True)
-    tape_number = CharField(_('tape number'))
-    status = CharField(_('status'))
-    conservation_state = CharField(_('conservation state'))
-    comments = TextField(_('comments'))
-
-    tape_length = WeakForeignKey(TapeLength, related_name="formats", verbose_name = _("tape length (cm)"))
-    tape_width  = WeakForeignKey(TapeWidth, related_name="formats", verbose_name = _("tape width (inch)"))
-    tape_speed = WeakForeignKey(TapeSpeed, related_name="formats", verbose_name = _("tape speed (m/s)"))
-    tape_vendor = WeakForeignKey(TapeVendor, related_name="formats")
-    tape_thickness = CharField(_('tape thickness (um)'))
-    tape_diameter = CharField(_('tape diameter (mm)'))
-    tape_reference = CharField(_('tape reference'))
-
-    class Meta(MetaCore):
-        db_table = 'media_formats'
-        verbose_name = _('format')
-
-    def __unicode__(self):
-        return self.original_code
-
-    @property
-    def public_id(self):
-        return self.original_code
-

telemeta/views/base.py

@@ -657 +657 @@
             last_revision = None
 
-        physical_format = Format.objects.filter(item=item)
-        if physical_format:
-            physical_format = physical_format[0]
+        physical_format = item.format.physical_format
 
         return render(request, template,