diff --git a/source/de/anomic/crawler/retrieval/FileLoader.java b/source/de/anomic/crawler/retrieval/FileLoader.java index 8c0842358..a2b9e6687 100644 --- a/source/de/anomic/crawler/retrieval/FileLoader.java +++ b/source/de/anomic/crawler/retrieval/FileLoader.java @@ -32,11 +32,11 @@ import java.util.List; import de.anomic.crawler.CrawlProfile; +import net.yacy.cora.document.Classification; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ftp.FTPClient; -import net.yacy.document.Classification; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; diff --git a/source/de/anomic/crawler/retrieval/Request.java b/source/de/anomic/crawler/retrieval/Request.java index 7d8328072..33eb8e1c9 100644 --- a/source/de/anomic/crawler/retrieval/Request.java +++ b/source/de/anomic/crawler/retrieval/Request.java @@ -95,7 +95,7 @@ public class Request extends WorkflowJob /** * convenience method for 'full' request object - * + * * @param url * @param referrerhash */ @@ -105,7 +105,7 @@ public class Request extends WorkflowJob /** * A Request Entry is a object that is created to provide all information to load a specific resource. - * + * * @param initiator the hash of the initiator peer * @param url the {@link URL} to crawl * @param referrer the hash of the referrer URL diff --git a/source/de/anomic/crawler/retrieval/Response.java b/source/de/anomic/crawler/retrieval/Response.java index d36851e36..aeaa8328e 100644 --- a/source/de/anomic/crawler/retrieval/Response.java +++ b/source/de/anomic/crawler/retrieval/Response.java @@ -30,11 +30,12 @@ import java.util.Date; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.ASCII; +import net.yacy.cora.document.Classification; +import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; -import net.yacy.document.Classification; import net.yacy.document.Document; import net.yacy.document.Parser; import net.yacy.document.TextParser; @@ -67,7 +68,7 @@ public class Response { private int status; // tracker indexing status, see status defs below // doctype calculation - public static char docType(final DigestURI url) { + public static char docType(final MultiProtocolURI url) { final String path = url.getPath().toLowerCase(); // serverLog.logFinest("PLASMA", "docType URL=" + path); char doctype = DT_UNKNOWN; diff --git a/source/de/anomic/crawler/retrieval/SMBLoader.java b/source/de/anomic/crawler/retrieval/SMBLoader.java index 018723c11..d3e516b00 100644 --- a/source/de/anomic/crawler/retrieval/SMBLoader.java +++ b/source/de/anomic/crawler/retrieval/SMBLoader.java @@ -41,12 +41,12 @@ import jcifs.smb.SmbFileInputStream; import de.anomic.crawler.CrawlProfile; +import net.yacy.cora.document.Classification; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; import net.yacy.cora.protocol.ftp.FTPClient; -import net.yacy.document.Classification; import net.yacy.document.TextParser; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.logging.Log; diff --git a/source/de/anomic/http/server/HTTPDFileHandler.java b/source/de/anomic/http/server/HTTPDFileHandler.java index e1afb615c..29e99e516 100644 --- a/source/de/anomic/http/server/HTTPDFileHandler.java +++ b/source/de/anomic/http/server/HTTPDFileHandler.java @@ -90,13 +90,13 @@ import java.util.zip.GZIPOutputStream; import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.document.ASCII; +import net.yacy.cora.document.Classification; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.ResponseHeader; -import net.yacy.document.Classification; import net.yacy.document.parser.htmlParser; import net.yacy.document.parser.html.ContentScraper; import net.yacy.document.parser.html.ScraperInputStream; diff --git a/source/net/yacy/document/Classification.java b/source/net/yacy/cora/document/Classification.java similarity index 98% rename from source/net/yacy/document/Classification.java rename to source/net/yacy/cora/document/Classification.java index 3a2143efb..dcd0bc9c7 100644 --- a/source/net/yacy/document/Classification.java +++ b/source/net/yacy/cora/document/Classification.java @@ -18,7 +18,7 @@ * If not, see . */ -package net.yacy.document; +package net.yacy.cora.document; import java.io.BufferedInputStream; import java.io.File; @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import net.yacy.cora.document.MultiProtocolURI; import net.yacy.kelondro.logging.Log; public class Classification { diff --git a/source/net/yacy/document/Document.java b/source/net/yacy/document/Document.java index cec3c7858..6f45ca449 100644 --- a/source/net/yacy/document/Document.java +++ b/source/net/yacy/document/Document.java @@ -52,6 +52,7 @@ import java.util.Set; import java.util.TreeSet; import net.yacy.cora.date.ISO8601Formatter; +import net.yacy.cora.document.Classification; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.document.UTF8; import net.yacy.document.parser.html.ContentScraper; diff --git a/source/net/yacy/document/TextParser.java b/source/net/yacy/document/TextParser.java index 919d74417..a6ab4c812 100644 --- a/source/net/yacy/document/TextParser.java +++ b/source/net/yacy/document/TextParser.java @@ -35,6 +35,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import net.yacy.cora.document.Classification; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.document.parser.bzipParser; import net.yacy.document.parser.csvParser; diff --git a/source/net/yacy/search/snippet/MediaSnippet.java b/source/net/yacy/search/snippet/MediaSnippet.java index 6b4691655..ccc8e5d2f 100644 --- a/source/net/yacy/search/snippet/MediaSnippet.java +++ b/source/net/yacy/search/snippet/MediaSnippet.java @@ -36,9 +36,9 @@ import java.util.SortedSet; import java.util.TreeSet; import net.yacy.cora.document.ASCII; +import net.yacy.cora.document.Classification; import net.yacy.cora.document.MultiProtocolURI; import net.yacy.cora.services.federated.yacy.CacheStrategy; -import net.yacy.document.Classification; import net.yacy.document.Document; import net.yacy.document.Parser; import net.yacy.document.WordTokenizer;