Start Logging

koljada · koljada · commit 688508ec5440 · 2015-04-09T09:17:49.000+03:00
diff --git a/BookStore/BookStore.csproj b/BookStore/BookStore.csproj
@@ -318,13 +318,13 @@
     <Content Include="Content\Admin.css.map">
       <DependentUpon>Admin.css</DependentUpon>
     </Content>
+    <Content Include="log.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Scripts\AddField.js" />
     <Content Include="Scripts\bootstrap.min.js.map">
       <DependentUpon>bootstrap.min.js</DependentUpon>
     </Content>
-    <Content Include="NLog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="Scripts\jquery-1.9.1.intellisense.js" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
diff --git a/BookStore/Controllers/AccountController.cs b/BookStore/Controllers/AccountController.cs
@@ -16,6 +16,8 @@ public class AccountController : Controller
     {
         private IUserService _userService;
         private IRoleService _roleService;
+        readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
 
         public AccountController(IUserService user_service, IRoleService role_service)
         {
diff --git a/BookStore/Controllers/AdminController.cs b/BookStore/Controllers/AdminController.cs
@@ -17,7 +17,8 @@ namespace BookStore.Controllers
     [Authorize(Roles = "admin")]
     public class AdminController : Controller
     {
-        public static Logger Log;
+        readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public AdminController()
         {
 
@@ -63,7 +64,9 @@ public ViewResult Create()
         [HttpPost]
         public ActionResult FindBookImage(string title, string lastName, string firstName, int bookId)
         {
-            IList<SearchResult> searchResults = SearchResult.getSearch(title + " " + lastName + " " + firstName, "&searchType=image");
+            string query =title + " " + lastName + " " + firstName ;
+            logger.Info(query);
+                IList < SearchResult > searchResults = SearchResult.GetSearch(query,"&searchType=image");
             ViewData["BookID"] = bookId;
             return PartialView(searchResults.Select(x => x.link));
         }
@@ -96,8 +99,8 @@ public string CopyImageToHost(string imageUrl, int bookId)
         public ActionResult FindBookAnnotation(string title, string lastName, string firstName, int bookId)
         {
             string query = title + " " + lastName + " " + firstName + " " + "litres";
-            //Log.Info(query);
-            List<string> links = SearchResult.getSearch(query).Select(x => x.link).ToList();
+            logger.Info(query);
+            List<string> links = SearchResult.GetSearch(query).Select(x => x.link).ToList();
             ViewData["BookID"] = bookId;
             return PartialView(SearchResult.GetInnerText(links));
         }
@@ -108,6 +111,7 @@ public ActionResult Create(Book book)
             if (ModelState.IsValid)
             {
                 _bookService.Create(book);
+                logger.Info(book.Title+" created");
                 TempData["message"] = string.Format("{0} has been saved", book.Title);
                 return RedirectToAction("Edit", new { bookID = book.Book_ID });
             }
@@ -120,6 +124,7 @@ public ActionResult Edit(Book book)
             if (ModelState.IsValid)
             {
                 _bookService.Save(book);
+                logger.Info(book.Title + " edited");
                 TempData["message"] = string.Format("{0} has been saved", book.Title);
                 return RedirectToAction("Index");
             }
@@ -130,8 +135,10 @@ public ActionResult Edit(Book book)
         public ActionResult Delete(int bookId)
         {
             Book deletedBook = _bookService.Delete(bookId);
+
             if (deletedBook != null)
             {
+                logger.Info(deletedBook.Title + " dletedted");
                 TempData["message"] = string.Format("{0} was deleted", deletedBook.Title);
             }
             return RedirectToAction("Index");
diff --git a/BookStore/Controllers/BookController.cs b/BookStore/Controllers/BookController.cs
@@ -18,6 +18,8 @@ public class BookController : Controller
         private readonly IBookService _bookService;
         private IGenreService _genreService;
         public int PageSize = 10;
+        readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         public BookController(IBookService book_service, IGenreService genre_service)
         {
             _bookService = book_service;
@@ -31,13 +33,13 @@ public ViewResult BookDetails(int bookId)
             return View(_bookService.GetById(bookId)); 
         }
 
-        public ICollection<Book> PaginateBooks(IQueryable<Book> books,int page)
+        public ICollection<Book> PaginateBooks(List<Book> books, int page)
         {
             return books.Skip((page - 1)*PageSize).Take(PageSize).ToList();
         } 
         public ViewResult ListByTag(int tagId, int page = 1)
         {
-            IQueryable<Book> books = _bookService.GetBooksByTag(tagId);
+            List<Book> books = _bookService.GetBooksByTag(tagId).ToList();
             BookListViewModel model = new BookListViewModel
             {
                 Books = PaginateBooks(books,page),
@@ -50,7 +52,7 @@ public ViewResult ListByTag(int tagId, int page = 1)
         }
         public ViewResult ListByLetter(string selectedLetter, int page = 1)
         {
-            IQueryable<Book> books = _bookService.GetBooksByLetter(selectedLetter);
+            List<Book> books = _bookService.GetBooksByLetter(selectedLetter).ToList();
             BookListViewModel model = new BookListViewModel
             {
                 Books = PaginateBooks(books, page),
@@ -62,7 +64,8 @@ public ViewResult ListByLetter(string selectedLetter, int page = 1)
         }
         public ViewResult ListByGenre(string genre, int page = 1)
         {
-            IQueryable<Book> books = _bookService.GetBooksByGenre(genre);
+            List<Book> books = _bookService.GetBooksByGenre(genre).ToList();
+            logger.Info(books);
             BookListViewModel model = new BookListViewModel
             {
                 Books = PaginateBooks(books, page),
@@ -77,7 +80,7 @@ public ViewResult List(int page = 1)
             List<Book> books = _bookService.GetAll().ToList();
             BookListViewModel model = new BookListViewModel
             {
-                Books = PaginateBooks(books.AsQueryable(), page),
+                Books = PaginateBooks(books, page),
                 PagingInfo = new PagingInfo(page, PageSize, books.Count()),
             };
             ViewBag.Action = "List";
diff --git a/BookStore/Global.asax.cs b/BookStore/Global.asax.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Http;
@@ -19,6 +20,8 @@ namespace BookStore
 
     public class MvcApplication : System.Web.HttpApplication
     {
+        readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
         protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
@@ -33,7 +36,9 @@ protected void Application_Start()
             controllerFactory.InjectRoleProvider(Roles.Provider);
             ControllerBuilder.Current.SetControllerFactory(controllerFactory);
             ModelBinders.Binders.Add(typeof(decimal), new DecimalModelBinder());
-            
+           // log4net.Config.XmlConfigurator.Configure();
+            log4net.Config.XmlConfigurator.Configure(new FileInfo(Server.MapPath("~/Web.config")));
+
         }
     }
 }
diff --git a/BookStore/Models/SearchResult.cs b/BookStore/Models/SearchResult.cs
@@ -8,12 +8,14 @@
 using System.Net;
 //using System.Net;
 using System.Web;
+using NLog;
 
 namespace BookStore.Models
 {
     public class SearchResult
     {
-        private static HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
+        private static HtmlDocument doc = new HtmlDocument();
+        readonly static log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         public string Title { get; set; }
         public string htmlTitle { get; set; }
@@ -26,31 +28,31 @@ public static List<string> GetInnerText(List<string> links)
             {
                 if (link.Contains("livelib"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//p[@itemprop='about']");
-                    if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));                   
+                    if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));
                 }
                 else if (link.Contains("aldebaran"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//div[@class='annotation clearfix']");
-                    if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));   
+                    if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));
                 }
                 else if (link.Contains("loveread"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//p[@class='span_str']");
                     if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));
                 }
                 else if (link.Contains("e-reading.club"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//span[@itemprop='description']");
                     if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));
                 }
                 else if (link.Contains("litres"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//div[@itemprop='description']");
                     if (c != null)
                     {
@@ -62,46 +64,65 @@ public static List<string> GetInnerText(List<string> links)
                 }
                 else if (link.Contains("mybook"))
                 {
-                    doc.LoadHtml(getRequest(link));
+                    doc.LoadHtml(GetRequest(link));
                     c = doc.DocumentNode.SelectSingleNode("//div[@class='definition-section']");
                     if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));
                 }
             }
 
             return result;
         }
