notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

* BlogsController.cs

Browse source 
* 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
This commit is contained in:
Paul Schneider 2015-02-10 15:32:52 +01:00
commit 60236ba517
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NpgsqlBlogProvider/NpgsqlBlogProvider.cs
View file

@ -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;

3
WebControls/ResultPages.cs
View file

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

2
web/Controllers/BlogsController.cs
View file

@ -107,7 +107,7 @@ namespace Yavsc.Controllers
/// <param name="pageIndex">Page index.</param>
/// <param name="pageSize">Page size.</param>
[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 ();