statool/statoolinfosweb
statool/statoolinfosweb
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Activity

Fixed and refactored HTML cache usage.

Browse source
This commit is contained in:
Christian P. MOMON 2024-08-18 03:43:52 +02:00
parent f7eafcf23f
commit cd3ccaf557
46 changed files with 356 additions and 389 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/website/federation/CrawlPage.java
View file

@ -52,7 +52,7 @@ public class CrawlPage extends HttpServlet
{
try
{
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -73,7 +73,7 @@ public class CrawlPage extends HttpServlet
trail.add("Journal", "/federation/crawl.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/LastStatsPage.java
View file

@ -54,7 +54,7 @@ public class LastStatsPage extends HttpServlet
{
logger.info("PAGE Federation > Last Stats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -75,7 +75,7 @@ public class LastStatsPage extends HttpServlet
trail.add("Chiffres", "/federation/servicesFigures.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertiesFilesPage.java
View file

@ -63,7 +63,7 @@ public class PropertiesFilesPage extends HttpServlet
{
logger.info("PAGE Federation > propertiesFiles");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -86,7 +86,7 @@ public class PropertiesFilesPage extends HttpServlet
trail.add("Fichiers", "/federation/propertiesFiles.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyAlertFederationPage.java
View file

@ -56,7 +56,7 @@ public class PropertyAlertFederationPage extends HttpServlet
{
logger.info("PAGE Fédération > PropertyAlert");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -79,7 +79,7 @@ public class PropertyAlertFederationPage extends HttpServlet
trail.add("Disponibilités", "/federation/uptimes.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyAlertOrganizationsPage.java
View file

@ -57,7 +57,7 @@ public class PropertyAlertOrganizationsPage extends HttpServlet
{
logger.info("PAGE Fédération > PropertyAlert");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -84,7 +84,7 @@ public class PropertyAlertOrganizationsPage extends HttpServlet
trail.add("Disponibilités", "/federation/uptimes.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyAlertPage.java
View file

@ -56,7 +56,7 @@ public class PropertyAlertPage extends HttpServlet
{
logger.info("PAGE Fédération > PropertyAlerts");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -79,7 +79,7 @@ public class PropertyAlertPage extends HttpServlet
trail.add("Alertes", "/federation/propertyAlerts.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyAlertServicesPage.java
View file

@ -57,7 +57,7 @@ public class PropertyAlertServicesPage extends HttpServlet
{
logger.info("PAGE Fédération > PropertyAlert");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -84,7 +84,7 @@ public class PropertyAlertServicesPage extends HttpServlet
trail.add("Disponibilités", "/federation/uptimes.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyCheckPage.java
View file

@ -52,7 +52,7 @@ public class PropertyCheckPage extends HttpServlet
{
try
{
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -73,7 +73,7 @@ public class PropertyCheckPage extends HttpServlet
trail.add("Propriétés", "/federation/propertyCheck.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyStatsFederationPage.java
View file

@ -56,7 +56,7 @@ public class PropertyStatsFederationPage extends HttpServlet
{
logger.info("PAGE Federation > propertiesStats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -78,7 +78,7 @@ public class PropertyStatsFederationPage extends HttpServlet
trail.add("Propriétés", "/federation/propertiesStats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyStatsOrganizationsPage.java
View file

@ -56,7 +56,7 @@ public class PropertyStatsOrganizationsPage extends HttpServlet
{
logger.info("PAGE Federation > propertiesStats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -78,7 +78,7 @@ public class PropertyStatsOrganizationsPage extends HttpServlet
trail.add("Propriétés", "/federation/propertiesStats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyStatsPage.java
View file

@ -57,7 +57,7 @@ public class PropertyStatsPage extends HttpServlet
{
logger.info("PAGE Federation > propertiesStats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -80,7 +80,7 @@ public class PropertyStatsPage extends HttpServlet
trail.add("Propriétés", "/federation/propertiesStats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/PropertyStatsServicesPage.java
View file

@ -56,7 +56,7 @@ public class PropertyStatsServicesPage extends HttpServlet
{
logger.info("PAGE Federation > propertiesStats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -78,7 +78,7 @@ public class PropertyStatsServicesPage extends HttpServlet
trail.add("Propriétés", "/federation/propertiesStats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/ServicesPage.java
View file

@ -54,7 +54,7 @@ public class ServicesPage extends HttpServlet
{
logger.info("PAGE Federation > services");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -75,7 +75,7 @@ public class ServicesPage extends HttpServlet
trail.add("Services", "/federation/services.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/SocialNetworksPage.java
View file

@ -62,7 +62,7 @@ public class SocialNetworksPage extends HttpServlet
{
logger.info("PAGE Federation > SocialNetworks");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -85,7 +85,7 @@ public class SocialNetworksPage extends HttpServlet
trail.add("Réseaux sociaux", "/federation/socialNetworks.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/StatsPage.java
View file

@ -63,7 +63,7 @@ public class StatsPage extends HttpServlet
{
logger.info("PAGE Federation > Stats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -85,7 +85,7 @@ public class StatsPage extends HttpServlet
trail.add("Stats", "/federation/stats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/UptimePage.java
View file

@ -54,7 +54,7 @@ public class UptimePage extends HttpServlet
{
logger.info("PAGE Fédération > Uptimes");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -75,7 +75,7 @@ public class UptimePage extends HttpServlet
trail.add("Disponibilités", "/federation/uptimes.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

11
src/website/federation/categories/CategoryPage.java
View file

@ -64,19 +64,18 @@ public class CategoryPage extends HttpServlet
{
logger.info("PAGE Federation > Categories > Category");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Category category = StatoolInfosWeb.instance().getCategoryFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
Category category = StatoolInfosWeb.instance().getCategoryFromPathinfo(request.getPathInfo());
String key = this.getClass().getCanonicalName() + "?category=" + category.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
// Send response.
// ==============
String headerView = FederationHeaderView.htmlize(federation, uptimes);
@ -90,7 +89,7 @@ public class CategoryPage extends HttpServlet
trail.add(category.getName(), "/federation/categories/" + category.getTechnicalName() + ".xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(key, html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/categories/IndexPage.java
View file

@ -64,7 +64,7 @@ public class IndexPage extends HttpServlet
{
logger.info("PAGE Federation > Categories");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -88,7 +88,7 @@ public class IndexPage extends HttpServlet
trail.add("Catégories", "/federation/categories/");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/exports/IndexPage.java
View file

@ -57,7 +57,7 @@ public class IndexPage extends HttpServlet
{
logger.info("PAGE Fédération > Exports");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -78,7 +78,7 @@ public class IndexPage extends HttpServlet
trail.add(StatoolInfosWeb.instance().getFederation().getName(), "/federation/organizations/");
trail.add("Exports", "/federation/exports/");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

8
src/website/federation/metrics/MetricGenericPage.java
View file

@ -65,18 +65,18 @@ public class MetricGenericPage extends HttpServlet
{
logger.info("PAGE Federation > Metrics > Generic");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
@ -89,7 +89,7 @@ public class MetricGenericPage extends HttpServlet
trail.add("Génériques", "/federation/metrics/generic.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

8
src/website/federation/metrics/MetricSpecificPage.java
View file

@ -65,18 +65,18 @@ public class MetricSpecificPage extends HttpServlet
{
logger.info("PAGE Federation > Metrics > Specific");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
@ -89,7 +89,7 @@ public class MetricSpecificPage extends HttpServlet
trail.add("Spécifiques", "/federation/metrics/specific.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

8
src/website/federation/metrics/MetricSummaryPage.java
View file

@ -66,18 +66,18 @@ public class MetricSummaryPage extends HttpServlet
{
logger.info("PAGE Federation > Metrics > Summary");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
@ -90,7 +90,7 @@ public class MetricSummaryPage extends HttpServlet
trail.add("Résumé", "/federation/metrics/summary.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

8
src/website/federation/metrics/MetricWebPage.java
View file

@ -65,18 +65,18 @@ public class MetricWebPage extends HttpServlet
{
logger.info("PAGE Federation > Metrics > Web");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
@ -89,7 +89,7 @@ public class MetricWebPage extends HttpServlet
trail.add("Web", "/federation/metrics/web.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/organizations/IndexPage.java
View file

@ -52,7 +52,7 @@ public class IndexPage extends HttpServlet
{
try
{
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -73,7 +73,7 @@ public class IndexPage extends HttpServlet
trail.add("Organisations", "/federation/organizations/");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

11
src/website/federation/organizations/organization/CrawlPage.java
View file

@ -56,20 +56,19 @@ public class CrawlPage extends HttpServlet
{
logger.info("PAGE Organization > Crawl");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = CrawlView.htmlize(organization.getCrawlJournal());
@ -80,7 +79,7 @@ public class CrawlPage extends HttpServlet
trail.add("Journal", "/federation/organizations/" + organization.getTechnicalName() + "/crawl.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(key, html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

11
src/website/federation/organizations/organization/PropertyAlertPage.java
View file

@ -56,20 +56,19 @@ public class PropertyAlertPage extends HttpServlet
{
logger.info("PAGE Organization > PropertyAlert");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = PropertyAlertView.htmlize(organization.getInputChecksAll().getAlertLines());
@ -80,7 +79,7 @@ public class PropertyAlertPage extends HttpServlet
trail.add("Alertes", "/federation/organizations/" + organization.getTechnicalName() + "/propertyAlert.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(key, html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

11
src/website/federation/organizations/organization/PropertyCheckPage.java
View file

@ -56,20 +56,19 @@ public class PropertyCheckPage extends HttpServlet
{
logger.info("PAGE Organization > PropertyCheck");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = PropertyCheckView.htmlize(organization.getInputChecks());
@ -80,7 +79,7 @@ public class PropertyCheckPage extends HttpServlet
trail.add("Propriétés", "/federation/organizations/" + organization.getTechnicalName() + "/propertyCheck.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

9
src/website/federation/organizations/organization/ServicesPage.java
View file

@ -56,6 +56,9 @@ public class ServicesPage extends HttpServlet
{
logger.info("PAGE Organization > Services");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
@ -65,10 +68,6 @@ public class ServicesPage extends HttpServlet
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = ServiceListView.htmlize(organization.getServices());
@ -80,7 +79,7 @@ public class ServicesPage extends HttpServlet
trail.add("Services", "/federation/organizations/" + organization.getTechnicalName() + "/services.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

11
src/website/federation/organizations/organization/StatsPage.java
View file

@ -64,20 +64,19 @@ public class StatsPage extends HttpServlet
{
logger.info("PAGE Organization > Stats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = htmlize(organization);
@ -88,7 +87,7 @@ public class StatsPage extends HttpServlet
trail.add("Stats", "/federation/organizations/" + organization.getTechnicalName() + "/stats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

9
src/website/federation/organizations/organization/UptimePage.java
View file

@ -56,6 +56,9 @@ public class UptimePage extends HttpServlet
{
logger.info("PAGE Organization > Uptime");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
@ -66,10 +69,6 @@ public class UptimePage extends HttpServlet
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = UptimeView.htmlize(organization.getServices(), uptimes);
@ -80,7 +79,7 @@ public class UptimePage extends HttpServlet
trail.add("Disponibilité", "/federation/organizations/" + organization.getTechnicalName() + "/uptime.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

13
src/website/federation/organizations/organization/metrics/MetricGenericPage.java
View file

@ -66,22 +66,21 @@ public class MetricGenericPage extends HttpServlet
{
logger.info("PAGE Organization > Metrics > Summary");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = htmlize(organization, viewMenu, periodMenu);
@ -93,7 +92,7 @@ public class MetricGenericPage extends HttpServlet
trail.add("Génériques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/generic.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

13
src/website/federation/organizations/organization/metrics/MetricSpecificPage.java
View file

@ -64,22 +64,21 @@ public class MetricSpecificPage extends HttpServlet
{
logger.info("PAGE Organization > Metrics > Specific");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = htmlize(organization, viewMenu, periodMenu);
@ -91,7 +90,7 @@ public class MetricSpecificPage extends HttpServlet
trail.add("Spécifiques", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/specific.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

13
src/website/federation/organizations/organization/metrics/MetricSummaryPage.java
View file

@ -66,22 +66,21 @@ public class MetricSummaryPage extends HttpServlet
{
logger.info("PAGE Organization > Metrics > Summary");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = htmlize(organization, viewMenu, periodMenu);
@ -93,7 +92,7 @@ public class MetricSummaryPage extends HttpServlet
trail.add("Résumé", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/summary.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

13
src/website/federation/organizations/organization/metrics/MetricWebPage.java
View file

@ -65,22 +65,21 @@ public class MetricWebPage extends HttpServlet
{
logger.info("PAGE Organization > Metrics > Web");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Organization organization = StatoolInfosWeb.instance().getOrganizationFromPathinfo(request.getPathInfo());
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = OrganizationHeaderView.htmlize(organization, uptimes);
String contentView = htmlize(organization, viewMenu, periodMenu);
@ -92,7 +91,7 @@ public class MetricWebPage extends HttpServlet
trail.add("Web", "/federation/organizations/" + organization.getTechnicalName() + "/metrics/web.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/CrawlPage.java
View file

@ -57,22 +57,20 @@ public class CrawlPage extends HttpServlet
{
logger.info("PAGE Service > Crawl");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = CrawlView.htmlize(service.getCrawlJournal());
@ -87,7 +85,7 @@ public class CrawlPage extends HttpServlet
"/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/crawl.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/PropertyAlertPage.java
View file

@ -57,22 +57,20 @@ public class PropertyAlertPage extends HttpServlet
{
logger.info("PAGE Service > PropertyAlert");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = PropertyAlertView.htmlize(service.getInputChecksAll().getAlertLines());
@ -87,7 +85,7 @@ public class PropertyAlertPage extends HttpServlet
+ "/propertyAlert.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/PropertyCheckPage.java
View file

@ -57,22 +57,20 @@ public class PropertyCheckPage extends HttpServlet
{
logger.info("PAGE Service > PropertyCheck");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = PropertyCheckView.htmlize(service.getInputChecks());
@ -87,7 +85,7 @@ public class PropertyCheckPage extends HttpServlet
+ "/propertyCheck.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/ServicesPage.java
View file

@ -58,22 +58,20 @@ public class ServicesPage extends HttpServlet
{
logger.info("PAGE Service > Services");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = ServiceListView.htmlize(new Services(service));
@ -88,7 +86,7 @@ public class ServicesPage extends HttpServlet
+ "/services.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/StatsPage.java
View file

@ -65,22 +65,20 @@ public class StatsPage extends HttpServlet
{
logger.info("PAGE Service > Stats");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = htmlize(service);
@ -95,7 +93,7 @@ public class StatsPage extends HttpServlet
"/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/stats.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

12
src/website/federation/organizations/organization/services/service/UptimePage.java
View file

@ -58,22 +58,20 @@ public class UptimePage extends HttpServlet
{
logger.info("PAGE Service > Uptime");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = UptimeView.htmlize(new Services(service), uptimeJournal);
@ -88,7 +86,7 @@ public class UptimePage extends HttpServlet
"/federation/organizations/" + organization.getTechnicalName() + "/services/" + service.getTechnicalName() + "/uptime.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

14
src/website/federation/organizations/organization/services/service/metrics/MetricGenericPage.java
View file

@ -67,24 +67,22 @@ public class MetricGenericPage extends HttpServlet
{
logger.info("PAGE Service > MetricGenericPage");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = htmlize(service, viewMenu, periodMenu);
@ -101,7 +99,7 @@ public class MetricGenericPage extends HttpServlet
+ "/metrics/generic.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

22
src/website/federation/organizations/organization/services/service/metrics/MetricSpecificPage.java
View file

@ -67,24 +67,22 @@ public class MetricSpecificPage extends HttpServlet
{
logger.info("PAGE Service > MetricGenericPage");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo() + "?" + request.getQueryString());
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = htmlize(service, viewMenu, periodMenu);
@ -101,7 +99,7 @@ public class MetricSpecificPage extends HttpServlet
+ "/metrics/specific.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

14
src/website/federation/organizations/organization/services/service/metrics/MetricSummaryPage.java
View file

@ -67,24 +67,22 @@ public class MetricSummaryPage extends HttpServlet
{
logger.info("PAGE Service > MetricSummaryPage");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = htmlize(service, viewMenu, periodMenu);
@ -101,7 +99,7 @@ public class MetricSummaryPage extends HttpServlet
+ "/metrics/summary.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

22
src/website/federation/organizations/organization/services/service/metrics/MetricWebPage.java
View file

@ -67,24 +67,22 @@ public class MetricWebPage extends HttpServlet
{
logger.info("PAGE Service > MetricGenericPage");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
ViewMenu viewMenu = ViewMenu.valueFrom(request.getParameter("view"));
PeriodMenu periodMenu = PeriodMenu.valueFrom(request.getParameter("period"));
// Use parameters.
// ===============
Service service = StatoolInfosWeb.instance().getServiceFromPathinfo(request.getPathInfo() + "?" + request.getQueryString());
Organization organization = service.getOrganization();
UptimeJournal uptimeJournal = StatoolInfosWeb.instance().getUptimeJournal();
// Send response.
// ==============
String key = this.getClass().getCanonicalName() + "?organization=" + organization.getTechnicalName() + "&service="
+ service.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
String headerView = ServiceHeaderView.htmlize(service, uptimeJournal);
String contentView = htmlize(service, viewMenu, periodMenu);
@ -101,7 +99,7 @@ public class MetricWebPage extends HttpServlet
+ "/metrics/web.xhtml");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

4
src/website/federation/softwares/IndexPage.java
View file

@ -66,7 +66,7 @@ public class IndexPage extends HttpServlet
{
logger.info("PAGE Federation > Softwares");
String html = StatoolInfosWeb.instance().getHtmlCache().get(this.getClass().getCanonicalName());
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
@ -90,7 +90,7 @@ public class IndexPage extends HttpServlet
trail.add("Logiciels", "/federation/softwares/");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(this.getClass().getCanonicalName(), html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
// Display page.

14
src/website/federation/softwares/SoftwarePage.java
View file

@ -64,14 +64,17 @@ public class SoftwarePage extends HttpServlet
{
logger.info("PAGE Federation > Softwares > Software");
String html = StatoolInfosWeb.instance().getHtmlCache().get(request);
if (html == null)
{
// Get parameters.
// ===============
Software software = StatoolInfosWeb.instance().getSoftwareFromPathinfo(request.getPathInfo());
// Use parameters.
// ===============
Federation federation = StatoolInfosWeb.instance().getFederation();
UptimeJournal uptimes = StatoolInfosWeb.instance().getUptimeJournal();
Software software = StatoolInfosWeb.instance().getSoftwareFromPathinfo(request.getPathInfo());
// Send response.
// ==============
@ -82,10 +85,6 @@ public class SoftwarePage extends HttpServlet
throw new StatoolInfosWebException("Illegal software name.");
}
else
{
String key = this.getClass().getCanonicalName() + "?software=" + software.getTechnicalName();
String html = StatoolInfosWeb.instance().getHtmlCache().get(key);
if (html == null)
{
Services services = federation.getServices().getBy(software);
String contentView = htmlize(software, services);
@ -95,14 +94,13 @@ public class SoftwarePage extends HttpServlet
trail.add("Logiciels", "/federation/softwares/");
html = WebCharterView.build(headerView, contentView, trail);
StatoolInfosWeb.instance().getHtmlCache().put(key, html);
StatoolInfosWeb.instance().getHtmlCache().put(request, html);
}
}
// Display page.
response.setContentType("application/xhtml+xml; charset=UTF-8");
response.getWriter().println(html);
}
}
catch (StatoolInfosWebException exception)
{
ErrorView.show(request, response, "Error building Federation > Softwares > Software", exception.getMessage(), null);