From 4e2a82fb9cdfec92b29065555c9d8ce77f705887 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 04 Apr 2018 05:51:48 +0000
Subject: [PATCH] collectFiles neu nach WbxUtils verlegt
---
src/java/de/uhilger/filecms/api/FileMgr.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 3df6b93..cbcfca6 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -19,12 +19,11 @@
package de.uhilger.filecms.api;
import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.data.Inhalt;
import de.uhilger.filecms.pub.AbstractComparator;
import de.uhilger.filecms.pub.FileNameComparator;
import de.uhilger.wbx.Bild;
import de.uhilger.wbx.WbxUtils;
-import static de.uhilger.wbx.web.FeedServlet.WBX_FILE_BASE;
+import de.uhilger.wbx.data.Inhalt;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -47,6 +46,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
+import javax.servlet.http.HttpServletRequest;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FileUtils;
@@ -146,7 +146,15 @@
}
return files;
}
-
+
+ public List<Inhalt> collectFiles(String relativePath, int maxTiefe, int maxAnzahl) {
+ WbxUtils wu = new WbxUtils();
+ HttpServletRequest req = getRequest();
+ String requestUrl = req.getRequestURL().toString();
+ String contextPath = req.getContextPath();
+ return wu.collectFiles(requestUrl, contextPath, relativePath, maxTiefe, maxAnzahl);
+ }
+
/**
* Wie list nur mit drill down
*
@@ -157,10 +165,14 @@
* @param maxAnzahl
* @return
*/
- public List<Inhalt> collectFiles(String relativePath, int maxTiefe, int maxAnzahl) {
+ /*
+ Beispiel
+ http://localhost:8097/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&m=collectFiles&p=/data/admin/journal/&p=2&p=200&f=JSONNICE
+ */
+ public List<Inhalt> collectFilesAlt(String relativePath, int maxTiefe, int maxAnzahl) {
Bild bild = new Bild();
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);
String pubDirName = wu.getJNDIParameter(WbxUtils.WBX_PUB_DIR_NAME, WbxUtils.WBX_DEFAULT_PUB_DIR_NAME);
String relPath = relativePath.replace("/data", pubDirName);
String absPath = basis + relPath;
--
Gitblit v1.9.3