refactoring

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6399 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 16 years ago
parent ce8dc575ca
commit e7f18ba24b

@ -48,9 +48,9 @@ import net.yacy.kelondro.util.kelondroException;
import de.anomic.crawler.retrieval.HTTPLoader;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
public class RobotsTxt {

@ -38,9 +38,9 @@ import net.yacy.kelondro.util.DateFormatter;
import de.anomic.crawler.Latency;
import de.anomic.document.Parser;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.net.ftpc;
import de.anomic.search.Segments;
import de.anomic.search.Switchboard;

@ -35,9 +35,9 @@ import de.anomic.crawler.Latency;
import de.anomic.data.Blacklist;
import de.anomic.document.Parser;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.Segments;
import de.anomic.search.Switchboard;

@ -43,9 +43,9 @@ import de.anomic.crawler.CrawlProfile;
import de.anomic.document.Document;
import de.anomic.document.ParserException;
import de.anomic.http.client.Cache;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.search.Segments;
import de.anomic.search.Switchboard;
import de.anomic.server.serverCore;

@ -34,9 +34,9 @@ import net.yacy.kelondro.util.DateFormatter;
import de.anomic.crawler.CrawlProfile;
import de.anomic.document.Classification;
import de.anomic.document.Parser;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.search.SwitchboardConstants;
public class Response {

@ -36,6 +36,7 @@ import javax.xml.parsers.SAXParserFactory;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.data.meta.URIMetadataRow;
import net.yacy.kelondro.io.ByteCountInputStream;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.DateFormatter;
@ -47,10 +48,9 @@ import de.anomic.crawler.CrawlProfile;
import de.anomic.crawler.retrieval.HTTPLoader;
import de.anomic.crawler.retrieval.Request;
import de.anomic.http.client.Client;
import de.anomic.http.io.ByteCountInputStream;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.Segments;
import de.anomic.search.Switchboard;

@ -44,7 +44,7 @@ import net.yacy.kelondro.order.NaturalOrder;
import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.kelondroException;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.RequestHeader;
public final class userDB {

@ -51,7 +51,7 @@ import de.anomic.document.parser.html.ContentScraper;
import de.anomic.document.parser.html.ImageEntry;
import de.anomic.http.client.Cache;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.server.serverCachedFileOutputStream;
import de.anomic.ymage.WebStructureGraph;

@ -54,8 +54,8 @@ import de.anomic.document.Document;
import de.anomic.document.parser.xml.ODContentHandler;
import de.anomic.document.parser.xml.ODMetaHandler;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.server.serverCharBuffer;
public class odtParser extends AbstractParser implements Idiom {

@ -54,8 +54,8 @@ import de.anomic.document.Document;
import de.anomic.document.parser.xml.ODContentHandler;
import de.anomic.document.parser.xml.ODMetaHandler;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.server.serverCharBuffer;
public class ooxmlParser extends AbstractParser implements Idiom {

@ -47,8 +47,8 @@ import de.anomic.document.Idiom;
import de.anomic.document.ParserException;
import de.anomic.document.Document;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
/**
* Vcard specification: http://www.imc.org/pdi/vcard-21.txt

@ -51,7 +51,7 @@ import net.yacy.kelondro.data.word.Word;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.order.Base64Order;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.ResponseHeader;
public final class Cache {

@ -63,10 +63,10 @@ import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import de.anomic.crawler.Latency;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.http.server.ResponseHeader;
/**
* HttpClient implementation which uses Jakarta Commons HttpClient 3.x {@link http://hc.apache.org/httpclient-3.x/}

@ -1,79 +0,0 @@
//httpBoundedSizeOutputStream.java
//-----------------------
//(C) by Michael Peter Christen; mc@yacy.net
//first published on http://www.anomic.de
//Frankfurt, Germany, 2004
//
// This file is contributed by Martin Thelian
// last major change: $LastChangedDate: 2006-08-16 21:49:31 +0200 (Mi, 16 Aug 2006) $ by $LastChangedBy: orbiter $
// Revision: $LastChangedRevision: 2414 $
//
//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 de.anomic.http.io;
import java.io.IOException;
import java.io.OutputStream;
public class BoundedSizeOutputStream extends ByteCountOutputStream {
protected final long maxSize;
public BoundedSizeOutputStream(final OutputStream outputStream, final long sizeLimit) {
this(outputStream,0,sizeLimit);
}
public BoundedSizeOutputStream(final OutputStream outputStream, final long initByteCount, final long sizeLimit) {
super(outputStream,initByteCount,null);
this.maxSize = sizeLimit;
}
public void write(final byte[] b) throws IOException {
if (this.byteCount + b.length > this.maxSize) {
// write out the rest until we have reached the limit
final long rest = this.maxSize-this.byteCount;
if (rest > 0) this.write(b, 0, (int)rest);
// throw an exception
throw new LimitExceededException("Limit exceeded",this.maxSize);
}
super.write(b);
}
public synchronized void write(final byte[] b, final int off, final int len) throws IOException {
if (this.byteCount + len > this.maxSize) {
// write out the rest until we reach the limit
final long rest = this.maxSize-this.byteCount;
if (rest > 0) this.write(b, 0, (int)rest);
// throw an exception
throw new LimitExceededException("Limit exceeded",this.maxSize);
}
super.write(b, off, len);
}
public synchronized void write(final int b) throws IOException {
if (this.byteCount + 1 > this.maxSize) {
// throw an exception
throw new LimitExceededException("Limit exceeded",this.maxSize);
}
super.write(b);
}
public long getSizeLimit() {
return this.maxSize;
}
}

@ -1,42 +0,0 @@
//httpdLimitExceededException.java
//-----------------------
//(C) by Michael Peter Christen; mc@yacy.net
//first published on http://www.anomic.de
//Frankfurt, Germany, 2004
//
// This file is contributed by Martin Thelian
// last major change: $LastChangedDate: 2006-08-16 21:49:31 +0200 (Mi, 16 Aug 2006) $ by $LastChangedBy: orbiter $
// Revision: $LastChangedRevision: 2414 $
//
//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 de.anomic.http.io;
import java.io.IOException;
public class LimitExceededException extends IOException {
private static final long serialVersionUID = 1L;
private final long limit;
public LimitExceededException(final String errorMsg, final long limit) {
super(errorMsg);
this.limit = limit;
}
public long getLimit() {
return this.limit;
}
}

@ -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.http.io;
package de.anomic.http.server;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@ -32,7 +32,6 @@ import java.io.InputStreamReader;
import net.yacy.kelondro.util.ByteBuffer;
import de.anomic.http.metadata.RequestHeader;
/**
* Some parts of this class code was copied from <a href="http://www.devdaily.com/java/jwarehouse/commons-httpclient-2.0/src/java/org/apache/commons/httpclient/ChunkedInputStream.shtml">Apache httpclient Project.</a>

@ -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.http.io;
package de.anomic.http.server;
import java.io.FilterOutputStream;
import java.io.IOException;

@ -92,10 +92,6 @@ import de.anomic.document.Classification;
import de.anomic.document.parser.htmlParser;
import de.anomic.document.parser.html.ContentScraper;
import de.anomic.document.parser.html.ScraperInputStream;
import de.anomic.http.io.ChunkedOutputStream;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.servlets.transferURL;
import de.anomic.search.Switchboard;
import de.anomic.search.SwitchboardConstants;

@ -72,6 +72,7 @@ import java.util.logging.Logger;
import java.util.zip.GZIPOutputStream;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.io.ByteCountOutputStream;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.Domains;
@ -88,12 +89,6 @@ import de.anomic.http.client.MultiOutputStream;
import de.anomic.http.client.Client;
import de.anomic.http.client.RemoteProxyConfig;
import de.anomic.http.client.Cache;
import de.anomic.http.io.ChunkedOutputStream;
import de.anomic.http.io.ByteCountOutputStream;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.search.Switchboard;
import de.anomic.search.SwitchboardConstants;
import de.anomic.server.serverCore;
@ -283,7 +278,7 @@ public final class HTTPDProxyHandler {
* @param conProp a collection of properties about the connection, like URL
* @param requestHeader The header lines of the connection from the request
* @param respond the OutputStream to the client
* @see de.anomic.http.httpdHandler#doGet(java.util.Properties, de.anomic.http.metadata.HeaderFramework, java.io.OutputStream)
* @see de.anomic.http.httpdHandler#doGet(java.util.Properties, de.anomic.http.server.HeaderFramework, java.io.OutputStream)
*/
public static void doGet(final Properties conProp, final RequestHeader requestHeader, final OutputStream respond) {
ByteCountOutputStream countedRespond = null;

@ -59,6 +59,7 @@ import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.Domains;
import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.MemoryControl;
import net.yacy.kelondro.util.MapTools;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
@ -72,11 +73,7 @@ import org.apache.commons.httpclient.ContentLengthInputStream;
import de.anomic.data.userDB;
import de.anomic.document.parser.html.CharacterCoding;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.search.Switchboard;
import de.anomic.server.serverCodings;
import de.anomic.server.serverCore;
import de.anomic.server.serverHandler;
import de.anomic.server.serverObjects;
@ -95,7 +92,7 @@ public final class HTTPDemon implements serverHandler, Cloneable {
/**
* <p><code>public static final String <strong>ADMIN_ACCOUNT_B64MD5</strong> = "adminAccountBase64MD5"</code></p>
* <p>Name of the setting holding the authentification hash for the static <code>admin</code>-account. It is calculated
* by first encoding <code>username:password</code> as Base64 and hashing it using {@link serverCodings#encodeMD5Hex(String)}.</p>
* by first encoding <code>username:password</code> as Base64 and hashing it using {@link MapTools#encodeMD5Hex(String)}.</p>
*/
public static final String ADMIN_ACCOUNT_B64MD5 = "adminAccountBase64MD5";

@ -33,7 +33,7 @@
instance of this class.
*/
package de.anomic.http.metadata;
package de.anomic.http.server;
import java.io.BufferedReader;
import java.io.File;
@ -53,7 +53,6 @@ import java.util.Vector;
import net.yacy.kelondro.data.meta.DigestURI;
import net.yacy.kelondro.util.DateFormatter;
import de.anomic.http.server.HTTPDemon;
public class HeaderFramework extends TreeMap<String, String> implements Map<String, String> {

@ -21,7 +21,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.http.metadata;
package de.anomic.http.server;
import java.io.IOException;
import java.net.MalformedURLException;
@ -33,7 +33,6 @@ import java.util.Properties;
import net.yacy.kelondro.util.DateFormatter;
import de.anomic.http.server.HTTPDemon;
import de.anomic.server.serverCore;
public class RequestHeader extends HeaderFramework {

@ -24,19 +24,19 @@
// 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.http.metadata;
package de.anomic.http.server;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.GZIPInputStream;
import net.yacy.kelondro.io.ByteCountInputStream;
import net.yacy.kelondro.util.FileUtils;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
import de.anomic.http.client.ConnectionInfo;
import de.anomic.http.io.ByteCountInputStream;
/**
* container for http-response data

@ -21,7 +21,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.http.metadata;
package de.anomic.http.server;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;

@ -33,9 +33,6 @@ import java.util.Properties;
import net.yacy.kelondro.util.ByteBuffer;
import de.anomic.http.io.ChunkedOutputStream;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
public class ServerSideIncludes {

@ -11,7 +11,7 @@ import net.yacy.kelondro.util.DateFormatter;
import de.anomic.content.RSSMessage;
import de.anomic.data.Blacklist;
import de.anomic.document.parser.xml.RSSFeed;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.RequestHeader;
import de.anomic.search.Segments;
import de.anomic.search.Switchboard;
import de.anomic.server.serverCore;

@ -54,7 +54,7 @@ import de.anomic.data.Blacklist;
import de.anomic.document.parser.html.CharacterCoding;
import de.anomic.http.client.Client;
import de.anomic.http.client.RemoteProxyConfig;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.ResponseContainer;
public final class MetadataRepository implements Iterable<byte[]> {

@ -169,10 +169,10 @@ import de.anomic.document.parser.xml.RSSFeed;
import de.anomic.http.client.Client;
import de.anomic.http.client.RemoteProxyConfig;
import de.anomic.http.client.Cache;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.HTTPDemon;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.http.server.RobotsTxtConfig;
import de.anomic.net.UPnP;
import de.anomic.search.blockrank.CRDistribution;

@ -50,7 +50,7 @@ import de.anomic.document.Document;
import de.anomic.document.ParserException;
import de.anomic.document.parser.html.CharacterCoding;
import de.anomic.http.client.Cache;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.ResponseHeader;
import de.anomic.yacy.yacySearch;
public class TextSnippet {

@ -21,7 +21,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US
package de.anomic.server;
import de.anomic.http.metadata.ResponseHeader;
import de.anomic.http.server.ResponseHeader;
public class servletProperties extends serverObjects {

@ -28,8 +28,8 @@ import net.yacy.kelondro.data.meta.DigestURI;
import de.anomic.crawler.retrieval.HTTPLoader;
import de.anomic.http.client.Client;
import de.anomic.http.client.RemoteProxyConfig;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
public class loaderThreads {

@ -79,9 +79,9 @@ import de.anomic.http.client.DefaultCharsetFilePart;
import de.anomic.http.client.DefaultCharsetStringPart;
import de.anomic.http.client.Client;
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.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.RankingProfile;
import de.anomic.search.RankingProcess;
import de.anomic.search.Segment;

@ -56,8 +56,8 @@ import net.yacy.kelondro.table.Table;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.kelondroException;
import net.yacy.kelondro.util.MapTools;
import de.anomic.server.serverCodings;
public class yacyNewsDB {
@ -148,7 +148,7 @@ public class yacyNewsDB {
b.getColString(1, "UTF-8"),
(b.empty(2)) ? null : DateFormatter.parseShortSecond(b.getColString(2, null), DateFormatter.UTCDiffString()),
(int) b.getColLong(3),
serverCodings.string2map(b.getColString(4, "UTF-8"), ",")
MapTools.string2map(b.getColString(4, "UTF-8"), ",")
);
}

@ -55,8 +55,8 @@ import net.yacy.kelondro.data.word.Word;
import net.yacy.kelondro.index.Row;
import net.yacy.kelondro.order.NaturalOrder;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.MapTools;
import de.anomic.server.serverCodings;
public class yacyNewsRecord {
@ -130,7 +130,7 @@ public class yacyNewsRecord {
}
public yacyNewsRecord(final String newsString) {
this.attributes = serverCodings.string2map(newsString, ",");
this.attributes = MapTools.string2map(newsString, ",");
if (attributes.toString().length() > attributesMaxLength) throw new IllegalArgumentException("attributes length (" + attributes.toString().length() + ") exceeds maximum (" + attributesMaxLength + ")");
this.category = (attributes.containsKey("cat")) ? attributes.get("cat") : "";
if (category.length() > categoryStringLength) throw new IllegalArgumentException("category length (" + category.length() + ") exceeds maximum (" + categoryStringLength + ")");

@ -29,10 +29,10 @@ import java.util.HashMap;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.MapTools;
import de.anomic.content.RSSMessage;
import de.anomic.document.parser.xml.RSSFeed;
import de.anomic.server.serverCodings;
public class yacyPeerActions {
@ -231,8 +231,8 @@ public class yacyPeerActions {
final yacyNewsRecord record = yacyNewsRecord.newRecord(decodedString);
if (record != null) {
//System.out.println("### news arrival from peer " + peer.getName() + ", decoded=" + decodedString + ", record=" + recordString + ", news=" + record.toString());
final String cre1 = serverCodings.string2map(decodedString, ",").get("cre");
final String cre2 = serverCodings.string2map(record.toString(), ",").get("cre");
final String cre1 = MapTools.string2map(decodedString, ",").get("cre");
final String cre2 = MapTools.string2map(record.toString(), ",").get("cre");
if ((cre1 == null) || (cre2 == null) || (!(cre1.equals(cre2)))) {
System.out.println("### ERROR - cre are not equal: cre1=" + cre1 + ", cre2=" + cre2);
return;

@ -53,9 +53,9 @@ import de.anomic.crawler.CrawlProfile;
import de.anomic.crawler.retrieval.HTTPLoader;
import de.anomic.document.parser.html.ContentScraper;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.Switchboard;
import de.anomic.server.serverCharBuffer;
import de.anomic.server.serverCore;

@ -60,9 +60,9 @@ import net.yacy.kelondro.data.word.Word;
import net.yacy.kelondro.order.Base64Order;
import net.yacy.kelondro.order.Digest;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.MapTools;
import de.anomic.net.natLib;
import de.anomic.server.serverCodings;
import de.anomic.tools.bitfield;
import de.anomic.tools.crypt;
import de.anomic.yacy.dht.FlatWordPartitionScheme;
@ -563,17 +563,17 @@ public class yacySeed implements Cloneable {
}
public void setPeerTags(final Set<String> keys) {
dna.put(PEERTAGS, serverCodings.set2string(keys, "|", false));
dna.put(PEERTAGS, MapTools.set2string(keys, "|", false));
}
public Set<String> getPeerTags() {
return serverCodings.string2set(get(PEERTAGS, "*"), "|");
return MapTools.string2set(get(PEERTAGS, "*"), "|");
}
public boolean matchPeerTags(final TreeSet<byte[]> searchHashes) {
final String peertags = get(PEERTAGS, "");
if (peertags.equals("*")) return true;
final Set<String> tags = serverCodings.string2set(peertags, "|");
final Set<String> tags = MapTools.string2set(peertags, "|");
final Iterator<String> i = tags.iterator();
while (i.hasNext()) {
if (searchHashes.contains(Word.word2hash(i.next()))) return true;
@ -765,7 +765,7 @@ public class yacySeed implements Cloneable {
if (seed == null) { return null; }
// extract hash
final HashMap<String, String> dna = serverCodings.string2map(seed, ",");
final HashMap<String, String> dna = MapTools.string2map(seed, ",");
final String hash = dna.remove(yacySeed.HASH);
if (hash == null) return null;
final yacySeed resultSeed = new yacySeed(hash, dna);
@ -836,7 +836,7 @@ public class yacySeed implements Cloneable {
HashMap<String, String> copymap = new HashMap<String, String>();
copymap.putAll(this.dna);
copymap.put(yacySeed.HASH, this.hash); // set hash into seed code structure
return serverCodings.map2string(copymap, ",", true); // generate string representation
return MapTools.map2string(copymap, ",", true); // generate string representation
}
public final String genSeedStr(final String key) {

@ -50,11 +50,11 @@ import net.yacy.kelondro.util.kelondroException;
import de.anomic.crawler.retrieval.HTTPLoader;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.HeaderFramework;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HTTPDemon;
import de.anomic.http.server.AlternativeDomainNames;
import de.anomic.http.server.HeaderFramework;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.Switchboard;
import de.anomic.server.serverCore;
import de.anomic.server.serverSwitch;

@ -43,11 +43,11 @@ import net.yacy.kelondro.order.NaturalOrder;
import net.yacy.kelondro.util.DateFormatter;
import net.yacy.kelondro.util.FileUtils;
import net.yacy.kelondro.util.kelondroException;
import net.yacy.kelondro.util.MapTools;
import de.anomic.crawler.retrieval.Request;
import de.anomic.search.QueryParams;
import de.anomic.server.serverCharBuffer;
import de.anomic.server.serverCodings;
import de.anomic.tools.crypt;
public class URIMetadataRow implements URIMetadata {
@ -295,7 +295,7 @@ public class URIMetadataRow implements URIMetadata {
return null;
}
try {
return new URIMetadataRow(serverCodings.s2p(propStr.substring(1, propStr.length() - 1)));
return new URIMetadataRow(MapTools.s2p(propStr.substring(1, propStr.length() - 1)));
} catch (final kelondroException e) {
// wrong format
return null;

@ -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.http.io;
package net.yacy.kelondro.io;
import java.io.FilterInputStream;
import java.io.IOException;

@ -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.http.io;
package net.yacy.kelondro.io;
import java.io.BufferedOutputStream;
import java.io.IOException;

@ -23,7 +23,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.server;
package net.yacy.kelondro.util;
import java.util.Collections;
import java.util.ConcurrentModificationException;
@ -36,7 +36,7 @@ import java.util.Set;
import java.util.StringTokenizer;
import java.util.Map.Entry;
public final class serverCodings {
public final class MapTools {
public static Properties s2p(final String s) {
final Properties p = new Properties();

@ -64,9 +64,9 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import de.anomic.data.translator;
import de.anomic.http.client.Client;
import de.anomic.http.metadata.RequestHeader;
import de.anomic.http.metadata.ResponseContainer;
import de.anomic.http.server.HTTPDemon;
import de.anomic.http.server.RequestHeader;
import de.anomic.http.server.ResponseContainer;
import de.anomic.search.MetadataRepository;
import de.anomic.search.Segment;
import de.anomic.search.Switchboard;

Loading…
Cancel
Save