cleaned up classes and methods which are either superfluous at this time

or will be superfluous or subject of complete redesign after the
migration to solr. Removing these things now will make the transition to
solr more simple.

6 files changed, 0 insertions, 227 deletions

diff --git a/htroot/IndexCleaner_p.java b/htroot/IndexCleaner_p.java
deleted file mode 100644
index c30ea0e7c..000000000
--- a/htroot/IndexCleaner_p.java
+++ /dev/null
@@ -1,108 +0,0 @@
-//-----------------------

-//part of the AnomicHTTPD caching proxy

-//(C) by Michael Peter Christen; mc@yacy.net

-//first published on http://www.anomic.de

-//Frankfurt, Germany, 2005

-//

-//This file is contributed by Matthias Soehnholz

-//

-// $LastChangedDate$

-// $LastChangedRevision$

-// $LastChangedBy$

-//

-//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

-

-import net.yacy.cora.document.ASCII;

-import net.yacy.cora.protocol.RequestHeader;

-import net.yacy.search.Switchboard;

-import net.yacy.search.index.MetadataRepository;

-import net.yacy.search.index.Segment;

-import de.anomic.server.serverObjects;

-import de.anomic.server.serverSwitch;

-

-public class IndexCleaner_p {

-    private static MetadataRepository.BlacklistCleaner urldbCleanerThread = null;

-    private static Segment.ReferenceCleaner indexCleanerThread = null;

-

-    public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {

-        final serverObjects prop = new serverObjects();

-        final Switchboard sb = (Switchboard) env;

-        prop.put("title", "DbCleanup_p");

-

-        // get segment

-        Segment indexSegment = sb.index;

-

-        if (post!=null) {

-            if (post.get("action").equals("ustart")) {

-                if (urldbCleanerThread==null || !urldbCleanerThread.isAlive()) {

-                    urldbCleanerThread = indexSegment.urlMetadata().getBlacklistCleaner(Switchboard.urlBlacklist, sb.crawlStacker);

-                    urldbCleanerThread.start();

-                }

-                else {

-                    urldbCleanerThread.endPause();

-                }

-            }

-            else if (post.get("action").equals("ustop") && (urldbCleanerThread!=null)) {

-                urldbCleanerThread.abort();

-            }

-            else if (post.get("action").equals("upause") && (urldbCleanerThread!=null)) {

-                urldbCleanerThread.pause();

-            }

-            else if (post.get("action").equals("rstart")) {

-                if (indexCleanerThread==null || !indexCleanerThread.isAlive()) {

-                    indexCleanerThread = indexSegment.getReferenceCleaner(post.get("wordHash","AAAAAAAAAAAA").getBytes());

-                    indexCleanerThread.start();

-                }

-                else {

-                    indexCleanerThread.endPause();

-                }

-            }

-            else if (post.get("action").equals("rstop") && (indexCleanerThread!=null)) {

-                indexCleanerThread.abort();

-            }

-            else if (post.get("action").equals("rpause") && (indexCleanerThread!=null)) {

-                indexCleanerThread.pause();

-            }

-            prop.put("LOCATION","");

-            return prop;

-        }

-        if (urldbCleanerThread!=null) {

-            prop.put("urldb", "1");

-            prop.putNum("urldb_percentUrls", ((double)urldbCleanerThread.totalSearchedUrls/indexSegment.urlMetadata().size())*100);

-            prop.putNum("urldb_blacklisted", urldbCleanerThread.blacklistedUrls);

-            prop.putNum("urldb_total", urldbCleanerThread.totalSearchedUrls);

-            prop.putHTML("urldb_lastBlacklistedUrl", urldbCleanerThread.lastBlacklistedUrl);

-            prop.put("urldb_lastBlacklistedHash", urldbCleanerThread.lastBlacklistedHash);

-            prop.putHTML("urldb_lastUrl", urldbCleanerThread.lastUrl);

-            prop.put("urldb_lastHash", urldbCleanerThread.lastHash);

-            prop.put("urldb_threadAlive", Boolean.toString(urldbCleanerThread.isAlive()));

-            prop.put("urldb_threadToString", urldbCleanerThread.toString());

-            final double percent = ((double)urldbCleanerThread.blacklistedUrls/urldbCleanerThread.totalSearchedUrls)*100;

-            prop.putNum("urldb_percent", percent);

-        }

-        if (indexCleanerThread!=null) {

-            prop.put("rwidb", "1");

-            prop.put("rwidb_threadAlive", Boolean.toString(indexCleanerThread.isAlive()));

-            prop.put("rwidb_threadToString", indexCleanerThread.toString());

-            prop.putNum("rwidb_RWIcountstart", indexCleanerThread.rwiCountAtStart);

-            prop.putNum("rwidb_RWIcountnow", indexCleanerThread.rwisize());

-            prop.put("rwidb_wordHashNow", (indexCleanerThread.wordHashNow == null) ? "NULL" : ASCII.String(indexCleanerThread.wordHashNow));

-            prop.put("rwidb_lastWordHash", (indexCleanerThread.lastWordHash == null) ? "null" : ASCII.String(indexCleanerThread.lastWordHash));

-            prop.putNum("rwidb_lastDeletionCounter", indexCleanerThread.lastDeletionCounter);

-

-        }

-        return prop;

-    }

-}