-        public static string getRequest(string url)
+        public static string GetRequest(string url)
         {
-            var httpWebRequest = (HttpWebRequest)WebRequest.Create(url);
-            httpWebRequest.AllowAutoRedirect = false;//Запрещаем автоматический редирект
-            using (var httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse())
+            try
             {
-                using (var stream = httpWebResponse.GetResponseStream())
+                var httpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+                httpWebRequest.AllowAutoRedirect = false;//Запрещаем автоматический редирект
+                using (var httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse())
                 {
-                    using (var reader = new StreamReader(stream))
+                    using (var stream = httpWebResponse.GetResponseStream())
                     {
-                        return reader.ReadToEnd();
+                        using (var reader = new StreamReader(stream))
+                        {
+                            return reader.ReadToEnd();
+                        }
                     }
                 }
             }
+            catch (WebException ex)
+            {
+
+                logger.Error("You exceeded limit", ex);
+                return null;
+                //throw;
+            }
+
         }
-        public static IList<SearchResult> getSearch(string searchText, string cfg = "")
+        public static IList<SearchResult> GetSearch(string searchText, string cfg = "")
         {
             string key = "AIzaSyBzcXSZrtK15FFCX8v_Ob-Hcxnc-cVHc-Y";
             string cx = "015577388163479462430:16-o3xadmg4";
             //string key = "AIzaSyAmaV0ew89918tcxHYXbM0VsVM-G6wRKwY";
             //string cx = "003508446447238917805:tgox65vdhtw";
-            string google = "https://www.googleapis.com/customsearch/v1?key=" + key + "&cx=" + cx + "&q=" + searchText + "&alt=json" + cfg;
-            JObject googleSearch = JObject.Parse(getRequest(google));
-            List<JToken> results = googleSearch["items"].Children().ToList();
             IList<SearchResult> searchResults = new List<SearchResult>();
-            foreach (JToken result in results)
+            string google = "https://www.googleapis.com/customsearch/v1?key=" + key + "&cx=" + cx + "&q=" + searchText + "&alt=json" + cfg;
+            try
+            {
+                JObject googleSearch = JObject.Parse(GetRequest(google));
+                List<JToken> results = googleSearch["items"].Children().ToList();
+                foreach (JToken result in results)
+                {
+                    SearchResult searchResult = JsonConvert.DeserializeObject<SearchResult>(result.ToString());
+                    searchResults.Add(searchResult);
+                }
+                return searchResults;
+            }
+            catch (Exception)
             {
-                SearchResult searchResult = JsonConvert.DeserializeObject<SearchResult>(result.ToString());
-                searchResults.Add(searchResult);
+                return searchResults;
+                
+                //throw;
             }
-            return searchResults;
         }
