* 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
main
Paul Schneider 11 years ago
parent b00c1a8cd3
commit 60236ba517
3 changed files with 6 additions and 5 deletions

@ -268,6 +268,7 @@ namespace Npgsql.Web.Blog
public override BlogEntryCollection FindPost (string pattern, FindBlogEntryFlags searchflags, int pageIndex, int pageSize, out int totalRecords) public override BlogEntryCollection FindPost (string pattern, FindBlogEntryFlags searchflags, int pageIndex, int pageSize, out int totalRecords)
{ {
BlogEntryCollection c = new BlogEntryCollection (); BlogEntryCollection c = new BlogEntryCollection ();
totalRecords = 0;
using (NpgsqlConnection cnx=new NpgsqlConnection(connectionString)) using (NpgsqlConnection cnx=new NpgsqlConnection(connectionString))
using (NpgsqlCommand cmd = cnx.CreateCommand()) { using (NpgsqlCommand cmd = cnx.CreateCommand()) {
cmd.CommandText = "select title,bcontent,modified,posted,username,visible from blog " + 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"; cmd.CommandText += " order by posted desc";
cnx.Open (); cnx.Open ();
using (NpgsqlDataReader rdr = cmd.ExecuteReader()) { using (NpgsqlDataReader rdr = cmd.ExecuteReader()) {
totalRecords = 0;
// pageIndex became one based // pageIndex became one based
int firstrec = (pageIndex-1) * pageSize; int firstrec = pageIndex * pageSize;
int lastrec = firstrec + pageSize - 1; int lastrec = firstrec + pageSize - 1;
while (rdr.Read()) { while (rdr.Read()) {
if (totalRecords >= firstrec && totalRecords <= lastrec) { if (totalRecords >= firstrec && totalRecords <= lastrec) {
@ -348,7 +348,7 @@ namespace Npgsql.Web.Blog
" order by posted desc limit @len" ; " order by posted desc limit @len" ;
cmd.Parameters.Add ("@appname", applicationName); cmd.Parameters.Add ("@appname", applicationName);
cmd.Parameters.Add ("@len", defaultPageSize); cmd.Parameters.Add ("@len", defaultPageSize*10);
cnx.Open (); cnx.Open ();
using (NpgsqlDataReader rdr = cmd.ExecuteReader()) { using (NpgsqlDataReader rdr = cmd.ExecuteReader()) {
totalRecords = 0; totalRecords = 0;

@ -108,13 +108,14 @@ namespace Yavsc.WebControls
writer.Write ("&nbsp;"); writer.Write ("&nbsp;");
} }
} }
writer.Write ("(");
if (ResultCount == 0) { if (ResultCount == 0) {
writer.Write ("Pas de resultat"); writer.Write ("Pas de resultat");
} else { } else {
writer.Write (ResultCount.ToString () + " resultat"); writer.Write (ResultCount.ToString () + " resultat");
if (ResultCount>1) writer.Write("s"); if (ResultCount>1) writer.Write("s");
} }
writer.Write (")");
} }
} }

@ -107,7 +107,7 @@ namespace Yavsc.Controllers
/// <param name="pageIndex">Page index.</param> /// <param name="pageIndex">Page index.</param>
/// <param name="pageSize">Page size.</param> /// <param name="pageSize">Page size.</param>
[HttpGet] [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; int tr;
MembershipUser u = Membership.GetUser (); MembershipUser u = Membership.GetUser ();

Loading…