From e4ff596039e48bb219ca49b03d8f84ad05236f2a Mon Sep 17 00:00:00 2001 From: ulrich Date: Fri, 24 Jul 2020 10:29:37 +0000 Subject: [PATCH] PDF-Ausgabe binaer schreiben --- src/de/uhilger/wbx/web/FeedServlet.java | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/de/uhilger/wbx/web/FeedServlet.java b/src/de/uhilger/wbx/web/FeedServlet.java index d74d7d6..83129c9 100644 --- a/src/de/uhilger/wbx/web/FeedServlet.java +++ b/src/de/uhilger/wbx/web/FeedServlet.java @@ -11,8 +11,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; import java.util.Iterator; @@ -57,7 +55,7 @@ * folgenden Eintraege enthalten:</p> * <pre> * <Environment name="wbxFileBase" type="java.lang.String" value="absoluter/pfad/zur/dateiablage" override="false" /> - * <Environment name="wbxPubDir" type="java.lang.String" value="/www" override="false" /> + * <Environment name="wbxPubDirName" type="java.lang.String" value="/www" override="false" /> * <Environment name="wbxFeedTitle" type="java.lang.String" value="Newsfeed" override="false" /> * <Environment name="wbxFeedSubtitle" type="java.lang.String" value="Text des Untertitels" override="false" /> * <Environment name="wbxFeedCopyright" type="java.lang.String" value="Text des Copyright-Hinweises" override="false" /> @@ -69,9 +67,9 @@ private static final Logger logger = Logger.getLogger(FeedServlet.class.getName()); - public static final String JNDI_CTX_NAME = "java:comp/env"; - public static final String WBX_FILE_BASE = "wbxFileBase"; - public static final String WBX_PUB_DIR = "wbxPubDir"; + //public static final String JNDI_CTX_NAME = "java:comp/env"; + //public static final String WBX_FILE_BASE = "wbxFileBase"; + //public static final String WBX_PUB_DIR = "wbxPubDir"; public static final String WBX_MAX_FEED_DEPTH = "wbxMaxFeedDepth"; public static final String WBX_MAX_FEED_ENTRIES = "wbxMaxFeedEntries"; public static final String WBX_FEED_TITLE = "wbxFeedTitle"; @@ -94,11 +92,14 @@ String zielPfad = url.substring(url.indexOf(contextPath)); logger.fine(zielPfad); WbxUtils wu = new WbxUtils(); - String basis = wu.getJNDIParameter(WBX_FILE_BASE, WbxUtils.EMPTY_STRING); + String basis = wu.getJNDIParameter(WbxUtils.WBX_FILE_BASE, WbxUtils.EMPTY_STRING); logger.fine("basis: " + basis); + if(basis.equals(WbxUtils.EMPTY_STRING)) { + basis = wu.getWbxDataDir().getAbsolutePath(); + } StringBuffer pfad = new StringBuffer(); pfad.append(basis); - pfad.append(zielPfad.replace(contextPath, wu.getJNDIParameter(WBX_PUB_DIR, WbxUtils.EMPTY_STRING))); + pfad.append(zielPfad.replace(contextPath, wu.getJNDIParameter(WbxUtils.WBX_PUB_DIR_NAME, WbxUtils.WBX_DEFAULT_PUB_DIR_NAME))); logger.fine("pfad: " + pfad); String dirStr = pfad.toString().substring(0, pfad.lastIndexOf("/")); logger.fine("dirStr: " + dirStr); @@ -153,7 +154,7 @@ String urlStr = f.getAbsolutePath(); urlStr = urlStr.replace(basis, domain); - urlStr = urlStr.replace(wu.getJNDIParameter(WBX_PUB_DIR, WbxUtils.EMPTY_STRING), contextPath); + urlStr = urlStr.replace(wu.getJNDIParameter(WbxUtils.WBX_PUB_DIR_NAME, WbxUtils.WBX_DEFAULT_PUB_DIR_NAME), contextPath); logger.fine(urlStr); -- Gitblit v1.9.3