diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-18 23:33:56 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-19 18:06:55 +0100 |
| commit | c9e7e5478aed8757821827e8f5358d7959257a2d (patch) | |
| tree | d27d1e598f6e665f0bd624cc1523440008ba7697 /archaeological_operations | |
| parent | c2691ba59e40433b46b6c8aa3d362c56e6262788 (diff) | |
| download | Ishtar-c9e7e5478aed8757821827e8f5358d7959257a2d.tar.bz2 Ishtar-c9e7e5478aed8757821827e8f5358d7959257a2d.zip | |
Free search: "raw" index for reference - improve parent only search
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/models.py | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index caaff33d9..191918237 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -326,19 +326,20 @@ class ArchaeologicalSite( SearchVectorConfig("locality_ngi", "local"), SearchVectorConfig("name"), SearchVectorConfig("oceanographic_service_localisation"), - SearchVectorConfig("reference"), - SearchVectorConfig("other_reference"), - SearchVectorConfig("shipwreck_code"), + SearchVectorConfig("reference", "raw"), + SearchVectorConfig("other_reference", "raw"), + SearchVectorConfig("shipwreck_code", "raw"), SearchVectorConfig("shipwreck_name"), - SearchVectorConfig("drassm_number"), - SearchVectorConfig("affmar_number"), + SearchVectorConfig("drassm_number", "raw"), + SearchVectorConfig("affmar_number", "raw"), ] M2M_SEARCH_VECTORS = [ SearchVectorConfig("periods__label", "local"), SearchVectorConfig("remains__label", "local"), SearchVectorConfig("towns__name"), + SearchVectorConfig("towns__numero_insee", "raw"), ] - PARENT_SEARCH_VECTORS = ["operations"] + PARENT_ONLY_SEARCH_VECTORS = ["operations"] DATED_FIELDS = BaseHistorizedItem.DATED_FIELDS + ["sinking_date"] @@ -907,6 +908,15 @@ class ParcelItem: parcels[key] = p +def add_oa_prefix(value): + if not value: + return "" + profile = get_current_profile() + if not profile.operation_prefix: + return "" + return profile.operation_prefix + value + + class Operation( ClosedItem, DocumentItem, @@ -1035,25 +1045,26 @@ class Operation( BASE_SEARCH_VECTORS = [ SearchVectorConfig("abstract", "local"), SearchVectorConfig("address", "local"), - SearchVectorConfig("code_patriarche"), + SearchVectorConfig("code_patriarche", "raw"), + SearchVectorConfig("code_patriarche", "raw", func=add_oa_prefix), SearchVectorConfig("comment", "local"), SearchVectorConfig("common_name"), SearchVectorConfig("common_name", "local"), SearchVectorConfig("in_charge__cached_label"), SearchVectorConfig("protagonist__cached_label"), - SearchVectorConfig("official_report_number"), - SearchVectorConfig("old_code"), + SearchVectorConfig("official_report_number", "raw"), + SearchVectorConfig("old_code", "raw"), SearchVectorConfig("operation_type__label"), - SearchVectorConfig("operator_reference"), + SearchVectorConfig("operator_reference", "raw"), SearchVectorConfig("operator__cached_label"), SearchVectorConfig("scientist__cached_label"), SearchVectorConfig("scientific_documentation_comment", "local"), SearchVectorConfig("seizure_name"), - SearchVectorConfig("drassm_code"), + SearchVectorConfig("drassm_code", "raw"), ] PROPERTY_SEARCH_VECTORS = [ - SearchVectorConfig("full_reference"), - SearchVectorConfig("short_code_patriarche"), + SearchVectorConfig("full_reference", "raw"), + SearchVectorConfig("short_code_patriarche", "raw"), ] INT_SEARCH_VECTORS = [ SearchVectorConfig("year"), |