From 01e7ed9dcdbffc2f0d24d03ba83f7313d785620b Mon Sep 17 00:00:00 2001
From: "David A. Madore" <david+git@madore.org>
Date: Fri, 10 Oct 2014 22:16:11 +0200
Subject: Permalinks in servlet system.

---
 org/madore/damlengine/WeblogLink.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'org/madore/damlengine/WeblogLink.java')

diff --git a/org/madore/damlengine/WeblogLink.java b/org/madore/damlengine/WeblogLink.java
index f29c69e..9762e49 100644
--- a/org/madore/damlengine/WeblogLink.java
+++ b/org/madore/damlengine/WeblogLink.java
@@ -39,10 +39,7 @@ public final class WeblogLink {
     public void setTypeSingle() { this.t = Type.SINGLE; }
 
     public void setTypeStandard() {
-	if ( singlePage == null )
-	    this.t = Type.MONTH;
-	else
-	    this.t = Type.SINGLE;
+	this.t = Type.SINGLE;
     }
 
     public String getFragment() {
@@ -59,10 +56,9 @@ public final class WeblogLink {
 	case CAT:
 	    return baseDir + cat + ".html";
 	case SINGLE:
-	    if ( singlePage == null )
-		throw new IllegalArgumentException("can't have single page link to non single-page entry");
-	    return baseDir + yearStr + "-" + monthStr + "-" + dayStr
-		+ "-" + singlePage + ".html";
+	    return baseDir + "d." + yearStr + "-" + monthStr + "-" + dayStr
+		+ "." + numberStr
+		+ (singlePage==null ? "" : "." + singlePage) + ".html";
 	default:
 	    throw new AssertionError("unknown type");
 	}
-- 
cgit v1.2.3