Revize d39750f3

re #8682 Modified parser to aggregate data according to buildings. Also added a method that merges information about jis and webauth activity into one list.

Server/ServerApp/Parser/Parsers/LogInParser.cs

@@ -73 +73 @@
             List<LogInInstance> list = loader.LoadLoginFile(path);
 
             // data for each faculty
-            int[] recordedAmount = new int[TagInfo.faculties.Length];
+            int[] recordedAmount = new int[TagInfo.buildings.Length];
             // min/max hour taken into account
             int[] minmaxHour = new int[] { 7, 18 };
             // interval length
@@ -93 +93 @@
                 if (!date.Equals(lastStartDay))
                 {
                     // data for each faculty separate
-                    for (int k = 0; k < TagInfo.faculties.Length; k++)
+                    for (int k = 0; k < TagInfo.buildings.Length; k++)
                     {
-                        ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], lastStartDay, range); 
+                        ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartDay, range); 
                         loginInfo.Add(dayInfo);
                     }
 
-                    recordedAmount = new int[TagInfo.faculties.Length];
+                    recordedAmount = new int[TagInfo.buildings.Length];
                     lastStartDay = date;
                 }
 
@@ -107 +107 @@
                 if (TagInfo.buildingTags.ContainsKey(place))
                 {
                     int index = TagInfo.buildingTags[place];
+                    //Console.WriteLine(place + " " + index);
+
                     // to all
                     if (index == -1)
-                        for (int l = 0; l < TagInfo.faculties.Length; l++)
+                        for (int l = 0; l < TagInfo.buildings.Length; l++)
                             recordedAmount[l] += list[i].amount;
-                    // to first two
-                    else if (index == -2)
-                    {
-                        recordedAmount[0] += list[i].amount;
-                        recordedAmount[1] += list[i].amount;
-                    }
                     else
                         recordedAmount[index] += list[i].amount;
 
                 }
                 else
                 {
-                    // TODO uknown code handling
-                    Console.WriteLine("Unknown code " + list[i].building);
+                    // TODO uknown code handling -> to file?
+                    // Console.WriteLine("Unknown code " + list[i].building);
                 }
 
             }
 
             // last day
-            for (int k = 0; k < TagInfo.faculties.Length; k++)
+            for (int k = 0; k < TagInfo.buildings.Length; k++)
             {
-                ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], lastStartDay, range);
+                ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartDay, range);
                 loginInfo.Add(dayInfo);
             }
 
@@ -166 +162 @@
             for (int i = 0; i < to.Length; i++)
             {
                 to[i] = minmaxHour[0] + interval * (i + 1);
-                data[i] = new int[TagInfo.faculties.Length];
+                data[i] = new int[TagInfo.buildings.Length];
             }
             
             // first day
@@ -191 +187 @@
                         DateTime stTime = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, to[k] - interval, 0, 0);
 
                         // data for each faculty separate
-                        for (int l = 0; l < TagInfo.faculties.Length; l++)
+                        for (int l = 0; l < TagInfo.buildings.Length; l++)
                         {
-                            ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[l], data[k][l], stTime, interval);
+                            ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[l], data[k][l], stTime, interval);
                             loignInfo.Add(dayInfo);
                         }
 
-                        data[k] = new int[TagInfo.faculties.Length];
+                        data[k] = new int[TagInfo.buildings.Length];
                     }
                     lastStartTime = date;
                 }
@@ -219 +215 @@
                     int faculty = TagInfo.buildingTags[place];
                     // to all
                     if (faculty == -1)
-                        for (int l = 0; l < TagInfo.faculties.Length; l++)
+                        for (int l = 0; l < TagInfo.buildings.Length; l++)
                             data[index][l] += list[i].amount;
                     // to first two
                     else if (faculty == -2)
@@ -233 +229 @@
                 }
                 else
                 {
-                    // TODO uknown code handling
-                    Console.WriteLine("Unknown code " + list[i].building);
+                    // TODO uknown code handling -> write to file?
+                    // Console.WriteLine("Unknown code " + list[i].building);
                 }
 
             }
@@ -244 +240 @@
                 DateTime stTime = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, to[k] - interval, 0, 0);
 
                 // data for each faculty separate
-                for (int l = 0; l < TagInfo.faculties.Length; l++)
+                for (int l = 0; l < TagInfo.buildings.Length; l++)
                 {
-                    ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[l], data[k][l], stTime, interval);
+                    ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[l], data[k][l], stTime, interval);
                     loignInfo.Add(dayInfo);
                 }
             }