From 9d60c6d0373a34a2511097d9f957d0bd9cc3efb5 Mon Sep 17 00:00:00 2001
From: llsth <cs@innolan.net>
Date: Sat, 26 Mar 2016 22:48:43 +0100
Subject: [PATCH] Allow peers without org id

---
 Ntp.Analyzer.Objects/Peer.cs                             | 2 +-
 Ntp.Analyzer.Process/Description/PeerGraphJob.cs         | 4 +++-
 Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs     | 5 +++--
 Ntp.Analyzer.Process/Description/PeerPageJob.cs          | 4 +++-
 Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs   | 4 ++--
 .../Render/Summery/BootstrapSummeryGraphRender.cs        | 9 ++++++---
 .../Render/Summery/DefaultPeerSummeryGraphRender.cs      | 9 ++++++---
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Ntp.Analyzer.Objects/Peer.cs b/Ntp.Analyzer.Objects/Peer.cs
index 63f095fc..01acb4e4 100644
--- a/Ntp.Analyzer.Objects/Peer.cs
+++ b/Ntp.Analyzer.Objects/Peer.cs
@@ -74,7 +74,7 @@ namespace Ntp.Analyzer.Objects
         /// </returns>
         public override string ToString()
         {
-            return base.ToString() + String.Format("[Peer: Name={0}, Ip={1}, OrgId={2}]", Name, Ip, OrgId);
+            return base.ToString() + String.Format("[Peer: Name={0}, Ip={1}, OrgId={2}]", Name, Ip, OrgId ?? Id);
         }
     }
 }
\ No newline at end of file
diff --git a/Ntp.Analyzer.Process/Description/PeerGraphJob.cs b/Ntp.Analyzer.Process/Description/PeerGraphJob.cs
index 66f7b82e..05c6d974 100644
--- a/Ntp.Analyzer.Process/Description/PeerGraphJob.cs
+++ b/Ntp.Analyzer.Process/Description/PeerGraphJob.cs
@@ -87,7 +87,9 @@ namespace Ntp.Analyzer.Process.Description
                 Peer peer = peers.Single();
 
                 PeerGraph graph = new PeerGraph(config, host, peer);
-                string file = peer.Server.Name.Replace('.', '-') + ".png";
+
+                string name = peer.Server != null ? peer.Server.Name : peer.Name;
+                string file = name.Replace('.', '-') + ".png";
 
                 SaveStream(graph, file);
             }
diff --git a/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs b/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs
index ec6c4754..6492dbbc 100644
--- a/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs
+++ b/Ntp.Analyzer.Process/Description/PeerGraphPageJob.cs
@@ -92,8 +92,9 @@ namespace Ntp.Analyzer.Process.Description
 
                         Peer peer = peers.Single();
 
-                        GraphPageBuilder builder = new GraphPageBuilder(config, peer, peer.Server.Name, graphSet, graph);
-                        string file = config.GetFileName(host, peer.Server, graphSet, graph);
+                        string name = peer.Server != null ? peer.Server.Name : peer.Name;
+                        GraphPageBuilder builder = new GraphPageBuilder(config, peer, name, graphSet, graph);
+                        string file = config.GetFileName(host, name, graphSet, graph);
 
                         SaveStream(builder, file);
                     }
diff --git a/Ntp.Analyzer.Process/Description/PeerPageJob.cs b/Ntp.Analyzer.Process/Description/PeerPageJob.cs
index 6666bcb7..1aa47264 100644
--- a/Ntp.Analyzer.Process/Description/PeerPageJob.cs
+++ b/Ntp.Analyzer.Process/Description/PeerPageJob.cs
@@ -105,7 +105,9 @@ namespace Ntp.Analyzer.Process.Description
                 else
                     peerPageBuilder = new DefaultPeerPageBuilder(peer, page);
 
-                SaveStream(peerPageBuilder, peer.OrgId.Value.ToString(CultureInfo.InvariantCulture) + ".html");
+                string name = peer.OrgId.HasValue ?
+                    peer.OrgId.Value.ToString (CultureInfo.InvariantCulture) : peer.Name;
+                SaveStream(peerPageBuilder, name + ".html");
             }
         }
     }
diff --git a/Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs b/Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs
index 82adecec..bab28e34 100644
--- a/Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs
+++ b/Ntp.Analyzer/Config/Page/PeerGraphPageConfiguration.cs
@@ -103,10 +103,10 @@ namespace Ntp.Analyzer.Config.Page
             }
         }
 
-        public string GetFileName (Host host, TimeServer peer, GraphSetConfiguration graphSet, GraphBaseConfiguration graph)
+        public string GetFileName (Host host, string name, GraphSetConfiguration graphSet, GraphBaseConfiguration graph)
         {
             return host.Name.Replace ('.', '-') + "_" +
-            graph.GetAltName (graphSet, peer.Name).
+            graph.GetAltName (graphSet, name).
                          Replace (".png", String.Empty).
                          Replace ('.', '-')
             + ".html";
diff --git a/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs b/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs
index 1a45b9a7..532f79db 100644
--- a/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs
+++ b/Ntp.Analyzer/Render/Summery/BootstrapSummeryGraphRender.cs
@@ -109,14 +109,17 @@ namespace Ntp.Analyzer.Render.Summery
                     // TODO: Add links for images.
                     foreach (GraphBaseConfiguration graph in graphSet.Graphs)
                     {
+                        int id = peer.OrgId ?? peer.Id;
+                        string name = peer.Server != null ? peer.Server.Name : peer.Name;
+
                         builder.Append(@"            <div class=""container theme-graph2"">");
                         builder.Append(@"<a href=""");
-                        builder.Append(page.GetPeerLink(peer.OrgId.Value));
+                        builder.Append(page.GetPeerLink(id));
                         builder.Append(@""">");
                         builder.Append(@"<img class=""img-responsive"" src=""");
-                        builder.Append(graph.GetLink(graphSet, peer.Server.Name));
+                        builder.Append(graph.GetLink(graphSet, name));
                         builder.Append(@""" alt=""");
-                        builder.Append(graph.GetAltName(graphSet, peer.Server.Name));
+                        builder.Append(graph.GetAltName(graphSet, name));
                         builder.Append(@""">");
                         builder.AppendLine(@"</a></div>");
                     }
diff --git a/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs b/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs
index cb8e1a3d..cadacce4 100644
--- a/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs
+++ b/Ntp.Analyzer/Render/Summery/DefaultPeerSummeryGraphRender.cs
@@ -77,13 +77,16 @@ namespace Ntp.Analyzer.Render.Summery
                 {
                     foreach (GraphBaseConfiguration graph in graphSet.Graphs)
                     {
+                        int id = peer.OrgId ?? peer.Id;
+                        string name = peer.Server != null ? peer.Server.Name : peer.Name;
+
                         builder.Append(@"<a href=""");
-                        builder.Append(page.GetPeerLink(peer.OrgId.Value));
+                        builder.Append(page.GetPeerLink(id));
                         builder.Append(@""">");
                         builder.Append(@"<img src=""");
-                        builder.Append(graph.GetLink(graphSet, peer.Server.Name));
+                        builder.Append(graph.GetLink(graphSet, name));
                         builder.Append(@""" alt=""");
-                        builder.Append(graph.GetAltName(graphSet, peer.Server.Name));
+                        builder.Append(graph.GetAltName(graphSet, name));
                         builder.Append(@""">");
                         builder.AppendLine(@"</a>");
                     }