From 01f9f95d51cbf34c33a7144b80fdee4b49101cd1 Mon Sep 17 00:00:00 2001
From: loicgasser <loicgasser4@gmail.com>
Date: Tue, 29 Oct 2013 17:25:30 +0100
Subject: [PATCH 1/2] Rank has been fixed in DB

---
 conf/sphinx.conf.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/sphinx.conf.in b/conf/sphinx.conf.in
index 6d6a7471..39ff9643 100755
--- a/conf/sphinx.conf.in
+++ b/conf/sphinx.conf.in
@@ -29,7 +29,7 @@ source src_address : src_swisssearch
         , coalesce(strname1,'')||' '||coalesce(deinr,'')||' <b>'||coalesce(plz,'')||' '||coalesce(ort_27,'')||'</b>' as label \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
-        , 6 as rank \
+        , rank as rank \
         , gid as id \
         , NULLIF(regexp_replace(deinr::text, '[^0-9]'::text, ''::text, 'g'::text), ''::text)::integer as num \
         from swiss_search \
@@ -45,7 +45,7 @@ source src_parcel : src_swisssearch
         , coalesce(gemname,'')||' '||coalesce(name,'') as label \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
-        , 7 as rank \
+        , rank as rank \
         , gid as id \
         , SUBSTRING(name FROM '([0-9]+)')::int as num \
         from swiss_search \

From dd604a80a8aaab6c58749e6d225ed25a50983789 Mon Sep 17 00:00:00 2001
From: loicgasser <loicgasser4@gmail.com>
Date: Tue, 29 Oct 2013 17:37:11 +0100
Subject: [PATCH 2/2] Put back len attribute for backward compatibility

---
 conf/sphinx.conf.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conf/sphinx.conf.in b/conf/sphinx.conf.in
index 39ff9643..3cf559d1 100755
--- a/conf/sphinx.conf.in
+++ b/conf/sphinx.conf.in
@@ -13,6 +13,7 @@ source src_swisssearch : def_pqsql
     sql_db = search
     sql_attr_uint = num
     sql_attr_bigint = id
+    sql_attr_bigint = len
     sql_attr_uint = rank
     sql_attr_string = label
     sql_attr_string = origin
@@ -27,6 +28,7 @@ source src_address : src_swisssearch
         gid as id \
         , search_name as detail \
         , coalesce(strname1,'')||' '||coalesce(deinr,'')||' <b>'||coalesce(plz,'')||' '||coalesce(ort_27,'')||'</b>' as label \
+        , textlen(search_name) as len \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
         , rank as rank \
@@ -43,6 +45,7 @@ source src_parcel : src_swisssearch
         gid as id \
         , search_name as detail \
         , coalesce(gemname,'')||' '||coalesce(name,'') as label \
+        , textlen(search_name) as len \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
         , rank as rank \
@@ -59,6 +62,7 @@ source src_sn25 : src_swisssearch
         gid as id \
         , search_name as detail \
         , '<b>'||coalesce(name,'')||'</b> ('||coalesce(kanton,'')||') - '||coalesce(gemname,'') as label \
+        , textlen(search_name) as len \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
         , rank as rank \
@@ -75,6 +79,7 @@ source src_gg25 : src_swisssearch
         gid as id \
         , search_name as detail \
         , '<b>'||coalesce(gemname,'')||' ('||coalesce(kanton,'')||')</b>' as label \
+        , textlen(search_name) as len \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
         , rank as rank \
@@ -90,6 +95,7 @@ source src_kantone : src_swisssearch
         SELECT \
         gid as id \
         , remove_accents(search_name) as detail \
+        , textlen(search_name) as len \
         , '<b>'||name||'</b>' as label \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
@@ -106,6 +112,7 @@ source src_district : src_swisssearch
         SELECT \
         gid as id \
         , search_name as detail \
+        , textlen(search_name) as len \
         , '<b>'||name||'</b>' as label \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
@@ -123,6 +130,7 @@ source src_zipcode : src_swisssearch
         gid as id \
         , search_name as detail \
         , '<b>'||coalesce(plz,'')||' - '||coalesce(ort_27,'')||' ('||coalesce(kanton,'')||')</b>' as label \
+        , textlen(search_name) as len \
         , origin as origin \
         , st_box2d(the_geom) as geom_st_box2d \
         , rank as rank \