Revize f9dd116f

re #9036 Editing logging

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -220 +220 @@
         /// </summary>
         private void WriteToConsole(List<ActivityInfo> list)
         {
-            // TODO useless in finished app
             if (list == null)
             {
                 Console.WriteLine("Unsuccessful parsing");
@@ -240 +239 @@
         /// </summary>
         private void WriteToConsole(List<WeatherInfo> list)
         {
-            // TODO useless in finished app
             if (list == null)
             {
                 Console.WriteLine("Unsuccessful parsing");

Server/ServerApp/Parser/Parsers/JisParser.cs

@@ -5 +5 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using log4net;
 using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 
@@ -17 +18 @@
     /// <author>A. Konig</author>
     public class JisParser
     {
+        /// <summary> Logger </summary>
+        private static readonly ILog _log = LogManager.GetLogger(typeof(JisParser));
 
         /// <summary> Datafile loader  </summary>
         IDataLoader loader;
@@ -71 +74 @@
             }
             catch
             {
-                Console.WriteLine("Incorrect jis input file " + current);
+                _log.Error("Incorrect jis input file " + current);
             }
 
             return list;
@@ -141 +144 @@
                 }
                 else
                 {
-                    // TODO uknown code handling -> to file?
-                    // Console.WriteLine("Unknown code " + list[i].placeTag);
+                    _log.Warn("Unknown code " + list[i].placeTag);
                 }
 
             }
@@ -217 +219 @@
                     // start time of last interval
                     DateTime stTime = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, startingTime, 0, 0);
 
-                    // TODO zjistit kolik se vynechalo a přidat tolik nul?
-
                     // find end and start time
                     if (!trigger)
                         index++;
@@ -260 +260 @@
                 }
                 else
                 {
-                    // TODO uknown code handling -> to file?
-                    // Console.WriteLine("Unknown code " + list[i].placeTag);
+                    _log.Warn("Unknown code " + list[i].placeTag);
                 }
 
             }

Server/ServerApp/Parser/Parsers/LogInParser.cs

@@ -2 +2 @@
 // Author: A. Konig
 //
 
+using log4net;
 using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using System;
@@ -17 +18 @@
     /// <author>A. Konig</author>
     public class LogInParser
     {
+        /// <summary> Logger </summary>
+        private static readonly ILog _log = LogManager.GetLogger(typeof(LogInParser));
+
         /// <summary> Datafile loader  </summary>
         IDataLoader loader;
 
@@ -69 +73 @@
                 }
             } catch
             {
-                Console.WriteLine("Incorrect Login input file " + current);
+                _log.Error("Incorrect Login input file " + current);
             }
 
             return list;
@@ -131 +135 @@
                 if (TagInfo.buildingTags.ContainsKey(place))
                 {
                     int index = TagInfo.buildingTags[place];
-                    //Console.WriteLine(place + " " + index);
 
                     // to all
                     if (index == -1)
@@ -143 +146 @@
                 }
                 else
                 {
-                    // TODO uknown code handling -> to file?
-                    // Console.WriteLine("Unknown code " + list[i].building);
+                    _log.Warn("Unknown code " + list[i].building);
                 }
 
             }
@@ -262 +264 @@
                 }
                 else
                 {
-                    // TODO uknown code handling -> write to file?
-                    // Console.WriteLine("Unknown code " + list[i].building);
+                    _log.Warn("Unknown code " + list[i].building);
                 }
 
             }

Server/ServerApp/Parser/Parsers/TagInfo.cs

@@ -12 +12 @@
     /// <author>Alex Konig</author>
     public class TagInfo
     {
+        /// <summary> Array with names of buildings </summary>
         public static string[] buildings;
 
-        // -1 all
+        /// <summary> 
+        /// Dictionary of places from jis files, and the index of building to which they belong
+        /// -1 means all indices
+        /// </summary>
         public static Dictionary<string, int> jisPlaces;
         
-        // -1 all -2 FST, FEK
+        /// <summary>
+        /// Dictionary of room prefixes and the index of building to which they belong
+        /// -1 means all indices
+        /// </summary>
         public static Dictionary<string, int> buildingTags;
 
+        /// <summary>
+        /// Get the index of a specific building in array buildings
+        /// </summary>
+        /// <param name="tag">Building abbrevation</param>
+        /// <returns>Index in array buildings, -1 if not found</returns>
         public static int IndexOfBuilding(string tag)
         {
             for (int i = 0; i < buildings.Length; i++)
@@ -31 +43 @@
             return -1;
         }
 
+        /// <summary>
+        /// Create dictionaries with jis places and room prefixes
+        /// </summary>
         public static void CreateDictionaries()
         {
             jisPlaces = new Dictionary<string, int>();

Server/ServerApp/Parser/Parsers/WeatherParser.cs

@@ -2 +2 @@
 // Author: A. Konig
 //
 
+using log4net;
 using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using System;
@@ -17 +18 @@
     /// <author>A. Konig</author>
     public class WeatherParser
     {
+        /// <summary> Logger </summary>
+        private static readonly ILog _log = LogManager.GetLogger(typeof(WeatherParser));
 
         /// <summary> Datafile loader  </summary>
         IDataLoader loader;
@@ -72 +75 @@
                 }
             } catch
             {
-                Console.WriteLine("Incorrect Weather input file " + current);
+                _log.Error("Incorrect Weather input file " + current);
             }
 
             return list;

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -2 +2 @@
 // Author: A. Konig
 //
 
+using log4net;
 using ServerApp.DataDownload;
 using ServerApp.Parser.InputData;
 using ServerApp.Parser.OutputInfo;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Net;
 using System.Text.Json;
 using static System.Text.Json.JsonElement;
 
@@ -21 +20 @@
     /// <author>A. Konig</author>
     public class JsonParser : IJsonParser
     {
+        /// <summary> Logger </summary>
+        private static readonly ILog _log = LogManager.GetLogger(typeof(JsonParser));
+
         /// <summary> Data downloader </summary>
         IDataDownloader downloader;
         /// <summary> Data loader </summary>
@@ -135 +137 @@
                 while (weatherP.MoveNext())
                 {
                     string name = weatherP.Current.Name;
-                    Console.WriteLine(name);
 
                     switch (name)
                     {
@@ -162 +163 @@
                 EncompassSunRiseSetTimes();
             } catch
             {
-                Console.WriteLine("Weather prediction file in incorrect format");
+                _log.Error("Weather prediction file in incorrect format");
                 Current = new WeatherInfo();
                 Predictions = new List<WeatherInfo>();
             }
@@ -343 +344 @@
                                 DateTime newSunrise = new DateTime();
                                 DateTime.TryParseExact(astrInfo.Current.Value.GetString(), "hh:mm tt", CultureInfo.InvariantCulture, DateTimeStyles.None, out newSunrise);
                                 sunriseTime.Add(newSunrise);
-                                //Console.WriteLine("\t sunrise time : " + sunriseTime + " " + astrInfo.Current.Value.GetString());
                                 break;
                             }
                         case "sunset":
@@ -351 +351 @@
                                 DateTime newSunset = new DateTime();
                                 DateTime.TryParseExact(astrInfo.Current.Value.GetString(), "hh:mm tt", CultureInfo.InvariantCulture, DateTimeStyles.None, out newSunset);
                                 sunsetTime.Add(newSunset);
-                                //Console.WriteLine("\t sunset time : " + sunsetTime + " " + astrInfo.Current.Value.GetString());
                                 break;
                             }
                     }
@@ -423 +422 @@
                     }
                 }
 
-                // Console.WriteLine(weather.ToString());
                 Predictions.Add(weather);
             }