From 5ca8131e61226dda11d3ff81e12f9fbd39b99a1a Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 20 Jun 2021 10:17:46 +0000
Subject: [PATCH] Package testbereit
---
src/de/uhilger/httpserver/adoc/AdocActor.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/de/uhilger/httpserver/adoc/AdocActor.java b/src/de/uhilger/httpserver/adoc/AdocActor.java
index e918f00..66bbe00 100644
--- a/src/de/uhilger/httpserver/adoc/AdocActor.java
+++ b/src/de/uhilger/httpserver/adoc/AdocActor.java
@@ -19,6 +19,7 @@
import java.io.File;
import java.util.Map;
+import java.util.logging.Level;
import java.util.logging.Logger;
import static org.asciidoctor.Asciidoctor.Factory.create;
@@ -42,22 +43,31 @@
private static final Logger logger = Logger.getLogger(AdocActor.class.getName());
private static final String DOT = ".";
- private static final String HTML = "html";
- private static final String PDF = "pdf";
+ public static final String HTML = "html";
+ public static final String PDF = "pdf";
+ public File getTargetFile(File adocfile, String ext) {
+ String nameext = adocfile.getName();
+ String fname = nameext.substring(0, nameext.lastIndexOf(DOT));
+ File outfile = new File(adocfile.getParentFile(), fname + DOT + ext);
+ logger.log(Level.FINE, "out: {0}", outfile.getAbsolutePath());
+ return outfile;
+ }
public void processAdocFile(File adocfile, String pdf) {
String absname = adocfile.getAbsolutePath();
- logger.fine("in: " + absname);
+ logger.log(Level.FINE, "in: {0}", absname);
// HTML-Datei ermitteln
- String nameext = adocfile.getName();
- String fname = nameext.substring(0, nameext.lastIndexOf(DOT));
- File htmlfile = new File(adocfile.getParentFile(), fname + DOT + HTML);
- File outfile = htmlfile; // Standardmaessig wird HTML zurueckgegeben
- logger.fine("out: " + outfile.getAbsolutePath());
+ //String nameext = adocfile.getName();
+ //String fname = nameext.substring(0, nameext.lastIndexOf(DOT));
+ //File htmlfile = new File(adocfile.getParentFile(), fname + DOT + HTML);
+ //File outfile = htmlfile; // Standardmaessig wird HTML zurueckgegeben
+ //logger.fine("out: " + outfile.getAbsolutePath());
//response.setCharacterEncoding("UTF-8");
+ File outfile = getTargetFile(adocfile, HTML);
+ File htmlfile = outfile;
/*
nach HTML transformieren, wenn die Quelle sich geandert hat oder
@@ -74,7 +84,8 @@
*/
if(null != pdf && pdf.equalsIgnoreCase(Boolean.TRUE.toString())) {
- File pdffile = new File(adocfile.getParentFile(), fname + DOT + PDF);
+ //File pdffile = new File(adocfile.getParentFile(), fname + DOT + PDF);
+ File pdffile = getTargetFile(adocfile, PDF);
outfile = pdffile; // PDF soll zurueckgegeben werden
if(!pdffile.exists() || adocfile.lastModified() > pdffile.lastModified()) {
//response.setContentType("application/pdf");
--
Gitblit v1.9.3