Changeset 20ef7d8

Timestamp:

05/02/12 15:34:04 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

57305a5, 960da6e

Parents:

04ec884 (diff), c8cdfbe (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@…> (05/02/12 15:34:04)

git-committer:

yomguy <yomguy@…> (05/02/12 15:34:04)

Message:

Merge branch 'master' into dev

Files:

• example/init/format/original_format.txt (added)
• telemeta/management/commands/telemeta-init-formats.py (added)
• telemeta/migrations/0010_auto__add_wheeldiameter__add_originalformat__del_field_format_tape_num.py (added)
• telemeta/migrations/0011_auto__del_field_format_item.py (added)
• telemeta/migrations/0012_auto__add_field_mediaitem_original_format.py (added)
• telemeta/migrations/0013_auto__chg_field_format_conservation_state.py (added)
• telemeta/models/__init__.py (modified) (1 diff)
• telemeta/models/enum.py (modified) (2 diffs)
• telemeta/models/format.py (added)
• telemeta/models/media.py (modified) (3 diffs)
• telemeta/views/base.py (modified) (3 diffs)
• README.rst (modified) (1 diff)
• telemeta/models/query.py (modified) (5 diffs)
• telemeta/templates/telemeta/search_criteria.html (modified) (1 diff)
• telemeta/templates/telemeta/search_results.html (modified) (1 diff)

telemeta/models/__init__.py

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

telemeta/models/enum.py

@@ -163 +163 @@
         ordering = ['ethnic_group__value']
 
+
 # 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 +200 @@
         verbose_name = _("tape vendor")
 
+class OriginalFormat(Enumeration):
+    "Item 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'))
@@ -694 +698 @@
         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

@@ -257 +257 @@
         year_min, year_max = MediaCollection.objects.all().publishing_year_range()
         pub_years = year_min and year_max and range(year_min, year_max + 1) or []
-        searches = Search.objects.filter(username=request.user)
+        if request.user.is_authenticated():
+            searches = Search.objects.filter(username=request.user)
+        else:
+            searches = []
         return render(request, 'telemeta/search_criteria.html', {
             'rec_years': rec_years,
@@ -430 +433 @@
     @method_decorator(login_required)
     def users(self, request):
-        users = User.objects.all()
+        users = User.objects.all().order_by('last_name')
         return render(request, 'telemeta/users.html', {'users': users})
 
@@ -657 +660 @@
             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,

README.rst

@@ -191 +191 @@
   * MMSH : Maison Méditerranéenne des Sciences de l'Homme
     http://www.mmsh.univ-aix.fr/
+

telemeta/models/query.py

@@ -201 +201 @@
         return self.filter(file__contains='/')
 
+    def by_instrument(self, instrument):
+        "Find items by instrument"
+        return self.filter(instruments__in=instrument)
+
 
 class MediaItemManager(CoreManager):
@@ -244 +248 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaItemQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaItemQuerySet.by_instrument.__doc__
 
 
@@ -332 +340 @@
         return self.filter(items__file__contains='/').distinct()
 
+    def by_instrument(self, instrument):
+        "Find collections by instrument"
+        return self.filter(items__instruments__in=instrument).distinct()
+
 
 class MediaCollectionManager(CoreManager):
@@ -375 +387 @@
         return self.get_query_set().sound(*args, **kwargs)
     sound.__doc__ = MediaCollectionQuerySet.sound.__doc__
+
+    def by_instrument(self, *args, **kwargs):
+        return self.get_query_set().by_instrument(*args, **kwargs)
+    by_instrument.__doc__ = MediaCollectionQuerySet.by_instrument.__doc__
 
 
@@ -478 +494 @@
         return self.get_query_set().quick_search(*args, **kwargs)
     quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__
+
+
+class InstrumentQuerySet(CoreQuerySet):
+    "Base class for all media instrument query sets"
+
+    def quick_search(self, pattern):
+        "Perform a quick search on text and char fields"
+        from telemeta.models.instrument import Instrument
+        mod = Instrument()
+        pattern = pattern.strip()
+        q = Q(code__contains=pattern)
+        fields = mod.to_dict()
+        keys =  fields.keys()
+        for field in keys:
+            field_str = str(mod._meta.get_field(field))
+            if 'CharField' in field_str or 'TextField' in field_str:
+                q = q | word_search_q(field, pattern)
+        return self.filter(q)
+
+
+class InstrumentManager(CoreManager):
+    "Manage instrument queries"
+
+    def get_query_set(self):
+        "Return instrument query sets"
+        return InstrumentQuerySet(self.model)
+
+    def quick_search(self, *args, **kwargs):
+        return self.get_query_set().quick_search(*args, **kwargs)
+    quick_search.__doc__ = InstrumentQuerySet.quick_search.__doc__

telemeta/templates/telemeta/search_criteria.html

@@ -63 +63 @@
     <label for="location">{% field_label "Location" %}</label>
     <input type="text" name="location" id="location" value="{{ criteria.location }}" />
+    </p>
+
+    <p>
+    <label for="instrument">{% field_label "Instrument" %}</label>
+    <input type="text" name="instrument" id="instrument" />
     </p>
 

telemeta/templates/telemeta/search_results.html

@@ -28 +28 @@
   {% if criteria.location %}
     <li><b>{% field_label "Location" %}:</b> {{criteria.location}}</li>
+  {% endif %}
+  {% if criteria.instrument %}
+  <li><b>{% field_label "Instrument" %}:</b> {{criteria.instrument}}</li>
   {% endif %}
   {% if criteria.ethnic_group %}