3 files changed, 71 insertions, 0 deletions
diff --git a/archaeological_operations/migrations/0009_auto_20171011_1644.py b/archaeological_operations/migrations/0009_auto_20171011_1644.py
new file mode 100644
index 000000000..18a284a21
--- /dev/null
+++ b/archaeological_operations/migrations/0009_auto_20171011_1644.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-11 16:44
+from __future__ import unicode_literals
+
+import django.contrib.postgres.search
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_operations', '0008_auto_20170829_1639'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='administrativeact',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='archaeologicalsite',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='historicaladministrativeact',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='historicaloperation',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='operation',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='parcel',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+        migrations.AddField(
+            model_name='parcelowner',
+            name='search_vector',
+            field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'),
+        ),
+    ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 54ed96cec..d55a2e689 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -248,6 +248,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
         'archaeological_sites__reference': _(u"Archaeological sites ("
                                              u"reference)"),
     }
+    BASE_SEARCH_VECTORS = ["scientist__raw_name", "cached_label",
+                           "common_name", "comment", "address", "old_code"]
+    INT_SEARCH_VECTORS = ["year"]
+    M2M_SEARCH_VECTORS = ["towns__name"]
 
     # fields definition
     creation_date = models.DateField(_(u"Creation date"),
@@ -309,6 +313,7 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
         code_patriarche = models.TextField(u"Code PATRIARCHE", null=True,
                                            blank=True, unique=True)
         TABLE_COLS = ['full_code_patriarche'] + TABLE_COLS
+        BASE_SEARCH_VECTORS = ['code_patriarche'] + BASE_SEARCH_VECTORS
         # preventive
         fnap_financing = models.FloatField(u"Financement FNAP (%)",
                                            blank=True, null=True)
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 0d6908374..91050dc1f 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -895,6 +895,21 @@ class OperationTest(TestCase, OperationInitTest):
         self.assertEqual(ope_id, 'OP2011-1')
         self.assertEqual(town, self.towns[0].name)
 
+    def test_search_vector_update(self):
+        operation = self.operations[0]
+        town = self.create_towns({'numero_insee': '12346', 'name': 'Daisy'})[-1]
+        operation.towns.add(town)
+        town = self.create_towns(
+            {'numero_insee': '12347', 'name': 'Dirty old'})[-1]
+        operation.towns.add(town)
+        operation = models.Operation.objects.get(pk=operation.pk)
+        operation.comment = u"Zardoz"
+        operation.code_patriarche = u"HUIAAA5"
+        operation.save()
+        for key in ('old', 'op2010', 'dirty', 'daisy', "'2010'", "zardoz",
+                    "huiaaa5"):
+            self.assertIn(key, operation.search_vector)
+
     def test_cache_bulk_update(self):
         if settings.USE_SPATIALITE_FOR_TESTS:
             # using views - can only be tested with postgresql