Merge "Suggestions to enhance the SQL call pattern."

[gigi.git] / src / org / cacert / gigi / output / CertificateIterable.java

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 14a62130d0ce64b2a998ace84b0741823c065abb..f24d7782ce060e54896feb566269d5bad318a48e 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -26,28 +26,32 @@ public class CertificateIterable implements IterableDataset {
             return false;
         }
         Certificate c = certificates[i++];
-        vars.put("state", l.getTranslation(c.getStatus().toString().toLowerCase()));
+        vars.put("state", c.getStatus());
         vars.put("CN", c.getDistinguishedName());
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());
         vars.put("profile", c.getProfile().getVisibleName());
         try {
             CertificateStatus st = c.getStatus();
-            vars.put("isNotRevoked", st != CertificateStatus.REVOKED);
+            vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
-                vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));
-                vars.put("expire", DateSelector.getDateFormat().format(cert.getNotAfter()));
+                vars.put("issued", cert.getNotBefore());
+                vars.put("expire", cert.getNotAfter());
             } else {
                 vars.put("issued", l.getTranslation("N/A"));
                 vars.put("expire", l.getTranslation("N/A"));
             }
+            if (st == CertificateStatus.REVOKED) {
+                vars.put("revoked", c.getRevocationDate());
+            } else {
+                vars.put("revoked", "n/a");
+            }
         } catch (IOException e) {
             e.printStackTrace();
         } catch (GeneralSecurityException e) {
             e.printStackTrace();
         }
-        vars.put("revoked", "TODO");// TODO output date
         return true;
     }
 }