From 38938886b0a7cd611a96b446ce410b69c974978f Mon Sep 17 00:00:00 2001
From: Jeff Balogh <jbalogh@mozilla.com>
Date: Wed, 6 Jul 2011 14:00:29 -0700
Subject: [PATCH] adjust mapping for all doc types at once

---
 apps/addons/search.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/addons/search.py b/apps/addons/search.py
index 9432a467545..0475eda2ba6 100644
--- a/apps/addons/search.py
+++ b/apps/addons/search.py
@@ -42,13 +42,12 @@ def setup_mapping():
         es.create_index_if_missing(settings.ES_INDEX)
     except pyes.ElasticSearchException:
         pass
-    try:
-        es.put_mapping(Addon._meta.app_label, {'properties': m},
-                       settings.ES_INDEX)
-    except pyes.ElasticSearchException:
-        pass
-    try:
-        es.put_mapping(AppCompat._meta.app_label, {'properties': m},
-                       settings.ES_INDEX)
-    except pyes.ElasticSearchException:
-        pass
+    # Adjust the mapping for all models at once because fields are shared
+    # across all doc types in an index. If we forget to adjust one of them
+    # we'll get burned later on.
+    for model in Addon, AppCompat, Collection:
+        try:
+            es.put_mapping(model._meta.app_label, {'properties': m},
+                           settings.ES_INDEX)
+        except pyes.ElasticSearchException:
+            pass