diff --git a/source/de/anomic/crawler/retrieval/SMBLoader.java b/source/de/anomic/crawler/retrieval/SMBLoader.java index d54a21fe2..9789636db 100644 --- a/source/de/anomic/crawler/retrieval/SMBLoader.java +++ b/source/de/anomic/crawler/retrieval/SMBLoader.java @@ -45,6 +45,7 @@ import de.anomic.search.Switchboard; import de.anomic.crawler.CrawlProfile; import de.anomic.data.MimeTable; +import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; @@ -95,6 +96,7 @@ public class SMBLoader { List list = new ArrayList(); for (String s: l) { if (s.startsWith(".")) continue; + s = MultiProtocolURI.escape(s).toString(); if (!s.endsWith("/") && !s.endsWith("\\")) { // check if this is a directory SmbFile sf = new SmbFile(u + s); diff --git a/source/net/yacy/cora/document/MultiProtocolURI.java b/source/net/yacy/cora/document/MultiProtocolURI.java index 451db72bc..b327ff4ff 100644 --- a/source/net/yacy/cora/document/MultiProtocolURI.java +++ b/source/net/yacy/cora/document/MultiProtocolURI.java @@ -777,18 +777,14 @@ public class MultiProtocolURI implements Serializable, Comparable\n"); page.append("\n"); diff --git a/source/net/yacy/document/parser/genericParser.java b/source/net/yacy/document/parser/genericParser.java index 2137adc61..3f780b224 100644 --- a/source/net/yacy/document/parser/genericParser.java +++ b/source/net/yacy/document/parser/genericParser.java @@ -46,7 +46,7 @@ public class genericParser extends AbstractParser implements Parser { charset, null, null, - location.getFileName(), // title + MultiProtocolURI.unescape(location.getFileName()), // title "", // author location.getHost(), null, diff --git a/source/net/yacy/document/parser/images/genericImageParser.java b/source/net/yacy/document/parser/images/genericImageParser.java index 9561acf5c..c4116d6d6 100644 --- a/source/net/yacy/document/parser/images/genericImageParser.java +++ b/source/net/yacy/document/parser/images/genericImageParser.java @@ -185,7 +185,7 @@ public class genericImageParser extends AbstractParser implements Parser { String infoString = ii.info.toString(); images.put(ii.location, new ImageEntry(location, "", ii.width, ii.height, -1)); - if (title == null || title.length() == 0) title = location.getFileName(); + if (title == null || title.length() == 0) title = MultiProtocolURI.unescape(location.getFileName()); return new Document[]{new Document( location, diff --git a/source/net/yacy/document/parser/pdfParser.java b/source/net/yacy/document/parser/pdfParser.java index eb69e3f1a..250bc9cf7 100644 --- a/source/net/yacy/document/parser/pdfParser.java +++ b/source/net/yacy/document/parser/pdfParser.java @@ -118,7 +118,7 @@ public class pdfParser extends AbstractParser implements Parser { // info.getModificationDate(); } - if (docTitle == null || docTitle.length() == 0) docTitle = location.getFileName(); + if (docTitle == null || docTitle.length() == 0) docTitle = MultiProtocolURI.unescape(location.getFileName()); CharBuffer writer = null; try { // create a writer for output diff --git a/source/net/yacy/document/parser/torrentParser.java b/source/net/yacy/document/parser/torrentParser.java index 4c7babdd6..9dcf6e3d8 100644 --- a/source/net/yacy/document/parser/torrentParser.java +++ b/source/net/yacy/document/parser/torrentParser.java @@ -84,7 +84,7 @@ public class torrentParser extends AbstractParser implements Parser { BObject nameo = info.get("name"); if (nameo != null) title = new String(nameo.getString()); } - if (title == null || title.length() == 0) title = location.getFileName(); + if (title == null || title.length() == 0) title = MultiProtocolURI.unescape(location.getFileName()); try { return new Document[]{new Document( location,