From efcd95dc37492fe701c8aad76a2c1e96fd97768c Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 6 Mar 2009 15:53:20 +0000 Subject: [PATCH] simplification of (internal) query process / refactoring git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5671 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/AccessTracker_p.java | 2 +- htroot/Blog.java | 2 +- htroot/Bookmarks.java | 2 +- htroot/Connections_p.java | 2 +- htroot/CookieMonitorIncoming_p.java | 2 +- htroot/CookieMonitorOutgoing_p.java | 2 +- htroot/IndexControlURLs_p.java | 2 +- htroot/IndexImport_p.java | 2 +- htroot/Messages_p.java | 2 +- htroot/Network.java | 2 +- htroot/News.java | 2 +- htroot/SettingsAck_p.java | 2 +- htroot/Status.java | 2 +- htroot/Supporter.java | 2 +- htroot/Surftips.java | 2 +- htroot/api/bookmarks/get_bookmarks.java | 2 +- htroot/api/bookmarks/posts/all.java | 2 +- htroot/api/bookmarks/posts/get.java | 2 +- htroot/api/bookmarks/xbel/xbel.java | 2 +- htroot/cytag.java | 2 +- htroot/favicon.ico | Bin 1150 -> 822 bytes htroot/rct_p.java | 2 +- htroot/yacy/query.java | 2 +- htroot/yacy/transferURL.java | 2 +- htroot/yacy/urls.java | 2 +- source/de/anomic/crawler/CrawlQueues.java | 2 +- source/de/anomic/crawler/FTPLoader.java | 2 +- source/de/anomic/crawler/IndexingStack.java | 2 +- source/de/anomic/crawler/RobotsTxt.java | 2 +- source/de/anomic/data/SitemapParser.java | 2 +- source/de/anomic/data/blogBoard.java | 2 +- source/de/anomic/data/bookmarksDB.java | 2 +- source/de/anomic/http/httpHeader.java | 2 +- source/de/anomic/http/httpRequestHeader.java | 2 +- source/de/anomic/http/httpd.java | 2 +- source/de/anomic/http/httpdFileHandler.java | 2 +- .../de/anomic/http/httpdProxyCacheEntry.java | 2 +- source/de/anomic/http/httpdProxyHandler.java | 2 +- source/de/anomic/icap/icapd.java | 2 +- source/de/anomic/kelondro/blob/BLOBArray.java | 2 +- source/de/anomic/kelondro/blob/MapView.java | 2 +- .../kelondro/text/MetadataRowContainer.java | 2 +- .../{order => util}/DateFormatter.java | 2 +- source/de/anomic/plasma/plasmaDbImporter.java | 2 +- .../anomic/plasma/plasmaRankingCRProcess.java | 2 +- source/de/anomic/plasma/plasmaSearchAPI.java | 2 +- .../de/anomic/plasma/plasmaSearchImages.java | 2 +- source/de/anomic/plasma/plasmaSwitchboard.java | 2 +- .../de/anomic/plasma/plasmaWebStructure.java | 2 +- source/de/anomic/server/serverObjects.java | 2 +- source/de/anomic/yacy/dht/PeerSelection.java | 2 +- source/de/anomic/yacy/yacyCore.java | 2 +- source/de/anomic/yacy/yacyNetwork.java | 2 +- source/de/anomic/yacy/yacyNewsDB.java | 2 +- source/de/anomic/yacy/yacyNewsQueue.java | 2 +- source/de/anomic/yacy/yacyNewsRecord.java | 2 +- source/de/anomic/yacy/yacyPeerActions.java | 2 +- source/de/anomic/yacy/yacySeed.java | 2 +- source/yacy.java | 2 +- 59 files changed, 58 insertions(+), 58 deletions(-) rename source/de/anomic/kelondro/{order => util}/DateFormatter.java (97%) diff --git a/htroot/AccessTracker_p.java b/htroot/AccessTracker_p.java index 799f77ab3..6870cdc20 100644 --- a/htroot/AccessTracker_p.java +++ b/htroot/AccessTracker_p.java @@ -35,7 +35,7 @@ import java.util.TreeSet; import java.util.Map.Entry; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.net.natLib; import de.anomic.plasma.plasmaSearchQuery; import de.anomic.plasma.plasmaSwitchboard; diff --git a/htroot/Blog.java b/htroot/Blog.java index 5879370ad..c6760f957 100644 --- a/htroot/Blog.java +++ b/htroot/Blog.java @@ -37,7 +37,7 @@ import java.util.Iterator; import de.anomic.data.blogBoard; import de.anomic.data.userDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java index 9acbe4dfa..ef509ac1d 100644 --- a/htroot/Bookmarks.java +++ b/htroot/Bookmarks.java @@ -41,9 +41,9 @@ import de.anomic.data.listManager; import de.anomic.data.userDB; import de.anomic.data.bookmarksDB.Tag; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.Log; import de.anomic.plasma.plasmaParserDocument; import de.anomic.plasma.plasmaSnippetCache; diff --git a/htroot/Connections_p.java b/htroot/Connections_p.java index e8a883f6c..c14cc2e99 100644 --- a/htroot/Connections_p.java +++ b/htroot/Connections_p.java @@ -37,7 +37,7 @@ import de.anomic.http.HttpConnectionInfo; import de.anomic.http.httpClient; import de.anomic.http.httpRequestHeader; import de.anomic.http.httpd; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; import de.anomic.server.serverHandler; diff --git a/htroot/CookieMonitorIncoming_p.java b/htroot/CookieMonitorIncoming_p.java index 33d9376c2..945b516ab 100644 --- a/htroot/CookieMonitorIncoming_p.java +++ b/htroot/CookieMonitorIncoming_p.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/CookieMonitorOutgoing_p.java b/htroot/CookieMonitorOutgoing_p.java index 3fbe652fa..d3b6c2dfd 100644 --- a/htroot/CookieMonitorOutgoing_p.java +++ b/htroot/CookieMonitorOutgoing_p.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.Map; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index 917d7d51a..1da46f785 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -32,11 +32,11 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.RotateIterator; import de.anomic.kelondro.text.MetadataRowContainer; import de.anomic.kelondro.text.URLMetadata; import de.anomic.kelondro.text.MetadataRepository; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexImport_p.java b/htroot/IndexImport_p.java index 5a5be1fd2..51dade8ca 100644 --- a/htroot/IndexImport_p.java +++ b/htroot/IndexImport_p.java @@ -35,8 +35,8 @@ import java.util.Date; import de.anomic.crawler.Importer; import de.anomic.crawler.NoticeURLImporter; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.util.ByteBuffer; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Messages_p.java b/htroot/Messages_p.java index ab477538d..9f4f58696 100644 --- a/htroot/Messages_p.java +++ b/htroot/Messages_p.java @@ -34,7 +34,7 @@ import java.util.TreeMap; import de.anomic.data.messageBoard; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/Network.java b/htroot/Network.java index 80b2838c6..c2baf1992 100644 --- a/htroot/Network.java +++ b/htroot/Network.java @@ -38,7 +38,7 @@ import java.util.regex.PatternSyntaxException; import de.anomic.crawler.HTTPLoader; import de.anomic.http.httpClient; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverCodings; diff --git a/htroot/News.java b/htroot/News.java index 29adeaabf..d34d98749 100644 --- a/htroot/News.java +++ b/htroot/News.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Map.Entry; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 1c655d747..5848d25ce 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -43,8 +43,8 @@ import de.anomic.http.httpRemoteProxyConfig; import de.anomic.http.httpd; import de.anomic.http.httpdProxyHandler; import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaParser; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverCore; diff --git a/htroot/Status.java b/htroot/Status.java index 72f217aaf..357b15a82 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -33,7 +33,7 @@ import de.anomic.http.httpRequestHeader; import de.anomic.http.httpd; import de.anomic.http.httpdByteCountInputStream; import de.anomic.http.httpdByteCountOutputStream; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.MemoryControl; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaSwitchboardConstants; diff --git a/htroot/Supporter.java b/htroot/Supporter.java index 2ad55e505..208f21ae2 100644 --- a/htroot/Supporter.java +++ b/htroot/Supporter.java @@ -34,9 +34,9 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index c17716266..d48743578 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -34,9 +34,9 @@ import java.util.Iterator; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Blacklist; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/api/bookmarks/get_bookmarks.java b/htroot/api/bookmarks/get_bookmarks.java index 2f7e49282..5fedd7025 100644 --- a/htroot/api/bookmarks/get_bookmarks.java +++ b/htroot/api/bookmarks/get_bookmarks.java @@ -7,7 +7,7 @@ import de.anomic.data.bookmarksDB; import de.anomic.data.userDB; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/all.java b/htroot/api/bookmarks/posts/all.java index 80538336f..7d0ef1714 100755 --- a/htroot/api/bookmarks/posts/all.java +++ b/htroot/api/bookmarks/posts/all.java @@ -4,8 +4,8 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/get.java b/htroot/api/bookmarks/posts/get.java index 8138c9ac2..c52b9c805 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/htroot/api/bookmarks/posts/get.java @@ -7,8 +7,8 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; import de.anomic.kelondro.order.Digest; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/xbel/xbel.java b/htroot/api/bookmarks/xbel/xbel.java index 676b259cb..7b1174e64 100755 --- a/htroot/api/bookmarks/xbel/xbel.java +++ b/htroot/api/bookmarks/xbel/xbel.java @@ -6,7 +6,7 @@ import java.util.Iterator; import de.anomic.data.bookmarksDB; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/cytag.java b/htroot/cytag.java index ce382b8b4..2bb7d3929 100644 --- a/htroot/cytag.java +++ b/htroot/cytag.java @@ -32,7 +32,7 @@ import java.util.Date; import de.anomic.htmlFilter.htmlFilterCharacterCoding; import de.anomic.http.httpRequestHeader; -import de.anomic.kelondro.order.DateFormatter; +import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; diff --git a/htroot/favicon.ico b/htroot/favicon.ico index 35c4a8f8905e0fe1de65c0d81fa29716d2a997f2..857c245fea28907716ee0519955c7ba2a44fd3e6 100644 GIT binary patch literal 822 zcmZ{hA#8*&7=>A8rWPdj+>kSuU?-cLLCzwPNbE`E$+Jl0N!)U>5?NbWS;@ZRXAPk@ z@|QG!-+TXi?bqq}nk?Uu{|75w*GrNu{e<(McUjU%5^GJ@)McKjJlz(Z%emn+u38m( zI9T283d%V2F&=$qhk5q9LIg^TA8$j~C}*xxvo}IC_wp$oh412E#!|}Jo8ax#kto)u zLj-5~ogav`%KyU?_JQ{XS1Zw5eBw5y5P2Gv;C25N2I(Q?D8@@_K5B{G}9 zVj`5bD!0a*b9A6cA^T9)-D=ESx!bl`VyHy^ E1!_V+D*ylh literal 1150 zcmaKrAyC6W5Jj&80!I{sgE}gaQA})PB({c`$jX?C%19)(E|Ha)0aF^F*({k>N&mrC6zr5-G7$yUDW_7eP*t6Z|ht)z?S2-IIU zD+!YAL7v9a)^pKqaS~`W^){$Mf1_&=8BPLiG(s~pyIRUsDyDz)kfHZl{XRR(*SeSI zcrJaDc^JL(eBG5}E}{O^$-wkm&zX8bD^C|fpO6N8@*8<}cD#6vL683M8RC;+*QB1` zZm)j%HrKX}tVSN>y9`~=u8CzZo!3B{8AJW?hDWipqS3eZolf$=8yScA)Y(6mJO0sd z^ROTALC6PZE<