fix: correct validation of minimum and maximum ages

[gigi.git] / src / club / wpia / gigi / dbObjects / Name.java

diff --git a/src/club/wpia/gigi/dbObjects/Name.java b/src/club/wpia/gigi/dbObjects/Name.java
index f4d002ec427c967772a6e03fa59d123bedfb23c7..d5bff5cbd8b52e9d5620dc065468afe574ed8ab0 100644 (file)
--- a/src/club/wpia/gigi/dbObjects/Name.java
+++ b/src/club/wpia/gigi/dbObjects/Name.java
@@ -79,7 +79,7 @@ public class Name implements Outputable, IdCachable {
         public void output(PrintWriter out) {
             out.print("<span class='sname'>");
             out.print(HTMLEncoder.encodeHTML(singlePart.getValue()));
-            out.println("</span>");
+            out.print("</span>");
         }
     }
 
@@ -187,20 +187,23 @@ public class Name implements Outputable, IdCachable {
 
         @Override
         public void output(PrintWriter out) {
-            outputNameParts(out, "fname", firstNames);
-            outputNameParts(out, "lname", lastNames);
-            outputNameParts(out, "suffix", suffixes);
+            outputNameParts(out, "fname", firstNames, false);
+            outputNameParts(out, "lname", lastNames, true);
+            outputNameParts(out, "suffix", suffixes, true);
         }
 
-        private void outputNameParts(PrintWriter out, String type, NamePart[] input) {
+        private void outputNameParts(PrintWriter out, String type, NamePart[] input, boolean leadingSpace) {
             StringBuilder res;
             res = new StringBuilder();
             appendArray(res, input);
             if (res.length() > 0) {
                 res.deleteCharAt(res.length() - 1);
+                if (leadingSpace) {
+                    out.print(" ");
+                }
                 out.print("<span class='" + type + "'>");
                 out.print(HTMLEncoder.encodeHTML(res.toString()));
-                out.println("</span>");
+                out.print("</span>");
             }
         }
 
@@ -351,7 +354,7 @@ public class Name implements Outputable, IdCachable {
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.print("<span class=\"names\">");
         scheme.output(out);
-        out.print("</span> ");
+        out.print("</span>");
     }
 
     /**
@@ -384,7 +387,7 @@ public class Name implements Outputable, IdCachable {
         return scheme.toAbbreviatedString();
     }
 
-    public int getAssurancePoints() {
+    public int getVerificationPoints() {
         try (GigiPreparedStatement query = new GigiPreparedStatement("SELECT SUM(`points`) FROM (SELECT DISTINCT ON (`from`, `method`) `points` FROM `notary` WHERE `to`=? AND `deleted` IS NULL AND (`expire` IS NULL OR `expire` > CURRENT_TIMESTAMP) ORDER BY `from`, `method`, `when` DESC) AS p")) {
             query.setInt(1, getId());