diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/birka-web.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/birka-web.rs b/src/birka-web.rs index 76a194f..e9bb81a 100644 --- a/src/birka-web.rs +++ b/src/birka-web.rs @@ -113,8 +113,8 @@ fn thumb_filename<T: AsRef<Path>>(id: i64, path: T) -> String { } } -#[get("/posts?<tags>&<last>")] -fn get_posts(conn: SiteState, tags: String, last: Option<i64>) -> Result<Json<Vec<FileResult>>> { +#[get("/posts?<query>&<last>")] +fn get_posts(conn: SiteState, query: String, last: Option<i64>) -> Result<Json<Vec<FileResult>>> { let tb = &conn .inner() .lock() @@ -132,7 +132,7 @@ fn get_posts(conn: SiteState, tags: String, last: Option<i64>) -> Result<Json<Ve how_many: RESULTS_PER_QUERY, } }; - let results = tb.query(&database::parse_query(tags)?, Some(keyset))?; + let results = tb.query(&database::parse_query(query)?, Some(keyset))?; Ok(Json( results @@ -231,8 +231,8 @@ fn upload() -> Template { Template::render("upload", None::<()>) } -#[get("/posts?<tags>&<last>")] -fn display_posts(conn: SiteState, tags: String, last: Option<i64>) -> Result<Template> { +#[get("/posts?<query>&<last>")] +fn display_posts(conn: SiteState, query: String, last: Option<i64>) -> Result<Template> { #[derive(Serialize)] struct TagResult { name: String, @@ -246,7 +246,7 @@ fn display_posts(conn: SiteState, tags: String, last: Option<i64>) -> Result<Tem next_page: String, } - let base_params = format!("/posts?tags={}", tags); + let base_params = format!("/posts?query={}", query); let tag_results = { // This is done in a block because `tb` needs to go out of scope before // calling out to `get_posts` to perform the query. Otherwise, we @@ -265,7 +265,7 @@ fn display_posts(conn: SiteState, tags: String, last: Option<i64>) -> Result<Tem }) .collect() }; - let images = get_posts(conn, tags, last)?.into_inner(); + let images = get_posts(conn, query, last)?.into_inner(); let context = Context { tags: tag_results, next_page: if images.len() as i64 == RESULTS_PER_QUERY { |