From 3b091ffed361c99f86400b52f3e5705ed28710ea Mon Sep 17 00:00:00 2001
From: skewed <none@none>
Date: Thu, 10 Dec 2009 06:15:37 +0000
Subject: [PATCH] Some Blog service cleanup

--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043657
---
 .../Orchard.Blogs/Services/BlogPostService.cs      |  8 ++++----
 .../Packages/Orchard.Blogs/Services/BlogService.cs | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs
index 5a976ca8e..93d068e5a 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogPostService.cs
@@ -17,15 +17,15 @@ namespace Orchard.Blogs.Services {
 
         public BlogPost Get(Blog blog, string slug) {
             return _contentManager.Query<BlogPost, BlogPostRecord >()
-                .Join<RoutableRecord>().Where(x => x.Slug == slug)
-                .Join<CommonRecord>().Where(x => x.Container == blog.Record.ContentItemRecord)
+                .Join<RoutableRecord>().Where(rr => rr.Slug == slug)
+                .Join<CommonRecord>().Where(cr => cr.Container == blog.Record.ContentItemRecord)
                 .List().FirstOrDefault();
         }
 
         public IEnumerable<BlogPost> Get(Blog blog) {
             return _contentManager.Query<BlogPost, BlogPostRecord>()
-                .Join<CommonRecord>().Where(x => x.Container == blog.Record.ContentItemRecord)
-                .OrderByDescending(x=>x.CreatedUtc)
+                .Join<CommonRecord>().Where(cr => cr.Container == blog.Record.ContentItemRecord)
+                .OrderByDescending(cr => cr.CreatedUtc)
                 .List();
         }
 
diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs
index ac9fc5587..52a37376c 100644
--- a/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs
+++ b/src/Orchard.Web/Packages/Orchard.Blogs/Services/BlogService.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Orchard.Blogs.Models;
-using Orchard.Core.Common.Models;
 using Orchard.Core.Common.Records;
 using Orchard.Data;
 using Orchard.Models;
@@ -19,15 +18,16 @@ namespace Orchard.Blogs.Services {
         }
 
         public Blog Get(string slug) {
-            RoutableRecord record = _routableRepository.Get(r => r.ContentItemRecord.ContentType.Name == "blog" && r.Slug == slug);
-
-            return record != null ?_contentManager.Get<Blog>(record.Id) : null;
+            return _contentManager.Query<Blog, BlogRecord>()
+                .Join<RoutableRecord>().Where(rr => rr.Slug == slug)
+                .List().FirstOrDefault();
         }
 
         public IEnumerable<Blog> Get() {
-            IEnumerable<RoutableRecord> records = _routableRepository.Fetch(rr => rr.ContentItemRecord.ContentType.Name == "blog", rr => rr.Asc(rr2 => rr2.Title));
-
-            return records.Select(rr => _contentManager.Get<Blog>(rr.Id));
+            return _contentManager.Query<Blog, BlogRecord>()
+                .Join<RoutableRecord>()
+                .OrderBy(br => br.Title)
+                .List();
         }
 
         public void Delete(Blog blog) {