From 524f2c9001c26201ab76ab437fb3ba08bf4ac59a Mon Sep 17 00:00:00 2001 From: mathieu Date: Wed, 11 May 2016 17:02:08 +0200 Subject: [PATCH] Modify index item+collection add current_location in advance search add ancestors + alias + current_location in simple search --- telemeta/search_indexes.py | 9 +++++++++ .../search/indexes/telemeta/mediacollection_text.txt | 11 ++++++++++- .../search/indexes/telemeta/mediaitem_text.txt | 8 +++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py index 53769300..9d767a7e 100644 --- a/telemeta/search_indexes.py +++ b/telemeta/search_indexes.py @@ -72,6 +72,8 @@ class MediaItemIndex(indexes.SearchIndex, indexes.Indexable): location.append(rela.ancestor_location.name) for alias in location_alias: location.append(alias.alias) + if obj.location.current_location is not None: + location.append(obj.location.current_location.name) #print u"".join(' ' + local for local in location).encode("utf-8") #print u"%s".encode("utf-8") % location #print [local for local in location] @@ -142,6 +144,8 @@ class MediaCollectionIndex(indexes.SearchIndex, indexes.Indexable): location.append(rela.ancestor_location.name) for alias in location_alias: location.append(alias.alias) + if item.location.current_location is not None: + location.append(item.location.current_location.name) for name in location: if name and not name in collec_location: collec_location.append(name) @@ -234,3 +238,8 @@ class MediaFondsIndex(indexes.SearchIndex, indexes.Indexable): def get_model(self): return MediaFonds + +#class LocationIndex(indexes.SearchIndex, indexes.Indexable): + +# text = indexes.CharField(document=True, use_template=True) + diff --git a/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt index fc4648cb..6e56159f 100644 --- a/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt +++ b/telemeta/templates/search/indexes/telemeta/mediacollection_text.txt @@ -17,7 +17,16 @@ {{ object.archiver_notes }} {{ object.items_done }} {{ object.conservation_site }} -{{ object.location }} +{% for item in object.items.all %} +{{ item.location }} +{{ item.location.current_location }} +{% for anc in item.location.ancestor_relations.all %} +{{ anc.ancestor_location }} +{% endfor %} +{% for alias in item.location.aliases.all %} +{{ alias }} +{% endfor %} +{% endfor %} {{ object.code }} {{ object.countries }} {{ object.ethnic_groups }} diff --git a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt index afe92cfc..2b2d99b5 100644 --- a/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt +++ b/telemeta/templates/search/indexes/telemeta/mediaitem_text.txt @@ -6,7 +6,13 @@ {{ object.code }} {{ object.old_code }} {{ object.location }} -{{ object.location.name }} +{{ object.location.current_location }} +{% for anc in object.location.ancestor_relations.all %} +{{ anc.ancestor_location }} +{% endfor %} +{% for alias in object.location.aliases.all %} +{{ alias }} +{% endfor %} {{ object.comment }} {{ object.external_references }} {{ object.location_comment }} -- 2.39.5