SEARCH-680: Index genre annotations

Author: reosarevok

sir/schema/__init__.py

@@ -40,22 +40,24 @@
 SearchAnnotation = E(modelext.CustomAnnotation, [
     F("id", "id"),
     F("entity", ["areas.area.gid", "artists.artist.gid", "events.event.gid",
-                 "instruments.instrument.gid", "labels.label.gid",
-                 "places.place.gid", "recordings.recording.gid",
-                 "releases.release.gid", "release_groups.release_group.gid",
+                 "genres.genre.gid", "instruments.instrument.gid",
+                 "labels.label.gid", "places.place.gid",
+                 "recordings.recording.gid", "releases.release.gid",
+                 "release_groups.release_group.gid",
                  "series.series.gid", "works.work.gid"]),
     F("name", ["areas.area.name", "artists.artist.name", "events.event.name",
-               "instruments.instrument.name", "labels.label.name",
-               "places.place.name", "recordings.recording.name",
-               "releases.release.name", "release_groups.release_group.name",
+               "genres.genre.name", "instruments.instrument.name",
+               "labels.label.name", "places.place.name",
+               "recordings.recording.name", "releases.release.name",
+               "release_groups.release_group.name",
                "series.series.name", "works.work.name"]),
     F("text", "text"),
     F("type", ["areas.__tablename__", "artists.__tablename__",
-               "events.__tablename__", "instruments.__tablename__",
-               "labels.__tablename__", "places.__tablename__",
-               "recordings.__tablename__", "releases.__tablename__",
-               "release_groups.__tablename__", "series.__tablename__",
-               "works.__tablename__"],
+               "events.__tablename__", "genres.__tablename__",
+               "instruments.__tablename__", "labels.__tablename__",
+               "places.__tablename__", "recordings.__tablename__",
+               "releases.__tablename__", "release_groups.__tablename__",
+               "series.__tablename__", "works.__tablename__"],
       transformfunc=tfs.annotation_type)
 ],
     1.5,

sir/schema/modelext.py

@@ -22,6 +22,7 @@ class CustomAnnotation(Annotation):
     areas = relationship("AreaAnnotation")
     artists = relationship("ArtistAnnotation")
     events = relationship("EventAnnotation")
+    genres = relationship("GenreAnnotation")
     instruments = relationship("InstrumentAnnotation")
     labels = relationship("LabelAnnotation")
     places = relationship("PlaceAnnotation")

sir/schema/queryext.py

@@ -3,7 +3,8 @@
 # Copyright (c) 2015 Wieland Hoffmann
 # License: MIT, see LICENSE for details
 from mbdata.models import (Annotation, AreaAnnotation, ArtistAnnotation,
-                           EventAnnotation, InstrumentAnnotation, LabelAnnotation,
+                           EventAnnotation, GenreAnnotation,
+                           InstrumentAnnotation, LabelAnnotation,
                            PlaceAnnotation, RecordingAnnotation, ReleaseAnnotation,
                            ReleaseGroupAnnotation, SeriesAnnotation, WorkAnnotation)
 from sqlalchemy import func
@@ -13,6 +14,7 @@
     AreaAnnotation,
     ArtistAnnotation,
     EventAnnotation,
+    GenreAnnotation,
     InstrumentAnnotation,
     LabelAnnotation,
     PlaceAnnotation,

sir/schema/transformfuncs.py

@@ -7,6 +7,7 @@
     "area_annotation": "area",
     "artist_annotation": "artist",
     "event_annotation": "event",
+    "genre_annotation": "genre",
     "instrument_annotation": "instrument",
     "label_annotation": "label",
     "place_annotation": "place",

sir/wscompat/convert.py

@@ -761,6 +761,8 @@ def convert_annotation(obj):
         l.append(convert_one_annotation(obj, 'artist',       a.artist))
     for a in obj.events:
         l.append(convert_one_annotation(obj, 'event',        a.event))
+    for a in obj.genres:
+        l.append(convert_one_annotation(obj, 'genre',        a.genre))
     for a in obj.instruments:
         l.append(convert_one_annotation(obj, 'instrument',   a.instrument))
     for a in obj.labels: