From c0f5a3a93b5a5e9102b71a4f95c5e557edb35eb5 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 28 Oct 2018 07:38:10 +0000 Subject: [PATCH] WriteListener auskommentiert --- src/de/uhilger/wbx/WbxUtils.java | 71 +++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 16 deletions(-) diff --git a/src/de/uhilger/wbx/WbxUtils.java b/src/de/uhilger/wbx/WbxUtils.java index ff5dcf1..775feb3 100644 --- a/src/de/uhilger/wbx/WbxUtils.java +++ b/src/de/uhilger/wbx/WbxUtils.java @@ -19,12 +19,8 @@ package de.uhilger.wbx; import de.uhilger.wbx.data.Inhalt; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileReader; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -35,6 +31,7 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.servlet.ServletContext; /** * @@ -57,12 +54,50 @@ public static final String WBX_PUB_URL_NAME = "wbxPubUrlName"; public static final String WBX_DEFAULT_PUB_URL_NAME = "/data"; + /** + * Bei der WebBox ist das Datenverzeichnis relativ zum Verzeichnis + * $CATALINA_BASE/webapps untergebracht. + * Die Abfrage ServletContext.getRealPath + * liefert das Verzeichnis des Context dieser Webanwendung, also + * $CATALINA_BASE/webapps/file-cms + * oder + * $WBX/sys/base/webapps/file-cms + * + * Unter Windows z.B. + * C:\Users\fred\Documents\srv\wbx\sys\base\webapps\file-cms + * Unter Linux oder Mac OS z.B. + * /home/fred/srv/wbx/sys/base/webapps/file-cms + * + * Das Datenverzeichis liegt dann auf + * $WBX/daten + * + * Mit dem Verzeichnis des Context dieser Webanwendung ist das + * Datenverzeichnis der WebBox hart kodierbar mit dieser Methode + * + * @return Verzeichnis 'daten' der WebBox + */ + public File getWbxDataDir() { + File file = getWbxDir(); + file = new File(file, "daten/"); + logger.fine("WebBox Datenbasis: " + file.getAbsolutePath()); + return file; + } + + public File getWbxDir() { + logger.fine("Catalina Base: " + System.getProperty("catalina.base")); + File catalinaBase = new File(System.getProperty("catalina.base")); + File wbxDir = catalinaBase.getParentFile().getParentFile(); + return wbxDir; + } public List<Inhalt> collectFiles(String requestUrl, String contextPath, - String relativePath, int maxTiefe, int maxAnzahl, long length) { + String relativePath, int maxTiefe, int maxAnzahl, int length) { Bild bild = new Bild(); //WbxUtils wu = new WbxUtils(); String basis = getJNDIParameter(WBX_FILE_BASE, WbxUtils.EMPTY_STRING); + if(basis.equals(WbxUtils.EMPTY_STRING)) { + basis = getWbxDataDir().getAbsolutePath(); + } String pubDirName = getJNDIParameter(WbxUtils.WBX_PUB_DIR_NAME, WbxUtils.WBX_DEFAULT_PUB_DIR_NAME); String pubUrlName = getJNDIParameter(WbxUtils.WBX_PUB_URL_NAME, WbxUtils.WBX_DEFAULT_PUB_URL_NAME); String relPath = relativePath.replace(pubUrlName, pubDirName); @@ -81,6 +116,9 @@ cont.setIsHidden(beitrag.isHidden()); cont.setLastModified(beitrag.lastModified()); cont.setLength(beitrag.length()); + if(length > 0) { + cont.setAbst(getFileContent(beitrag, length)); + } /* den 'https://..'-Teil bis vor dem @@ -110,24 +148,24 @@ return files; } - private String getFileContent(File file, long len) { + private String getFileContent(File file, int len) { try { StringBuffer readBuffer = new StringBuffer(); - byte[] buf = new byte[1024]; - long read = 0; - FileInputStream fis = new FileInputStream(file); - int bytesRead = fis.read(buf); - read += bytesRead; - while(read < len) { - readBuffer.append(buf); - bytesRead = fis.read(buf); + char[] buf = new char[1]; + FileReader fr = new FileReader(file); + int bytesRead = fr.read(buf); + int read = 0; + while(bytesRead > -1 && read < len) { read += bytesRead; + readBuffer.append(buf); + bytesRead = fr.read(buf); } - readBuffer.append(buf); + fr.close(); + logger.fine("read: " + read + ", readBuffer.len: " + readBuffer.length()); return readBuffer.toString(); } catch (Exception ex) { - Logger.getLogger(WbxUtils.class.getName()).log(Level.SEVERE, null, ex); + logger.log(Level.SEVERE, ex.getMessage(), ex); return EMPTY_STRING; } } @@ -157,6 +195,7 @@ * @param dateizaehler */ public void collectFiles(File dir, int tiefe, List beitraege, int maxTiefe, int maxBeitraege) { + logger.fine(dir.getAbsolutePath()); List dirs = new ArrayList(); List beitraegeHier = new ArrayList(); File[] files = dir.listFiles(); -- Gitblit v1.9.3