X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FParserFilter.java;h=1b46fa09597bb76af425217f27f18d079bb04ad8;hp=332f504bbf90273df00f012457fced02242804d7;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=1bc78b582ac59f2438002997f5780db4dcee0a2a

diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
index 332f504..1b46fa0 100644
--- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ParserFilter.java - Copyright © 2011 David Roden
+ * Sone - ParserFilter.java - Copyright © 2011–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,8 @@ import net.pterodactylus.sone.text.PostPart;
 import net.pterodactylus.sone.text.SonePart;
 import net.pterodactylus.sone.text.SoneTextParser;
 import net.pterodactylus.sone.text.SoneTextParserContext;
-import net.pterodactylus.sone.web.page.Page.Request;
+import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -87,19 +88,8 @@ public class ParserFilter implements Filter {
 	@Override
 	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
 		String text = String.valueOf(data);
-		int length = -1;
-		try {
-			length = Integer.parseInt(parameters.get("length"));
-		} catch (NumberFormatException nfe1) {
-			/* ignore. */
-		}
-		if ((length == -1) && (parameters.get("length") != null)) {
-			try {
-				length = Integer.parseInt(String.valueOf(templateContext.get(parameters.get("length"))));
-			} catch (NumberFormatException nfe1) {
-				/* ignore. */
-			}
-		}
+		int length = Numbers.safeParseInteger(parameters.get("length"), Numbers.safeParseInteger(templateContext.get(parameters.get("length")), -1));
+		int cutOffLength = Numbers.safeParseInteger(parameters.get("cut-off-length"), Numbers.safeParseInteger(templateContext.get(parameters.get("cut-off-length")), length));
 		String soneKey = parameters.get("sone");
 		if (soneKey == null) {
 			soneKey = "sone";
@@ -108,33 +98,39 @@ public class ParserFilter implements Filter {
 		if (sone == null) {
 			sone = core.getSone(soneKey, false);
 		}
-		Request request = (Request) templateContext.get("request");
+		FreenetRequest request = (FreenetRequest) templateContext.get("request");
 		SoneTextParserContext context = new SoneTextParserContext(request, sone);
 		StringWriter parsedTextWriter = new StringWriter();
 		try {
 			Iterable<Part> parts = soneTextParser.parse(context, new StringReader(text));
 			if (length > -1) {
+				int allPartsLength = 0;
 				List<Part> shortenedParts = new ArrayList<Part>();
 				for (Part part : parts) {
 					if (part instanceof PlainTextPart) {
 						String longText = ((PlainTextPart) part).getText();
-						if (length >= longText.length()) {
-							shortenedParts.add(part);
-						} else {
-							shortenedParts.add(new PlainTextPart(longText.substring(0, length) + "…"));
+						if (allPartsLength < cutOffLength) {
+							if ((allPartsLength + longText.length()) > cutOffLength) {
+								shortenedParts.add(new PlainTextPart(longText.substring(0, cutOffLength - allPartsLength) + "…"));
+							} else {
+								shortenedParts.add(part);
+							}
 						}
-						length -= longText.length();
+						allPartsLength += longText.length();
 					} else if (part instanceof LinkPart) {
-						shortenedParts.add(part);
-						length -= ((LinkPart) part).getText().length();
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
+						allPartsLength += ((LinkPart) part).getText().length();
 					} else {
-						shortenedParts.add(part);
-					}
-					if (length <= 0) {
-						break;
+						if (allPartsLength < cutOffLength) {
+							shortenedParts.add(part);
+						}
 					}
 				}
-				parts = shortenedParts;
+				if (allPartsLength >= length) {
+					parts = shortenedParts;
+				}
 			}
 			render(parsedTextWriter, parts);
 		} catch (IOException ioe1) {
@@ -233,7 +229,11 @@ public class ParserFilter implements Filter {
 	 *            The part to render
 	 */
 	private void render(Writer writer, SonePart sonePart) {
-		renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		if ((sonePart.getSone() != null) && (sonePart.getSone().getName() != null)) {
+			renderLink(writer, "viewSone.html?sone=" + sonePart.getSone().getId(), SoneAccessor.getNiceName(sonePart.getSone()), SoneAccessor.getNiceName(sonePart.getSone()), "in-sone");
+		} else {
+			renderLink(writer, "/WebOfTrust/ShowIdentity?id=" + sonePart.getSone().getId(), sonePart.getSone().getId(), sonePart.getSone().getId(), "in-sone");
+		}
 	}
 
 	/**