From 60236ba51748c176533609bf3460721a150a192e Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 10 Feb 2015 15:32:52 +0100 Subject: [PATCH] * BlogsController.cs * NpgsqlBlogProvider.cs: quiet a revert to last commit, fixing an introduced bug, at using default values for pageIndex * ResultPages.cs: parentesis around the number of results --- NpgsqlBlogProvider/NpgsqlBlogProvider.cs | 6 +++--- WebControls/ResultPages.cs | 3 ++- web/Controllers/BlogsController.cs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 109893a8..330f624c 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -268,6 +268,7 @@ namespace Npgsql.Web.Blog public override BlogEntryCollection FindPost (string pattern, FindBlogEntryFlags searchflags, int pageIndex, int pageSize, out int totalRecords) { BlogEntryCollection c = new BlogEntryCollection (); + totalRecords = 0; using (NpgsqlConnection cnx=new NpgsqlConnection(connectionString)) using (NpgsqlCommand cmd = cnx.CreateCommand()) { cmd.CommandText = "select title,bcontent,modified,posted,username,visible from blog " + @@ -292,9 +293,8 @@ namespace Npgsql.Web.Blog cmd.CommandText += " order by posted desc"; cnx.Open (); using (NpgsqlDataReader rdr = cmd.ExecuteReader()) { - totalRecords = 0; // pageIndex became one based - int firstrec = (pageIndex-1) * pageSize; + int firstrec = pageIndex * pageSize; int lastrec = firstrec + pageSize - 1; while (rdr.Read()) { if (totalRecords >= firstrec && totalRecords <= lastrec) { @@ -348,7 +348,7 @@ namespace Npgsql.Web.Blog " order by posted desc limit @len" ; cmd.Parameters.Add ("@appname", applicationName); - cmd.Parameters.Add ("@len", defaultPageSize); + cmd.Parameters.Add ("@len", defaultPageSize*10); cnx.Open (); using (NpgsqlDataReader rdr = cmd.ExecuteReader()) { totalRecords = 0; diff --git a/WebControls/ResultPages.cs b/WebControls/ResultPages.cs index ee94dcd7..734319be 100644 --- a/WebControls/ResultPages.cs +++ b/WebControls/ResultPages.cs @@ -108,13 +108,14 @@ namespace Yavsc.WebControls writer.Write (" "); } } - + writer.Write ("("); if (ResultCount == 0) { writer.Write ("Pas de resultat"); } else { writer.Write (ResultCount.ToString () + " resultat"); if (ResultCount>1) writer.Write("s"); } + writer.Write (")"); } } diff --git a/web/Controllers/BlogsController.cs b/web/Controllers/BlogsController.cs index a73aade5..2c0ec793 100644 --- a/web/Controllers/BlogsController.cs +++ b/web/Controllers/BlogsController.cs @@ -107,7 +107,7 @@ namespace Yavsc.Controllers /// Page index. /// Page size. [HttpGet] - public ActionResult UserPosts (string user, int pageIndex = 1, int pageSize = 10) + public ActionResult UserPosts (string user, int pageIndex = 0, int pageSize = 10) { int tr; MembershipUser u = Membership.GetUser ();