-
     }
 }
diff --git a/BookStore/NLog.config b/BookStore/NLog.config
diff --git a/BookStore/Web.config b/BookStore/Web.config
@@ -6,10 +6,38 @@
 <configuration>
   <configSections>
     <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
 
     <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
-  
+
+  <log4net debug="true">
+    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="logs\log.txt" />
+      <appendToFile value="true" />
+      <rollingStyle value="Size" />
+      <maxSizeRollBackups value="10" />
+      <maximumFileSize value="10MB" />
+      <staticLogFileName value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%-5p %d %5rms %-22.22c{1} %-18.18M - %m%n" />
+      </layout>
+    </appender>
+    <root>
+      <level value="ALL" /> 
+      <level value="DEBUG" />
+      <appender-ref ref="RollingLogFileAppender" />
+    </root>
+    <logger name="PerformanceLogger">
+      <level value="ALL" />
+      <appender-ref ref="PerformanceFileAppender" />
+    </logger>
+    <logger name="ErrorLogger">
+      <level value="ALL" />
+      <appender-ref ref="ErrorFileAppender" />
+    </logger>
+  </log4net>
+
   <connectionStrings>
     <add name="EfDbContext" connectionString="Data Source=(localdb)\v11.0;Initial Catalog=Book; Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
diff --git a/BookStore/log.txt b/BookStore/log.txt
@@ -0,0 +1 @@
+INFO  2015-04-09 08:21:45,867 111336ms AdminController        FindBookAnnotation - ��� � ��������� ����� ����� litres

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ public class AccountController : Controller`
`16`	`16`	`{`
`17`	`17`	`private IUserService _userService;`
`18`	`18`	`private IRoleService _roleService;`
	`19`	`+ readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
	`20`	`+`
`19`	`21`
`20`	`22`	`public AccountController(IUserService user_service, IRoleService role_service)`
`21`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ namespace BookStore.Controllers`
`17`	`17`	`[Authorize(Roles = "admin")]`
`18`	`18`	`public class AdminController : Controller`
`19`	`19`	`{`
`20`		`- public static Logger Log;`
	`20`	`+ readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
	`21`	`+`
`21`	`22`	`public AdminController()`
`22`	`23`	`{`
`23`	`24`
`@@ -63,7 +64,9 @@ public ViewResult Create()`
`63`	`64`	`[HttpPost]`
`64`	`65`	`public ActionResult FindBookImage(string title, string lastName, string firstName, int bookId)`
`65`	`66`	`{`
`66`		`- IList<SearchResult> searchResults = SearchResult.getSearch(title + " " + lastName + " " + firstName, "&searchType=image");`
	`67`	`+ string query =title + " " + lastName + " " + firstName ;`
	`68`	`+ logger.Info(query);`
	`69`	`+ IList < SearchResult > searchResults = SearchResult.GetSearch(query,"&searchType=image");`
`67`	`70`	`ViewData["BookID"] = bookId;`
`68`	`71`	`return PartialView(searchResults.Select(x => x.link));`
`69`	`72`	`}`
`@@ -96,8 +99,8 @@ public string CopyImageToHost(string imageUrl, int bookId)`
`96`	`99`	`public ActionResult FindBookAnnotation(string title, string lastName, string firstName, int bookId)`
`97`	`100`	`{`
`98`	`101`	`string query = title + " " + lastName + " " + firstName + " " + "litres";`
`99`		`- //Log.Info(query);`
`100`		`- List<string> links = SearchResult.getSearch(query).Select(x => x.link).ToList();`
	`102`	`+ logger.Info(query);`
	`103`	`+ List<string> links = SearchResult.GetSearch(query).Select(x => x.link).ToList();`
`101`	`104`	`ViewData["BookID"] = bookId;`
`102`	`105`	`return PartialView(SearchResult.GetInnerText(links));`
`103`	`106`	`}`
`@@ -108,6 +111,7 @@ public ActionResult Create(Book book)`
`108`	`111`	`if (ModelState.IsValid)`
`109`	`112`	`{`
`110`	`113`	`_bookService.Create(book);`
	`114`	`+ logger.Info(book.Title+" created");`
`111`	`115`	`TempData["message"] = string.Format("{0} has been saved", book.Title);`
`112`	`116`	`return RedirectToAction("Edit", new { bookID = book.Book_ID });`
`113`	`117`	`}`
`@@ -120,6 +124,7 @@ public ActionResult Edit(Book book)`
`120`	`124`	`if (ModelState.IsValid)`
`121`	`125`	`{`
`122`	`126`	`_bookService.Save(book);`
	`127`	`+ logger.Info(book.Title + " edited");`
`123`	`128`	`TempData["message"] = string.Format("{0} has been saved", book.Title);`
`124`	`129`	`return RedirectToAction("Index");`
`125`	`130`	`}`
`@@ -130,8 +135,10 @@ public ActionResult Edit(Book book)`
`130`	`135`	`public ActionResult Delete(int bookId)`
`131`	`136`	`{`
`132`	`137`	`Book deletedBook = _bookService.Delete(bookId);`
	`138`	`+`
`133`	`139`	`if (deletedBook != null)`
`134`	`140`	`{`
	`141`	`+ logger.Info(deletedBook.Title + " dletedted");`
`135`	`142`	`TempData["message"] = string.Format("{0} was deleted", deletedBook.Title);`
`136`	`143`	`}`
`137`	`144`	`return RedirectToAction("Index");`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public class BookController : Controller`
`18`	`18`	`private readonly IBookService _bookService;`
`19`	`19`	`private IGenreService _genreService;`
`20`	`20`	`public int PageSize = 10;`
	`21`	`+ readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
	`22`	`+`
`21`	`23`	`public BookController(IBookService book_service, IGenreService genre_service)`
`22`	`24`	`{`
`23`	`25`	`_bookService = book_service;`
`@@ -31,13 +33,13 @@ public ViewResult BookDetails(int bookId)`
`31`	`33`	`return View(_bookService.GetById(bookId));`
`32`	`34`	`}`
`33`	`35`
`34`		`- public ICollection<Book> PaginateBooks(IQueryable<Book> books,int page)`
	`36`	`+ public ICollection<Book> PaginateBooks(List<Book> books, int page)`
`35`	`37`	`{`
`36`	`38`	`return books.Skip((page - 1)*PageSize).Take(PageSize).ToList();`
`37`	`39`	`}`
`38`	`40`	`public ViewResult ListByTag(int tagId, int page = 1)`
`39`	`41`	`{`
`40`		`- IQueryable<Book> books = _bookService.GetBooksByTag(tagId);`
	`42`	`+ List<Book> books = _bookService.GetBooksByTag(tagId).ToList();`
`41`	`43`	`BookListViewModel model = new BookListViewModel`
`42`	`44`	`{`
`43`	`45`	`Books = PaginateBooks(books,page),`
`@@ -50,7 +52,7 @@ public ViewResult ListByTag(int tagId, int page = 1)`
`50`	`52`	`}`
`51`	`53`	`public ViewResult ListByLetter(string selectedLetter, int page = 1)`
`52`	`54`	`{`
`53`		`- IQueryable<Book> books = _bookService.GetBooksByLetter(selectedLetter);`
	`55`	`+ List<Book> books = _bookService.GetBooksByLetter(selectedLetter).ToList();`
`54`	`56`	`BookListViewModel model = new BookListViewModel`
`55`	`57`	`{`
`56`	`58`	`Books = PaginateBooks(books, page),`
`@@ -62,7 +64,8 @@ public ViewResult ListByLetter(string selectedLetter, int page = 1)`
`62`	`64`	`}`
`63`	`65`	`public ViewResult ListByGenre(string genre, int page = 1)`
`64`	`66`	`{`
`65`		`- IQueryable<Book> books = _bookService.GetBooksByGenre(genre);`
	`67`	`+ List<Book> books = _bookService.GetBooksByGenre(genre).ToList();`
	`68`	`+ logger.Info(books);`
`66`	`69`	`BookListViewModel model = new BookListViewModel`
`67`	`70`	`{`
`68`	`71`	`Books = PaginateBooks(books, page),`
`@@ -77,7 +80,7 @@ public ViewResult List(int page = 1)`
`77`	`80`	`List<Book> books = _bookService.GetAll().ToList();`
`78`	`81`	`BookListViewModel model = new BookListViewModel`
`79`	`82`	`{`
`80`		`- Books = PaginateBooks(books.AsQueryable(), page),`
	`83`	`+ Books = PaginateBooks(books, page),`
`81`	`84`	`PagingInfo = new PagingInfo(page, PageSize, books.Count()),`
`82`	`85`	`};`
`83`	`86`	`ViewBag.Action = "List";`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.IO;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using System.Web;`
`5`	`6`	`using System.Web.Http;`
`@@ -19,6 +20,8 @@ namespace BookStore`
`19`	`20`
`20`	`21`	`public class MvcApplication : System.Web.HttpApplication`
`21`	`22`	`{`
	`23`	`+ readonly log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
	`24`	`+`
`22`	`25`	`protected void Application_Start()`
`23`	`26`	`{`
`24`	`27`	`AreaRegistration.RegisterAllAreas();`
`@@ -33,7 +36,9 @@ protected void Application_Start()`
`33`	`36`	`controllerFactory.InjectRoleProvider(Roles.Provider);`
`34`	`37`	`ControllerBuilder.Current.SetControllerFactory(controllerFactory);`
`35`	`38`	`ModelBinders.Binders.Add(typeof(decimal), new DecimalModelBinder());`
`36`		`-`
	`39`	`+ // log4net.Config.XmlConfigurator.Configure();`
	`40`	`+ log4net.Config.XmlConfigurator.Configure(new FileInfo(Server.MapPath("~/Web.config")));`
	`41`	`+`
`37`	`42`	`}`
`38`	`43`	`}`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,14 @@`
`8`	`8`	`using System.Net;`
`9`	`9`	`//using System.Net;`
`10`	`10`	`using System.Web;`
	`11`	`+using NLog;`
`11`	`12`
`12`	`13`	`namespace BookStore.Models`
`13`	`14`	`{`
`14`	`15`	`public class SearchResult`
`15`	`16`	`{`
`16`		`- private static HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();`
	`17`	`+ private static HtmlDocument doc = new HtmlDocument();`
	`18`	`+ readonly static log4net.ILog logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);`
`17`	`19`
`18`	`20`	`public string Title { get; set; }`
`19`	`21`	`public string htmlTitle { get; set; }`
`@@ -26,31 +28,31 @@ public static List<string> GetInnerText(List<string> links)`
`26`	`28`	`{`
`27`	`29`	`if (link.Contains("livelib"))`
`28`	`30`	`{`
`29`		`- doc.LoadHtml(getRequest(link));`
	`31`	`+ doc.LoadHtml(GetRequest(link));`
`30`	`32`	`c = doc.DocumentNode.SelectSingleNode("//p[@itemprop='about']");`
`31`		`- if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));`
	`33`	`+ if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));`
`32`	`34`	`}`
`33`	`35`	`else if (link.Contains("aldebaran"))`
`34`	`36`	`{`
`35`		`- doc.LoadHtml(getRequest(link));`
	`37`	`+ doc.LoadHtml(GetRequest(link));`
`36`	`38`	`c = doc.DocumentNode.SelectSingleNode("//div[@class='annotation clearfix']");`
`37`		`- if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));`
	`39`	`+ if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));`
`38`	`40`	`}`
`39`	`41`	`else if (link.Contains("loveread"))`
`40`	`42`	`{`
`41`		`- doc.LoadHtml(getRequest(link));`
	`43`	`+ doc.LoadHtml(GetRequest(link));`
`42`	`44`	`c = doc.DocumentNode.SelectSingleNode("//p[@class='span_str']");`
`43`	`45`	`if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));`
`44`	`46`	`}`
`45`	`47`	`else if (link.Contains("e-reading.club"))`
`46`	`48`	`{`
`47`		`- doc.LoadHtml(getRequest(link));`
	`49`	`+ doc.LoadHtml(GetRequest(link));`
`48`	`50`	`c = doc.DocumentNode.SelectSingleNode("//span[@itemprop='description']");`
`49`	`51`	`if (c != null) result.Add(HttpUtility.HtmlDecode(c.InnerText));`
`50`	`52`	`}`
`51`	`53`	`else if (link.Contains("litres"))`
`52`	`54`	`{`
`53`		`- doc.LoadHtml(getRequest(link));`
	`55`	`+ doc.LoadHtml(GetRequest(link));`
`54`	`56`	`c = doc.DocumentNode.SelectSingleNode("//div[@itemprop='description']");`
`55`	`57`	`if (c != null)`
`56`	`58`	`{`
`@@ -62,46 +64,65 @@ public static List<string> GetInnerText(List<string> links)`
`62`	`64`	`}`
`63`	`65`	`else if (link.Contains("mybook"))`
`64`	`66`	`{`
`65`		`- doc.LoadHtml(getRequest(link));`
	`67`	`+ doc.LoadHtml(GetRequest(link));`
`66`	`68`	`c = doc.DocumentNode.SelectSingleNode("//div[@class='definition-section']");`
`67`	`69`	`if (c != null) result.Add(HttpUtility.HtmlDecode(c.FirstChild.InnerText));`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`return result;`
`72`	`74`	`}`
`73`		`- public static string getRequest(string url)`
	`75`	`+ public static string GetRequest(string url)`
`74`	`76`	`{`
`75`		`- var httpWebRequest = (HttpWebRequest)WebRequest.Create(url);`
`76`		`- httpWebRequest.AllowAutoRedirect = false;//Запрещаем автоматический редирект`
`77`		`- using (var httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse())`
	`77`	`+ try`
`78`	`78`	`{`
`79`		`- using (var stream = httpWebResponse.GetResponseStream())`
	`79`	`+ var httpWebRequest = (HttpWebRequest)WebRequest.Create(url);`
	`80`	`+ httpWebRequest.AllowAutoRedirect = false;//Запрещаем автоматический редирект`
	`81`	`+ using (var httpWebResponse = (HttpWebResponse)httpWebRequest.GetResponse())`
`80`	`82`	`{`
`81`		`- using (var reader = new StreamReader(stream))`
	`83`	`+ using (var stream = httpWebResponse.GetResponseStream())`
`82`	`84`	`{`
`83`		`- return reader.ReadToEnd();`
	`85`	`+ using (var reader = new StreamReader(stream))`
	`86`	`+ {`
	`87`	`+ return reader.ReadToEnd();`
	`88`	`+ }`
`84`	`89`	`}`
`85`	`90`	`}`
`86`	`91`	`}`
	`92`	`+ catch (WebException ex)`
	`93`	`+ {`
	`94`	`+`
	`95`	`+ logger.Error("You exceeded limit", ex);`
	`96`	`+ return null;`
	`97`	`+ //throw;`
	`98`	`+ }`
	`99`	`+`
`87`	`100`	`}`
`88`		`- public static IList<SearchResult> getSearch(string searchText, string cfg = "")`
	`101`	`+ public static IList<SearchResult> GetSearch(string searchText, string cfg = "")`
`89`	`102`	`{`
`90`	`103`	`string key = "AIzaSyBzcXSZrtK15FFCX8v_Ob-Hcxnc-cVHc-Y";`
`91`	`104`	`string cx = "015577388163479462430:16-o3xadmg4";`
`92`	`105`	`//string key = "AIzaSyAmaV0ew89918tcxHYXbM0VsVM-G6wRKwY";`
`93`	`106`	`//string cx = "003508446447238917805:tgox65vdhtw";`
`94`		`- string google = "https://www.googleapis.com/customsearch/v1?key=" + key + "&cx=" + cx + "&q=" + searchText + "&alt=json" + cfg;`
`95`		`- JObject googleSearch = JObject.Parse(getRequest(google));`
`96`		`- List<JToken> results = googleSearch["items"].Children().ToList();`
`97`	`107`	`IList<SearchResult> searchResults = new List<SearchResult>();`
`98`		`- foreach (JToken result in results)`
	`108`	`+ string google = "https://www.googleapis.com/customsearch/v1?key=" + key + "&cx=" + cx + "&q=" + searchText + "&alt=json" + cfg;`
	`109`	`+ try`
	`110`	`+ {`
	`111`	`+ JObject googleSearch = JObject.Parse(GetRequest(google));`
	`112`	`+ List<JToken> results = googleSearch["items"].Children().ToList();`
	`113`	`+ foreach (JToken result in results)`
	`114`	`+ {`
	`115`	`+ SearchResult searchResult = JsonConvert.DeserializeObject<SearchResult>(result.ToString());`
	`116`	`+ searchResults.Add(searchResult);`
	`117`	`+ }`
	`118`	`+ return searchResults;`
	`119`	`+ }`
	`120`	`+ catch (Exception)`
`99`	`121`	`{`
`100`		`- SearchResult searchResult = JsonConvert.DeserializeObject<SearchResult>(result.ToString());`
`101`		`- searchResults.Add(searchResult);`
	`122`	`+ return searchResults;`
	`123`	`+`
	`124`	`+ //throw;`
`102`	`125`	`}`
`103`		`- return searchResults;`
`104`	`126`	`}`
`105`		`-`
`106`	`127`	`}`
`107`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+INFO 2015-04-09 08:21:45,867 111336ms AdminController FindBookAnnotation - �� litres`