add: revocation state in the result list of support cert search

[gigi.git] / src / club / wpia / gigi / output / template / Template.java

diff --git a/src/club/wpia/gigi/output/template/Template.java b/src/club/wpia/gigi/output/template/Template.java
index d3f5a011aa6448a8e2aae66e5a7055eb6942e844..cb0bed02b0fd8019f18e1eddb01ca070505b539e 100644 (file)
--- a/src/club/wpia/gigi/output/template/Template.java
+++ b/src/club/wpia/gigi/output/template/Template.java
@@ -73,6 +73,8 @@ public class Template implements Outputable {
 
     private static final String UNKOWN_CONTROL_STRUCTURE_MSG = "Unknown control structure \"%s\", did you mean \"%s\"?";
 
+    public static final String UTC_TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'";
+
     /**
      * Creates a new template by parsing the contents from the given URL. This
      * constructor will fail on syntax error. When the URL points to a file,
@@ -237,7 +239,7 @@ public class Template implements Outputable {
     protected void tryReload() {
         if (source != null && lastLoaded < source.lastModified()) {
             System.out.println("Reloading template.... " + source);
-            try (InputStreamReader r = new InputStreamReader(new FileInputStream(source), "UTF-8")) {
+            try (FileInputStream fis = new FileInputStream(source); InputStreamReader r = new InputStreamReader(fis, "UTF-8")) {
                 data = parse(r).getBlock(null);
                 r.close();
                 lastLoaded = source.lastModified() + 1000;
@@ -264,10 +266,14 @@ public class Template implements Outputable {
             out.print(((Boolean) s) ? l.getTranslation("yes") : l.getTranslation("no"));
         } else if (s instanceof Date) {
             SimpleDateFormat sdfUI = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-            out.print("<time datetime=\"" + sdf.format(s) + "\">");
-            out.print(sdfUI.format(s));
-            out.print(" UTC</time>");
+            if (vars.containsKey(Outputable.OUT_KEY_PLAIN)) {
+                out.print(sdfUI.format(s));
+            } else {
+                SimpleDateFormat sdf = new SimpleDateFormat(UTC_TIMESTAMP_FORMAT);
+                out.print("<time datetime=\"" + sdf.format(s) + "\">");
+                out.print(sdfUI.format(s));
+                out.print(" UTC</time>");
+            }
         } else {
             out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
         }