diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index efdcadbd6..7be93a7e4 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/htroot/IndexControlRWIs_p.java @@ -37,6 +37,9 @@ import java.util.List; import java.util.Set; import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.ReferenceContainerCache; import de.anomic.data.AbstractBlacklist; import de.anomic.data.Blacklist; @@ -44,9 +47,6 @@ import de.anomic.data.listManager; import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; -import de.anomic.kelondro.text.ReferenceContainerCache; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/htroot/api/timeline.java b/htroot/api/timeline.java index e84cfa74f..063167ecf 100644 --- a/htroot/api/timeline.java +++ b/htroot/api/timeline.java @@ -28,12 +28,13 @@ import java.util.Date; import java.util.Iterator; import java.util.TreeSet; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.TermSearch; + import de.anomic.document.Word; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.Segments; -import de.anomic.kelondro.text.TermSearch; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.util.DateFormatter; import de.anomic.search.QueryParams; diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index 11d097824..9c99af511 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -36,12 +36,12 @@ import java.util.TreeSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.rwi.ReferenceContainer; import de.anomic.content.RSSMessage; import de.anomic.document.parser.xml.RSSFeed; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segments; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.util.SortStack; diff --git a/source/de/anomic/crawler/ExternalIndexImporter.java b/source/de/anomic/crawler/ExternalIndexImporter.java index 15078fd7d..db930f18c 100644 --- a/source/de/anomic/crawler/ExternalIndexImporter.java +++ b/source/de/anomic/crawler/ExternalIndexImporter.java @@ -4,8 +4,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.TreeSet; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; + import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/data/DidYouMean.java b/source/de/anomic/data/DidYouMean.java index b9e690241..b1e81c1be 100644 --- a/source/de/anomic/data/DidYouMean.java +++ b/source/de/anomic/data/DidYouMean.java @@ -8,9 +8,9 @@ import java.util.TreeSet; import java.util.concurrent.LinkedBlockingQueue; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.rwi.IndexCell; import de.anomic.document.Word; -import de.anomic.kelondro.text.IndexCell; import de.anomic.kelondro.text.referencePrototype.WordReference; /** diff --git a/source/de/anomic/data/URLAnalysis.java b/source/de/anomic/data/URLAnalysis.java index d50db1fb2..b1f9d10d4 100644 --- a/source/de/anomic/data/URLAnalysis.java +++ b/source/de/anomic/data/URLAnalysis.java @@ -53,9 +53,9 @@ import java.util.zip.GZIPOutputStream; import net.yacy.kelondro.index.HandleMap; import net.yacy.kelondro.index.HandleSet; import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.rwi.ReferenceContainerArray; import de.anomic.kelondro.text.MetadataRepository; -import de.anomic.kelondro.text.ReferenceContainerArray; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.MetadataRepository.Export; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; diff --git a/source/de/anomic/kelondro/blob/ArrayStack.java b/source/de/anomic/kelondro/blob/ArrayStack.java index 079327d06..f6284a473 100755 --- a/source/de/anomic/kelondro/blob/ArrayStack.java +++ b/source/de/anomic/kelondro/blob/ArrayStack.java @@ -1,4 +1,4 @@ -// kelondroBLOBArray.java +// ArrayStack.java // (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 19.08.2008 on http://yacy.net // @@ -53,11 +53,11 @@ import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MergeIterator; import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.ReferenceFactory; +import net.yacy.kelondro.rwi.ReferenceIterator; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; -import de.anomic.kelondro.text.ReferenceFactory; -import de.anomic.kelondro.text.ReferenceContainerCache.blobFileEntries; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.NamePrefixThreadFactory; @@ -739,8 +739,8 @@ public class ArrayStack implements BLOB { private static File mergeWorker(ReferenceFactory factory, int keylength, ByteOrder order, File f1, File f2, Row payloadrow, File newFile, int writeBuffer) throws IOException { // iterate both files and write a new one - CloneableIterator> i1 = new blobFileEntries(f1, factory, payloadrow); - CloneableIterator> i2 = new blobFileEntries(f2, factory, payloadrow); + CloneableIterator> i1 = new ReferenceIterator(f1, factory, payloadrow); + CloneableIterator> i2 = new ReferenceIterator(f2, factory, payloadrow); if (!i1.hasNext()) { if (i2.hasNext()) { FileUtils.deletedelete(f1); diff --git a/source/de/anomic/kelondro/text/Metadata.java b/source/de/anomic/kelondro/text/Metadata.java index 0cb87886a..2f990428d 100644 --- a/source/de/anomic/kelondro/text/Metadata.java +++ b/source/de/anomic/kelondro/text/Metadata.java @@ -30,9 +30,9 @@ import java.util.Date; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.rwi.Reference; import de.anomic.crawler.retrieval.Request; -import de.anomic.kelondro.text.Reference; public interface Metadata { diff --git a/source/de/anomic/kelondro/text/ReferenceOrder.java b/source/de/anomic/kelondro/text/ReferenceOrder.java index 5f93840f1..aabc9a7dc 100644 --- a/source/de/anomic/kelondro/text/ReferenceOrder.java +++ b/source/de/anomic/kelondro/text/ReferenceOrder.java @@ -33,6 +33,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.rwi.ReferenceContainer; import de.anomic.document.Condenser; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/kelondro/text/Segment.java b/source/de/anomic/kelondro/text/Segment.java index 747e6001e..803e7d94d 100644 --- a/source/de/anomic/kelondro/text/Segment.java +++ b/source/de/anomic/kelondro/text/Segment.java @@ -37,6 +37,10 @@ import java.util.TreeSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.rwi.IODispatcher; +import net.yacy.kelondro.rwi.IndexCell; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.ReferenceFactory; import de.anomic.crawler.retrieval.Response; import de.anomic.data.Blacklist; diff --git a/source/de/anomic/kelondro/text/Segments.java b/source/de/anomic/kelondro/text/Segments.java index b8b19f970..2c1d7adab 100644 --- a/source/de/anomic/kelondro/text/Segments.java +++ b/source/de/anomic/kelondro/text/Segments.java @@ -33,6 +33,7 @@ import java.util.HashMap; import java.util.Iterator; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.rwi.IndexCell; import de.anomic.document.Condenser; import de.anomic.document.Document; diff --git a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java index a8a2d32da..0a96d05d4 100644 --- a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java +++ b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java @@ -31,7 +31,7 @@ import net.yacy.kelondro.index.Row; import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.MicroDate; -import de.anomic.kelondro.text.Reference; +import net.yacy.kelondro.rwi.Reference; import de.anomic.yacy.yacySeedDB; public final class CitationReferenceRow implements Reference /*, Cloneable*/ { diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java index 3cda99115..8834e6411 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReference.java @@ -27,7 +27,7 @@ package de.anomic.kelondro.text.navigationPrototype; import net.yacy.kelondro.index.Row.Entry; -import de.anomic.kelondro.text.Reference; +import net.yacy.kelondro.rwi.Reference; public interface NavigationReference extends Reference { diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java index 834afa27a..17d81a3d3 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceFactory.java @@ -26,8 +26,9 @@ package de.anomic.kelondro.text.navigationPrototype; +import net.yacy.kelondro.index.Row; import net.yacy.kelondro.index.Row.Entry; -import de.anomic.kelondro.text.ReferenceFactory; +import net.yacy.kelondro.rwi.ReferenceFactory; public class NavigationReferenceFactory implements ReferenceFactory { @@ -39,5 +40,9 @@ public class NavigationReferenceFactory implements ReferenceFactory { @@ -40,4 +41,8 @@ public class WordReferenceFactory implements ReferenceFactory { return new WordReferenceVars(r); } + public Row getRow() { + return WordReferenceRow.urlEntryRow; + } + } diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java index 54210d3c1..857405f39 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java @@ -32,9 +32,9 @@ import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.MicroDate; +import net.yacy.kelondro.rwi.AbstractReference; +import net.yacy.kelondro.rwi.Reference; import de.anomic.document.Word; -import de.anomic.kelondro.text.AbstractReference; -import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; /** diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java index 7d4a118b7..90df20bc1 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java @@ -33,10 +33,10 @@ import java.util.concurrent.LinkedBlockingQueue; import net.yacy.kelondro.index.Row.Entry; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.MicroDate; +import net.yacy.kelondro.rwi.AbstractReference; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; -import de.anomic.kelondro.text.AbstractReference; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; public class WordReferenceVars extends AbstractReference implements WordReference, Reference, Cloneable { diff --git a/source/de/anomic/search/RankingProcess.java b/source/de/anomic/search/RankingProcess.java index 71aba5cb3..7220fff8f 100644 --- a/source/de/anomic/search/RankingProcess.java +++ b/source/de/anomic/search/RankingProcess.java @@ -43,15 +43,15 @@ import java.util.concurrent.TimeUnit; import net.yacy.kelondro.index.BinSearch; import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.TermSearch; import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.document.parser.html.ContentScraper; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceOrder; import de.anomic.kelondro.text.Segment; -import de.anomic.kelondro.text.TermSearch; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.text.referencePrototype.WordReferenceVars; diff --git a/source/de/anomic/search/ResultEntry.java b/source/de/anomic/search/ResultEntry.java index c4968f2b5..cd133d6b3 100644 --- a/source/de/anomic/search/ResultEntry.java +++ b/source/de/anomic/search/ResultEntry.java @@ -31,10 +31,10 @@ import java.util.ArrayList; import java.util.Date; import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.rwi.Reference; import de.anomic.document.Condenser; import de.anomic.document.Word; -import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReferenceVars; diff --git a/source/de/anomic/search/SearchEvent.java b/source/de/anomic/search/SearchEvent.java index de24d842d..6054e9a07 100644 --- a/source/de/anomic/search/SearchEvent.java +++ b/source/de/anomic/search/SearchEvent.java @@ -35,9 +35,9 @@ import java.util.TreeSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.rwi.ReferenceContainer; import de.anomic.crawler.ResultURLs; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/search/blockrank/CRProcess.java b/source/de/anomic/search/blockrank/CRProcess.java index 4c73ffb00..1e7811cdb 100644 --- a/source/de/anomic/search/blockrank/CRProcess.java +++ b/source/de/anomic/search/blockrank/CRProcess.java @@ -37,10 +37,10 @@ import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.CloneableIterator; import net.yacy.kelondro.order.MicroDate; +import net.yacy.kelondro.rwi.IndexCell; +import net.yacy.kelondro.rwi.ReferenceContainer; import de.anomic.kelondro.table.Table; -import de.anomic.kelondro.text.IndexCell; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.util.DateFormatter; diff --git a/source/de/anomic/yacy/dht/Dispatcher.java b/source/de/anomic/yacy/dht/Dispatcher.java index ad003e99b..5ac69d2f9 100755 --- a/source/de/anomic/yacy/dht/Dispatcher.java +++ b/source/de/anomic/yacy/dht/Dispatcher.java @@ -34,8 +34,8 @@ import java.util.Map; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.rwi.ReferenceContainer; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; @@ -240,7 +240,7 @@ public class Dispatcher { for (ReferenceContainer container: containers) { // init the new partitions for (int j = 0; j < partitionBuffer.length; j++) { - partitionBuffer[j] = new ReferenceContainer(Segment.wordReferenceFactory, container.getTermHash(), container.row(), container.size() / partitionCount); + partitionBuffer[j] = new ReferenceContainer(Segment.wordReferenceFactory, container.getTermHash(), container.size() / partitionCount); } // split the container diff --git a/source/de/anomic/yacy/dht/Transmission.java b/source/de/anomic/yacy/dht/Transmission.java index 0aceab5f1..7669b1da3 100644 --- a/source/de/anomic/yacy/dht/Transmission.java +++ b/source/de/anomic/yacy/dht/Transmission.java @@ -32,9 +32,9 @@ import java.util.Iterator; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.ReferenceContainerCache; -import de.anomic.kelondro.text.ReferenceContainer; -import de.anomic.kelondro.text.ReferenceContainerCache; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 87aa303cb..fa8bc9152 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -58,6 +58,9 @@ import java.util.TreeMap; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Bitfield; import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; +import net.yacy.kelondro.rwi.ReferenceContainerCache; import org.apache.commons.httpclient.methods.multipart.ByteArrayPartSource; import org.apache.commons.httpclient.methods.multipart.Part; @@ -75,9 +78,6 @@ import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseContainer; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; -import de.anomic.kelondro.text.ReferenceContainerCache; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/kelondro/text/AbstractBufferedIndex.java b/source/net/yacy/kelondro/rwi/AbstractBufferedIndex.java similarity index 96% rename from source/de/anomic/kelondro/text/AbstractBufferedIndex.java rename to source/net/yacy/kelondro/rwi/AbstractBufferedIndex.java index bdc513d4d..0e31459e6 100644 --- a/source/de/anomic/kelondro/text/AbstractBufferedIndex.java +++ b/source/net/yacy/kelondro/rwi/AbstractBufferedIndex.java @@ -25,12 +25,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.IOException; import java.util.Iterator; import java.util.TreeSet; + import net.yacy.kelondro.order.Order; diff --git a/source/de/anomic/kelondro/text/AbstractIndex.java b/source/net/yacy/kelondro/rwi/AbstractIndex.java similarity index 99% rename from source/de/anomic/kelondro/text/AbstractIndex.java rename to source/net/yacy/kelondro/rwi/AbstractIndex.java index 6c942a0fd..aaab96379 100644 --- a/source/de/anomic/kelondro/text/AbstractIndex.java +++ b/source/net/yacy/kelondro/rwi/AbstractIndex.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.IOException; import java.util.HashMap; @@ -35,7 +35,6 @@ import java.util.TreeSet; import net.yacy.kelondro.order.Order; - public abstract class AbstractIndex implements Index { final protected ReferenceFactory factory; diff --git a/source/de/anomic/kelondro/text/AbstractReference.java b/source/net/yacy/kelondro/rwi/AbstractReference.java similarity index 98% rename from source/de/anomic/kelondro/text/AbstractReference.java rename to source/net/yacy/kelondro/rwi/AbstractReference.java index 826b60d1f..8d9e77495 100644 --- a/source/de/anomic/kelondro/text/AbstractReference.java +++ b/source/net/yacy/kelondro/rwi/AbstractReference.java @@ -24,10 +24,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.util.ArrayList; + public abstract class AbstractReference implements Reference { protected static ArrayList a(int i) { diff --git a/source/de/anomic/kelondro/text/BufferedIndex.java b/source/net/yacy/kelondro/rwi/BufferedIndex.java similarity index 98% rename from source/de/anomic/kelondro/text/BufferedIndex.java rename to source/net/yacy/kelondro/rwi/BufferedIndex.java index 01de3b262..cefc5f0a4 100644 --- a/source/de/anomic/kelondro/text/BufferedIndex.java +++ b/source/net/yacy/kelondro/rwi/BufferedIndex.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.IOException; import java.util.TreeSet; @@ -34,7 +34,7 @@ import net.yacy.kelondro.order.CloneableIterator; /* - * an IndexPackage is an integration of different index types, i.e. + * a BufferedIndex is an integration of different index types, i.e. * - ReferenceContainerArray * - ReferenceContainerCache * - IndexCache (which is a wrapper of a ReferenceContainerCache) diff --git a/source/de/anomic/kelondro/text/IODispatcher.java b/source/net/yacy/kelondro/rwi/IODispatcher.java similarity index 96% rename from source/de/anomic/kelondro/text/IODispatcher.java rename to source/net/yacy/kelondro/rwi/IODispatcher.java index a4300e09a..aa1413bd3 100644 --- a/source/de/anomic/kelondro/text/IODispatcher.java +++ b/source/net/yacy/kelondro/rwi/IODispatcher.java @@ -2,9 +2,9 @@ // (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 20.03.2009 on http://yacy.net // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.File; import java.io.IOException; diff --git a/source/de/anomic/kelondro/text/Index.java b/source/net/yacy/kelondro/rwi/Index.java similarity index 94% rename from source/de/anomic/kelondro/text/Index.java rename to source/net/yacy/kelondro/rwi/Index.java index a179c0221..096d45e90 100644 --- a/source/de/anomic/kelondro/text/Index.java +++ b/source/net/yacy/kelondro/rwi/Index.java @@ -5,9 +5,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:22:22 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6392 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -26,7 +26,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.IOException; import java.util.HashMap; diff --git a/source/de/anomic/kelondro/text/IndexCell.java b/source/net/yacy/kelondro/rwi/IndexCell.java similarity index 96% rename from source/de/anomic/kelondro/text/IndexCell.java rename to source/net/yacy/kelondro/rwi/IndexCell.java index 02b9c2051..9bd1e9fa4 100644 --- a/source/de/anomic/kelondro/text/IndexCell.java +++ b/source/net/yacy/kelondro/rwi/IndexCell.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.File; import java.io.IOException; @@ -242,7 +242,7 @@ public final class IndexCell extends AbstractBu public CloneableIterator> references(byte[] starttermHash, boolean rot) { final Order> containerOrder = new ReferenceContainerOrder(factory, this.ram.rowdef().getOrdering().clone()); - containerOrder.rotate(new ReferenceContainer(factory, starttermHash, this.ram.rowdef(), 0)); + containerOrder.rotate(new ReferenceContainer(factory, starttermHash, 0)); return new MergeIterator>( this.ram.references(starttermHash, rot), new MergeIterator>( @@ -258,7 +258,7 @@ public final class IndexCell extends AbstractBu public CloneableIterator> references(byte[] startTermHash, boolean rot, boolean ram) { final Order> containerOrder = new ReferenceContainerOrder(factory, this.ram.rowdef().getOrdering().clone()); - containerOrder.rotate(new ReferenceContainer(factory, startTermHash, this.ram.rowdef(), 0)); + containerOrder.rotate(new ReferenceContainer(factory, startTermHash, 0)); if (ram) { return this.ram.references(startTermHash, rot); } diff --git a/source/de/anomic/kelondro/text/IndexReader.java b/source/net/yacy/kelondro/rwi/IndexReader.java similarity index 88% rename from source/de/anomic/kelondro/text/IndexReader.java rename to source/net/yacy/kelondro/rwi/IndexReader.java index 38869fd0f..b8b340eea 100644 --- a/source/de/anomic/kelondro/text/IndexReader.java +++ b/source/net/yacy/kelondro/rwi/IndexReader.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:22:22 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6392 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.util.Set; diff --git a/source/de/anomic/kelondro/text/Reference.java b/source/net/yacy/kelondro/rwi/Reference.java similarity index 87% rename from source/de/anomic/kelondro/text/Reference.java rename to source/net/yacy/kelondro/rwi/Reference.java index 17a97889a..bec8b5452 100644 --- a/source/de/anomic/kelondro/text/Reference.java +++ b/source/net/yacy/kelondro/rwi/Reference.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import net.yacy.kelondro.index.Row.Entry; diff --git a/source/de/anomic/kelondro/text/ReferenceContainer.java b/source/net/yacy/kelondro/rwi/ReferenceContainer.java similarity index 95% rename from source/de/anomic/kelondro/text/ReferenceContainer.java rename to source/net/yacy/kelondro/rwi/ReferenceContainer.java index 3640e5558..934b67e3a 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainer.java +++ b/source/net/yacy/kelondro/rwi/ReferenceContainer.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.lang.reflect.Method; import java.util.Collection; @@ -39,7 +39,6 @@ import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; -import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; import de.anomic.kelondro.util.ByteBuffer; /** @@ -61,8 +60,8 @@ public class ReferenceContainer extends RowSet this.termHash = termHash; } - public ReferenceContainer(final ReferenceFactory factory, final byte[] termHash, final Row rowdef, final int objectCount) { - super(rowdef, objectCount); + public ReferenceContainer(final ReferenceFactory factory, final byte[] termHash, final int objectCount) { + super(factory.getRow(), objectCount); assert termHash == null || (termHash[2] != '@' && termHash.length == this.rowdef.primaryKeyLength); this.termHash = termHash; this.factory = factory; @@ -70,14 +69,14 @@ public class ReferenceContainer extends RowSet } public ReferenceContainer topLevelClone() { - final ReferenceContainer newContainer = new ReferenceContainer(this.factory, this.termHash, this.rowdef, this.size()); + final ReferenceContainer newContainer = new ReferenceContainer(this.factory, this.termHash, this.size()); newContainer.addAllUnique(this); return newContainer; } public static ReferenceContainer emptyContainer(final ReferenceFactory factory, final byte[] termHash, final int elementCount) { - assert termHash == null || (termHash[2] != '@' && termHash.length == WordReferenceRow.urlEntryRow.primaryKeyLength); - return new ReferenceContainer(factory, termHash, WordReferenceRow.urlEntryRow, elementCount); + assert termHash == null || (termHash[2] != '@' && termHash.length == factory.getRow().primaryKeyLength); + return new ReferenceContainer(factory, termHash, elementCount); } public void setWordHash(final byte[] newTermHash) { @@ -111,7 +110,7 @@ public class ReferenceContainer extends RowSet assert entry.toKelondroEntry().objectsize() == super.rowdef.objectsize; final Row.Entry r = super.replace(entry.toKelondroEntry()); if (r == null) return null; - return new WordReferenceRow(r); + return factory.produceSlow(r); } public void put(final Reference entry) { @@ -126,7 +125,7 @@ public class ReferenceContainer extends RowSet if (oldEntryRow == null) { return true; } - final Reference oldEntry = new WordReferenceRow(oldEntryRow); + final Reference oldEntry = factory.produceSlow(oldEntryRow); if (entry.isOlder(oldEntry)) { // A more recent Entry is already in this container this.replace(oldEntry.toKelondroEntry()); // put it back return false; @@ -351,7 +350,7 @@ public class ReferenceContainer extends RowSet assert small.rowdef.equals(large.rowdef) : "small = " + small.rowdef.toString() + "; large = " + large.rowdef.toString(); final int keylength = small.rowdef.width(0); assert (keylength == large.rowdef.width(0)); - final ReferenceContainer conj = new ReferenceContainer(factory, null, small.rowdef, 0); // start with empty search result + final ReferenceContainer conj = new ReferenceContainer(factory, null, 0); // start with empty search result final Iterator se = small.entries(); ReferenceType ie1; ReferenceType ie2; @@ -380,7 +379,7 @@ public class ReferenceContainer extends RowSet assert i1.rowdef.equals(i2.rowdef) : "i1 = " + i1.rowdef.toString() + "; i2 = " + i2.rowdef.toString(); final int keylength = i1.rowdef.width(0); assert (keylength == i2.rowdef.width(0)); - final ReferenceContainer conj = new ReferenceContainer(factory, null, i1.rowdef, 0); // start with empty search result + final ReferenceContainer conj = new ReferenceContainer(factory, null, 0); // start with empty search result if (!((i1.rowdef.getOrdering().signature().equals(i2.rowdef.getOrdering().signature())))) return conj; // ordering must be equal ByteOrder ordering = i1.rowdef.getOrdering(); final Iterator e1 = i1.entries(); diff --git a/source/de/anomic/kelondro/text/ReferenceContainerArray.java b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java similarity index 95% rename from source/de/anomic/kelondro/text/ReferenceContainerArray.java rename to source/net/yacy/kelondro/rwi/ReferenceContainerArray.java index 063b4b4cb..e85af2ef3 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerArray.java +++ b/source/net/yacy/kelondro/rwi/ReferenceContainerArray.java @@ -2,9 +2,9 @@ // (C) 2009 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 04.01.2009 on http://yacy.net // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.File; import java.io.IOException; @@ -321,7 +321,7 @@ public final class ReferenceContainerArray { if (f.length() < 22 || !f.startsWith("index") || !f.endsWith(".blob")) continue; File fl = new File(heapLocation, f); System.out.println("CELL REFERENCE COLLECTION opening blob " + fl); - CloneableIterator> ei = new ReferenceContainerCache.blobFileEntries(fl, factory, payloadrow); + CloneableIterator> ei = new ReferenceIterator(fl, factory, payloadrow); ReferenceContainer container; final long start = System.currentTimeMillis(); diff --git a/source/de/anomic/kelondro/text/ReferenceContainerCache.java b/source/net/yacy/kelondro/rwi/ReferenceContainerCache.java similarity index 83% rename from source/de/anomic/kelondro/text/ReferenceContainerCache.java rename to source/net/yacy/kelondro/rwi/ReferenceContainerCache.java index 61f380ec8..606533db0 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerCache.java +++ b/source/net/yacy/kelondro/rwi/ReferenceContainerCache.java @@ -1,12 +1,12 @@ -// indexContainerCache.java +// ReferenceContainerCache.java // (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 30.03.2008 on http://yacy.net // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.io.File; import java.io.IOException; @@ -36,13 +36,11 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import net.yacy.kelondro.index.Row; -import net.yacy.kelondro.index.RowSet; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.ByteOrder; import net.yacy.kelondro.order.CloneableIterator; -import de.anomic.kelondro.blob.HeapReader; import de.anomic.kelondro.blob.HeapWriter; import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.FileUtils; @@ -148,67 +146,7 @@ public final class ReferenceContainerCache exte return (this.cache == null) ? 0 : this.cache.size(); } - /** - * static iterator of BLOBHeap files: is used to import heap dumps into a write-enabled index heap - */ - public static class blobFileEntries implements CloneableIterator>, Iterable> { - HeapReader.entries blobs; - Row payloadrow; - File blobFile; - ReferenceFactory factory; - - public blobFileEntries(final File blobFile, ReferenceFactory factory, final Row payloadrow) throws IOException { - this.blobs = new HeapReader.entries(blobFile, payloadrow.primaryKeyLength); - this.payloadrow = payloadrow; - this.blobFile = blobFile; - this.factory = factory; - } - - public boolean hasNext() { - if (blobs == null) return false; - if (blobs.hasNext()) return true; - close(); - return false; - } - - /** - * return an index container - * because they may get very large, it is wise to deallocate some memory before calling next() - */ - public ReferenceContainer next() { - Map.Entry entry = blobs.next(); - byte[] payload = entry.getValue(); - return new ReferenceContainer(factory, entry.getKey().getBytes(), RowSet.importRowSet(payload, payloadrow)); - } - - public void remove() { - throw new UnsupportedOperationException("heap dumps are read-only"); - } - - public Iterator> iterator() { - return this; - } - - public void close() { - if (blobs != null) this.blobs.close(); - blobs = null; - } - - protected void finalize() { - this.close(); - } - - public CloneableIterator> clone(Object modifier) { - if (blobs != null) this.blobs.close(); - blobs = null; - try { - return new blobFileEntries(this.blobFile, factory, this.payloadrow); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - } + public int maxReferences() { // iterate to find the max score @@ -321,7 +259,7 @@ public final class ReferenceContainerCache exte if (urlselection == null) return c; if (c == null) return null; // because this is all in RAM, we must clone the entries (flat) - ReferenceContainer c1 = new ReferenceContainer(factory, c.getTermHash(), c.row(), c.size()); + ReferenceContainer c1 = new ReferenceContainer(factory, c.getTermHash(), c.size()); Iterator e = c.entries(); ReferenceType ee; while (e.hasNext()) { @@ -421,7 +359,7 @@ public final class ReferenceContainerCache exte // first access the cache without synchronization ReferenceContainer container = cache.remove(tha); - if (container == null) container = new ReferenceContainer(factory, termHash, this.payloadrow, 1); + if (container == null) container = new ReferenceContainer(factory, termHash, 1); container.put(newEntry); // synchronization: check if the entry is still empty and set new value diff --git a/source/de/anomic/kelondro/text/ReferenceContainerOrder.java b/source/net/yacy/kelondro/rwi/ReferenceContainerOrder.java similarity index 93% rename from source/de/anomic/kelondro/text/ReferenceContainerOrder.java rename to source/net/yacy/kelondro/rwi/ReferenceContainerOrder.java index ff2a47a89..06c0640d8 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerOrder.java +++ b/source/net/yacy/kelondro/rwi/ReferenceContainerOrder.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate$ -// $LastChangedRevision$ -// $LastChangedBy$ +// $LastChangedDate: 2009-10-10 01:22:22 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6392 $ +// $LastChangedBy: orbiter $ // // LICENSE // @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import net.yacy.kelondro.order.AbstractOrder; import net.yacy.kelondro.order.Order; diff --git a/source/de/anomic/kelondro/text/ReferenceFactory.java b/source/net/yacy/kelondro/rwi/ReferenceFactory.java similarity index 95% rename from source/de/anomic/kelondro/text/ReferenceFactory.java rename to source/net/yacy/kelondro/rwi/ReferenceFactory.java index 5d6b31e55..893e1adfd 100644 --- a/source/de/anomic/kelondro/text/ReferenceFactory.java +++ b/source/net/yacy/kelondro/rwi/ReferenceFactory.java @@ -24,11 +24,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import net.yacy.kelondro.index.Row; public interface ReferenceFactory { + + public Row getRow(); public ReferenceType produceSlow(Row.Entry e); diff --git a/source/net/yacy/kelondro/rwi/ReferenceIterator.java b/source/net/yacy/kelondro/rwi/ReferenceIterator.java new file mode 100644 index 000000000..3d50be4e9 --- /dev/null +++ b/source/net/yacy/kelondro/rwi/ReferenceIterator.java @@ -0,0 +1,99 @@ +// ReferenceIterator.java +// (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany +// first published 30.03.2008 on http://yacy.net +// +// This is a part of YaCy, a peer-to-peer based web search engine +// +// $LastChangedDate: 2009-10-10 01:32:08 +0200 (Sa, 10 Okt 2009) $ +// $LastChangedRevision: 6393 $ +// $LastChangedBy: orbiter $ +// +// LICENSE +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +package net.yacy.kelondro.rwi; + +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; + +import net.yacy.kelondro.index.Row; +import net.yacy.kelondro.index.RowSet; +import net.yacy.kelondro.order.CloneableIterator; +import de.anomic.kelondro.blob.HeapReader; + +/** + * iterator of BLOBHeap files: is used to import heap dumps into a write-enabled index heap + */ +public class ReferenceIterator implements CloneableIterator>, Iterable> { + HeapReader.entries blobs; + Row payloadrow; + File blobFile; + ReferenceFactory factory; + + public ReferenceIterator(final File blobFile, ReferenceFactory factory, final Row payloadrow) throws IOException { + this.blobs = new HeapReader.entries(blobFile, payloadrow.primaryKeyLength); + this.payloadrow = payloadrow; + this.blobFile = blobFile; + this.factory = factory; + } + + public boolean hasNext() { + if (blobs == null) return false; + if (blobs.hasNext()) return true; + close(); + return false; + } + + /** + * return an index container + * because they may get very large, it is wise to deallocate some memory before calling next() + */ + public ReferenceContainer next() { + Map.Entry entry = blobs.next(); + byte[] payload = entry.getValue(); + return new ReferenceContainer(factory, entry.getKey().getBytes(), RowSet.importRowSet(payload, payloadrow)); + } + + public void remove() { + throw new UnsupportedOperationException("heap dumps are read-only"); + } + + public Iterator> iterator() { + return this; + } + + public void close() { + if (blobs != null) this.blobs.close(); + blobs = null; + } + + protected void finalize() { + this.close(); + } + + public CloneableIterator> clone(Object modifier) { + if (blobs != null) this.blobs.close(); + blobs = null; + try { + return new ReferenceIterator(this.blobFile, factory, this.payloadrow); + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } +} \ No newline at end of file diff --git a/source/de/anomic/kelondro/text/TermSearch.java b/source/net/yacy/kelondro/rwi/TermSearch.java similarity index 98% rename from source/de/anomic/kelondro/text/TermSearch.java rename to source/net/yacy/kelondro/rwi/TermSearch.java index 75cd013f8..3adaccb8b 100644 --- a/source/de/anomic/kelondro/text/TermSearch.java +++ b/source/net/yacy/kelondro/rwi/TermSearch.java @@ -25,12 +25,13 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.text; +package net.yacy.kelondro.rwi; import java.util.HashMap; import java.util.Set; import java.util.TreeSet; + public class TermSearch { private ReferenceContainer joinResult; diff --git a/source/yacy.java b/source/yacy.java index 2aac6e1cd..9e035c49e 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -46,6 +46,8 @@ import java.util.zip.ZipOutputStream; import net.yacy.kelondro.index.RowCollection; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.rwi.Reference; +import net.yacy.kelondro.rwi.ReferenceContainer; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; @@ -57,8 +59,6 @@ import de.anomic.http.metadata.ResponseContainer; import de.anomic.http.server.HTTPDemon; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapDataMining; -import de.anomic.kelondro.text.Reference; -import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.MetadataRepository; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; @@ -183,11 +183,11 @@ public final class yacy { f = new File(homePath, "DATA/LOG/"); mkdirsIfNeseccary(f); f = new File(homePath, "DATA/LOG/yacy.logging"); - if (!f.exists()) try { + //if (!f.exists()) try { FileUtils.copy(new File(homePath, "yacy.logging"), f); - } catch (final IOException e){ - System.out.println("could not copy yacy.logging"); - } + //} catch (final IOException e){ + // System.out.println("could not copy yacy.logging"); + //} try{ Log.configureLogging(homePath, new File(homePath, "DATA/LOG/yacy.logging")); } catch (final IOException e) { diff --git a/yacy.logging b/yacy.logging index 895081eb7..3ef9edf01 100644 --- a/yacy.logging +++ b/yacy.logging @@ -32,30 +32,30 @@ java.awt.level = OFF # List of global handlers handlers = java.util.logging.FileHandler,\ - de.anomic.yacy.logging.GuiHandler,\ - de.anomic.yacy.logging.ConsoleOutErrHandler,\ - de.anomic.yacy.logging.LogalizerHandler + net.yacy.kelondro.logging.GuiHandler,\ + net.yacy.kelondro.logging.ConsoleOutErrHandler,\ + net.yacy.kelondro.logging.LogalizerHandler # Properties for the FileHandler java.util.logging.FileHandler.limit = 1048576 java.util.logging.FileHandler.count = 20 java.util.logging.FileHandler.pattern = DATA/LOG/yacy%u%g.log java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.formatter=de.anomic.yacy.logging.SimpleLogFormatter +java.util.logging.FileHandler.formatter=net.yacy.kelondro.logging.SimpleLogFormatter java.util.logging.FileHandler.encoding=UTF-8 # Properties for the GuiHandler -de.anomic.yacy.logging.GuiHandler.level = ALL -de.anomic.yacy.logging.GuiHandler.formatter=de.anomic.yacy.logging.SimpleLogFormatter -de.anomic.yacy.logging.GuiHandler.size = 400 +net.yacy.kelondro.logging.GuiHandler.level = ALL +net.yacy.kelondro.logging.GuiHandler.formatter=net.yacy.kelondro.logging.SimpleLogFormatter +net.yacy.kelondro.logging.GuiHandler.size = 400 # Properties for the ConsoleOutErrHandler -de.anomic.yacy.logging.ConsoleOutErrHandler.level = ALL -de.anomic.yacy.logging.ConsoleOutErrHandler.levelStdOut = ALL -de.anomic.yacy.logging.ConsoleOutErrHandler.levelSplit = WARNING -de.anomic.yacy.logging.ConsoleOutErrHandler.levelStdErr = ALL -de.anomic.yacy.logging.ConsoleOutErrHandler.formatter=de.anomic.yacy.logging.SimpleLogFormatter -#de.anomic.yacy.logging.ConsoleOutErrHandler.ignoreCtrlChr=true +net.yacy.kelondro.logging.ConsoleOutErrHandler.level = ALL +net.yacy.kelondro.logging.ConsoleOutErrHandler.levelStdOut = ALL +net.yacy.kelondro.logging.ConsoleOutErrHandler.levelSplit = WARNING +net.yacy.kelondro.logging.ConsoleOutErrHandler.levelStdErr = ALL +net.yacy.kelondro.logging.ConsoleOutErrHandler.formatter=net.yacy.kelondro.logging.SimpleLogFormatter +#net.yacy.kelondro.logging.ConsoleOutErrHandler.ignoreCtrlChr=true # Properties for the proxy access logger de.anomic.http.httpdProxyHandler.logging.enabled = TRUE @@ -64,6 +64,6 @@ de.anomic.http.httpdProxyHandler.logging.FileHandler.count = 20 de.anomic.http.httpdProxyHandler.logging.FileHandler.pattern = DATA/LOG/proxyAccess%u%g.log # Properties for the LogalizerHandler -de.anomic.yacy.logging.LogalizerHandler.enabled = false -de.anomic.yacy.logging.LogalizerHandler.debug = false -de.anomic.yacy.logging.LogalizerHandler.parserPackage = de.anomic.yacy.logging +net.yacy.kelondro.logging.LogalizerHandler.enabled = false +net.yacy.kelondro.logging.LogalizerHandler.debug = false +net.yacy.kelondro.logging.LogalizerHandler.parserPackage = net.yacy.kelondro.logging