diff --git a/htroot/IndexControlCleaner_p.html b/htroot/IndexControlCleaner_p.html
deleted file mode 100644
index 7ef61758d..000000000
--- a/htroot/IndexControlCleaner_p.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>YaCy '#[clientname]#': Index Cleaner</title>
-    #%env/templates/metas.template%#
-  </head>
-  <body id="IndexControlCleaner">
-  <div id="fullcontent">
-  	#(inline)##%env/templates/header.template%#
-    
-    <h2>Steering of API Actions</h2>
-    <p>This table shows search results that had been sorted out from the search result display because their content had not been verified.
-    This means that the searched word does not appear on the search page.
-    </p>::#(/inline)#
-    #(showtable)#::
-    <form action="IndexControlCleaner_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8" id="cleanerlist">
-      <fieldset>
-      <legend><label for="apilist">Recorded Actions</label></legend>
-      <p><span id="resCounter" style="display: inline;">
-      #(navigation)#
-      ::
-      #(left)#<img src="env/grafics/navdl.gif" alt="no previous page" />::<a href="Table_API_p.html?startRecord=#[startRecord]#&amp;maximumRecords=#[maximumRecords]#&amp;inline=#(inline)#false::true#(/inline)#&amp;filter=#[filter]#" target="_self"><img src="env/grafics/navsl.gif" alt="previous page" /></a>#(/left)#
-      #[startRecord]#-#[to]# of #[of]#
-      #(right)#<img src="env/grafics/navdr.gif" alt="no next page" />::<a href="Table_API_p.html?startRecord=#[startRecord]#&amp;maximumRecords=#[maximumRecords]#&amp;inline=#(inline)#false::true#(/inline)#&amp;filter=#[filter]#" target="_self"><img src="env/grafics/navsr.gif" alt="next page" /></a>#(/right)#
-      <img src="env/grafics/nave.gif" alt="" />
-      #(/navigation)#
-      <div>
-      <input type="hidden" name="startRecord" value="#[startRecord]#" />
-      <input type="hidden" name="maximumRecords" value="#[maximumRecords]#" />
-      <input type="hidden" name="inline" value="#(inline)#false::true#(/inline)#" />
-      <input type="hidden" name="filter" value="#[filter]#" />
-      <input type="text" name="query" value="#[query]#" style="font-size:16px;float:left;border:0px;height:20px;background-image:url('env/grafics/find.gif');background-repeat:no-repeat;background-position:right top;" />
-      </div>
-      </span><br/></p>
-      <p style="clear:both;">
-      <table class="sortable" border="0" cellpadding="2" cellspacing="1">
-        <tr class="TableHeader" valign="bottom">
-          <th class="sorttable_nosort"><input type="checkbox" id="allswitch" onclick="checkAll(this.form.id, this.checked);" /></th>
-          <th>Type</th>
-          <th width="100">Comment</th>
-          <th>Call<br/>Count</th>
-          <th>Recording<br/>Date</th>
-          <th>Last&nbsp;Exec<br/>Date</th>
-          <th>Next&nbsp;Exec<br/>Date</th>
-          <th class="sorttable_nosort">Scheduler</th>
-          #(inline)#<th class="sorttable_nosort">URL</th>::#(/inline)#
-        </tr>
-        #{list}#
-        <tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#">
-          <td align="left"><input type="checkbox" name="item_#[count]#" value="mark_#[pk]#" /></td>
-          <td>#[type]#</td>
-          <td>#[comment]#</td>
-          <td>#[callcount]#</td>
-          <td>#[dateRecording]#</td>
-          <td>#[dateLastExec]#</td>
-          <td>#[dateNextExec]#</td>
-          <td>
-          #(scheduler)#
-           <form action="Table_API_p.html" method="post" enctype="multipart/form-data" id="modify_repeat" accept-charset="UTF-8">
-            <select name="repeat_select" onchange='this.form.submit()'>
-              <option value="off" selected="selected">no repetition</option>
-              <option value="on">activate scheduler</option>
-            </select>
-            <input type="hidden" name="pk" value="#[pk]#" />
-            <input type="hidden" name="inline" value="#[inline]#" />
-            <input type="hidden" name="filter" value="#[filter]#" />
-          </form>
-          ::
-         <form action="Table_API_p.html" method="post" enctype="multipart/form-data" id="modify_repeat">
-            <table><tr><td>
-            <select name="repeat_time" onchange='this.form.submit()'>
-            #{scale}#
-              <option value="#[time]#" #(selected)#::selected="selected"#(/selected)#>#[time]#</option>
-            #{/scale}#
-            </select>
-            </td><td>
-            <select name="repeat_unit" onchange='this.form.submit()'>
-              <option value="selminutes" #(selectedMinutes)#::selected="selected"#(/selectedMinutes)#>minutes</option>
-              <option value="selhours" #(selectedHours)#::selected="selected"#(/selectedHours)#>hours</option>
-              <option value="seldays" #(selectedDays)#::selected="selected"#(/selectedDays)#>days</option>
-            </select>
-            </td></tr></table>
-            <input type="hidden" name="pk" value="#[pk]#" />
-            <input type="hidden" name="inline" value="#[inline]#" />
-            <input type="hidden" name="filter" value="#[filter]#" />
-            <noscript><input type="submit" value="Submit" /></noscript>
-        </form>
-          #(/scheduler)#
-          </td>
-          #(inline)#<td>#[url]#</td>::#(/inline)#
-        </tr>
-        #{/list}#
-        </fieldset>
-      </table>
-      </p>
-      <p>
-      <input type="hidden" name="num" value="#[num]#" />
-      <input type="submit" name="deletefromindex" value="Delete selected references from the search index" />
-      <input type="submit" name="deleterows" value="Delete selected entries from the list" />
-      </p>
-      
-    </form>
-    #(/showtable)#
-    </div>
-    #%env/templates/footer.template%#
-  </body>
-</html>
-  
\ No newline at end of file
diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html
index 2fc254a01..9793e0d4d 100644
--- a/htroot/PerformanceQueues_p.html
+++ b/htroot/PerformanceQueues_p.html
@@ -73,14 +73,6 @@
 	        <td>Description</td>

 	      </tr>

 	      <tr valign="top" class="TableCellDark">

