X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=inline;f=src%2Fclub%2Fwpia%2Fgigi%2FdbObjects%2FName.java;h=d5bff5cbd8b52e9d5620dc065468afe574ed8ab0;hb=10e752c710c50035de036a79bc26fbedc7c8a460;hp=f4d002ec427c967772a6e03fa59d123bedfb23c7;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e;p=gigi.git
diff --git a/src/club/wpia/gigi/dbObjects/Name.java b/src/club/wpia/gigi/dbObjects/Name.java
index f4d002ec..d5bff5cb 100644
--- 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("");
out.print(HTMLEncoder.encodeHTML(singlePart.getValue()));
- out.println("");
+ out.print("");
}
}
@@ -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("");
out.print(HTMLEncoder.encodeHTML(res.toString()));
- out.println("");
+ out.print("");
}
}
@@ -351,7 +354,7 @@ public class Name implements Outputable, IdCachable {
public void output(PrintWriter out, Language l, Map vars) {
out.print("");
scheme.output(out);
- out.print(" ");
+ out.print("");
}
/**
@@ -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());