Modify index item+collection

add current_location in advance search
add ancestors + alias + current_location in simple search

diff --git a/telemeta/search_indexes.py b/telemeta/search_indexes.py
index 537693002ecf5a4cc15d84d2bfb45ce95503e7d8..9d767a7e66c5be838771fa12e5d8101d02d8f44a 100644 (file)
--- 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 fc4648cbc8846502c12adff5c1d86524ca3bce06..6e56159fe4dbe63855510602855ecafd8e65795c 100644 (file)
--- 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 afe92cfcee6a650bb2fe46c5f7e739cddfa292ce..2b2d99b524745a32ecbbc59f3cee3c8721961871 100644 (file)
--- 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 }}