-	        <td>URLs in RAM buffer:</td>

-	        <td align="center">#[urlCacheSize]#</td>

-	        <td>

-	          This is the size of the URL write buffer. Its purpose is to buffer incoming URLs

-	          in case of search result transmission and during DHT transfer.

-	        </td>

-	      </tr>

-	      <tr valign="top" class="TableCellDark">

 	        <td>Words in RAM cache:<br />(Size in KBytes)</td>

 	        <td>#[wordCacheSize]#<br />(#[wordCacheSizeKBytes]# KB)</td>

 	        <td>

diff --git a/htroot/PerformanceQueues_p.java b/htroot/PerformanceQueues_p.java
index de414a3a4..d9f50d0c3 100644
--- a/htroot/PerformanceQueues_p.java
+++ b/htroot/PerformanceQueues_p.java
@@ -299,7 +299,6 @@ public class PerformanceQueues_p {
         prop.put("minimumGlobalDelta", sb.crawlQueues.noticeURL.getMinimumGlobalDelta());

 

         // table cache settings

-        prop.putNum("urlCacheSize", indexSegment.urlMetadata().writeCacheSize());

         prop.putNum("wordCacheSize", indexSegment.termIndex().getBufferSize());

         prop.putNum("wordCacheSizeKBytes", indexSegment.termIndex().getBufferSizeBytes()/1024);

         prop.putNum("maxURLinCache", indexSegment.termIndex().getBufferMaxReferences());

diff --git a/htroot/PerformanceQueues_p.xml b/htroot/PerformanceQueues_p.xml
index 8535e76a9..e7fc14d95 100644
--- a/htroot/PerformanceQueues_p.xml
+++ b/htroot/PerformanceQueues_p.xml
@@ -24,7 +24,6 @@
         </Task>
 	#{/table}#</Tasks>
 	<Cache>
-		<urlCacheSize>#[urlCacheSize]#</urlCacheSize>
 		<wordCacheSize>#[wordCacheSize]#</wordCacheSize>
 		<maxURLinCache>#[maxURLinCache]#</maxURLinCache>
 		<maxAgeOfCache>#[maxAgeOfCache]#</maxAgeOfCache>
diff --git a/htroot/env/templates/submenuBlacklist.template b/htroot/env/templates/submenuBlacklist.template
index 6c157a9eb..a02bb6c1f 100644
--- a/htroot/env/templates/submenuBlacklist.template
+++ b/htroot/env/templates/submenuBlacklist.template
@@ -5,6 +5,5 @@
     <li><a href="/BlacklistCleaner_p.html" class="MenuItemLink lock">Blacklist Cleaner</a></li>
     <li><a href="/BlacklistTest_p.html" class="MenuItemLink lock">Blacklist Test</a></li>
     <li><a href="/BlacklistImpExp_p.html" class="MenuItemLink lock">Import/Export</a></li>
-    <li><a href="/IndexCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>
   </ul>
 </div>
\ No newline at end of file