Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #647

Merged
merged 5 commits into from
Dec 10, 2024
Merged

Master #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e362bd1
PB-1167: the query text for fuzzy search will be built without *
ltclm Dec 6, 2024
8d97b5d
PB-1167: fix wrong queries for the ci
ltclm Dec 6, 2024
d7991cd
PB-1167: wordforms will be disabled in fuzzy index for better quorum
ltclm Dec 9, 2024
a5e9c3b
PB-1167: enable automated wildcard expansion of keywords
ltclm Dec 9, 2024
f33dade
Merge pull request #644 from geoadmin/fix_PB-1167_fuzzy_search
ltclm Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions conf/lubis.conf.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ source src_ch_swisstopo_lubis_luftbilder_farbe : def_searchable_features_with_ye
sql_db = lubis_${DBSTAGING}
sql_query = \
SELECT row_number() OVER(ORDER BY ebkey asc) as id \
, concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey), ')' ) as label \
, concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey), ')' ) as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', ebkey, ort, ebkey_old)) as detail \
, remove_accents(concat_ws(' ', ebkey, ebkey_old)) as detail \
, 'ch.swisstopo.lubis-luftbilder_farbe' as layer \
, bgdi_quadindex as geom_quadindex \
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
Expand All @@ -62,9 +62,9 @@ source src_ch_swisstopo_lubis_luftbilder_schwarzweiss: def_searchable_features_w
sql_db = lubis_${DBSTAGING}
sql_query = \
SELECT row_number() OVER(ORDER BY ebkey asc) as id \
, concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey), ')' ) as label \
, concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey), ')' ) as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', ebkey, ort, ebkey_old)) as detail \
, remove_accents(concat_ws(' ', ebkey, ebkey_old)) as detail \
, 'ch.swisstopo.lubis-luftbilder_schwarzweiss' as layer \
, bgdi_quadindex as geom_quadindex \
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
Expand All @@ -81,9 +81,9 @@ source src_ch_swisstopo_lubis_luftbilder_infrarot: def_searchable_features_with_
sql_db = lubis_${DBSTAGING}
sql_query = \
SELECT row_number() OVER(ORDER BY ebkey asc) as id \
, concat(flugdatum, ' ', bildnummer, ' (', concat_ws(', ', ort, ebkey, ebkey_old), ')' ) as label \
, concat(flugdatum, ' ', feature_id, ' (', concat_ws(', ', ebkey, ebkey_old), ')' ) as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', ebkey, ort)) as detail \
, remove_accents(ebkey) as detail \
, 'ch.swisstopo.lubis-luftbilder_infrarot' as layer \
, bgdi_quadindex as geom_quadindex \
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
Expand Down Expand Up @@ -140,7 +140,7 @@ source src_ch_swisstopo_lubis_terrestrische_aufnahmen : def_searchable_features_
SELECT row_number() OVER(ORDER BY inventory_number asc) as id \
, lpad(bilder.inventory_number::text, 14, '0'::text) as label \
, 'feature' as origin \
, remove_accents(concat_ws(' ', inventory_number, image_number, station, operate_name, year, inventarnummer_old)) as detail \
, remove_accents(concat_ws(' ', inventory_number, station, operate_name, year, inventarnummer_old)) as detail \
, 'ch.swisstopo.lubis-terrestrische_aufnahmen' as layer \
, bgdi_quadindex as geom_quadindex \
, st_y(st_transform(st_centroid(the_geom),4326)) as lat \
Expand Down
12 changes: 12 additions & 0 deletions conf/search.conf.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,8 @@ index district_metaphone : zipcode
source = src_district
path = /var/lib/sphinxsearch/data/index/district_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

index kantone_metaphone : zipcode
Expand All @@ -413,6 +415,8 @@ index kantone_metaphone : zipcode
source = src_kantone
path = /var/lib/sphinxsearch/data/index/kantone_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

index gg25_metaphone : zipcode
Expand All @@ -421,6 +425,8 @@ index gg25_metaphone : zipcode
source = src_gg25
path = /var/lib/sphinxsearch/data/index/gg25_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

index swissnames3d_metaphone : zipcode
Expand All @@ -429,6 +435,8 @@ index swissnames3d_metaphone : zipcode
source = src_swissnames3d
path = /var/lib/sphinxsearch/data/index/swissnames3d_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

index haltestellen_metaphone : zipcode
Expand All @@ -437,6 +445,8 @@ index haltestellen_metaphone : zipcode
source = src_haltestellen
path = /var/lib/sphinxsearch/data/index/haltestellen_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

index address_metaphone: zipcode
Expand All @@ -445,6 +455,8 @@ index address_metaphone: zipcode
source = src_address
path = /var/lib/sphinxsearch/data/index/address_metaphone
preopen = 0
wordforms = /dev/null
expand_keywords = 1
}

# only create on demand
Expand Down
Loading