Merge branch 'improve-search'

Author: onur

src/db/mod.rs

@@ -53,9 +53,8 @@ pub fn update_search_index(conn: &Connection) -> Result<u64, Error> {
                    setweight(to_tsvector(coalesce(releases.description, '')), 'B')            ||
                    setweight(to_tsvector(coalesce((
                                 SELECT string_agg(value, ' ')
-                                FROM json_array_elements_text(releases.keywords)), '')), 'B') ||
-                   setweight(to_tsvector(coalesce(releases.readme, '')), 'C')                 ||
-                   setweight(to_tsvector(coalesce(releases.description_long, '')), 'C') as content
+                                FROM json_array_elements_text(releases.keywords)), '')), 'B')
+                    as content
             FROM releases
             INNER JOIN crates ON crates.id = releases.crate_id
             ORDER BY releases.crate_id, releases.release_time DESC

src/web/releases.rs

@@ -234,16 +234,19 @@ fn get_search_results(conn: &Connection,
     let mut packages = Vec::new();
 
     let rows = match conn.query("SELECT crates.name,
-                                   releases.version,
-                                   releases.description,
-                                   releases.target_name,
-                                   releases.release_time,
-                                   releases.rustdoc_status,
-                                   ts_rank_cd(crates.content, to_tsquery($1)) AS rank
+                                    releases.version,
+                                    releases.description,
+                                    releases.target_name,
+                                    releases.release_time,
+                                    releases.rustdoc_status,
+                                    ts_rank_cd(crates.content, to_tsquery($1)) AS rank
                                  FROM crates
                                  INNER JOIN releases ON crates.latest_version_id = releases.id
-                                 WHERE crates.content @@ to_tsquery($1)
-                                 ORDER BY rank DESC
+                                 WHERE crates.name LIKE concat('%', $1, '%')
+                                    OR crates.content @@ to_tsquery($1)
+                                 ORDER BY crates.name = $1 DESC,
+                                    crates.name LIKE concat('%', $1, '%') DESC,
+                                    rank DESC
                                  LIMIT $2 OFFSET $3",
                                 &[&query, &limit, &offset]) {
         Ok(r) => r,