Revize 26ecc756

re #8962 Adding reading of file to string to CsvDataLoader

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -3 +3 @@
 //
 
 using ServerApp.DataDownload;
+using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using System;
 using System.Collections.Generic;
@@ -20 +21 @@
     /// <author>A. Konig</author>
     public class JsonParser : IJsonParser
     {
+        /// <summary> Data downloader </summary>
+        DataDownloader downloader;
         /// <summary> Data loader </summary>
-        DataDownloader loader;
+        IDataLoader loader;
         /// <summary> Currently parsed day </summary>
         DateTime currParsedDay;
         /// <summary> Sunrise time of currently parsed day </summary>
@@ -32 +35 @@
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="loader"></param>
-        public JsonParser(DataDownloader loader)
+        /// <param name="downloader"></param>
+        public JsonParser(DataDownloader downloader, IDataLoader loader)
         {
+            this.downloader = downloader;
             this.loader = loader;
         }
 
@@ -107 +111 @@
             sunsetTime = new List<DateTime>();
 
             // get file
-            string data = loader.DownloadWeatherPrediction();
+            string file = downloader.DownloadWeatherPrediction();
+            string data = loader.LoadPredictionFile(file);
+
+            if (data == null)
+                return;
+
             DateTime now = DateTime.Now;
 
             Current = new WeatherInfo();