show IP of crawled host and country in CrawlResults

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7981 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/CrawlResults.html

@@ -117,6 +117,8 @@
         #(showDate)#::<td><strong>Modified</strong></td>#(/showDate)#
         #(showWords)#::<td><strong>Words</strong></td>#(/showWords)#
         #(showTitle)#::<td><strong>Title</strong></td>#(/showTitle)#
+        #(showCountry)#::<td><strong>Country</strong></td>#(/showCountry)#
+        #(showIP)#::<td><strong>IP of Host</strong></td>#(/showIP)#
         #(showURL)#::<td><strong>URL</strong></td>#(/showURL)#
       </tr>
       #{indexed}#
@@ -147,6 +149,9 @@
         </td>
         #(/showTitle)#
         
+        #(showCountry)#::<td>#[country]#</td>#(/showCountry)#
+        #(showIP)#::<td>#[ip]#</td>#(/showIP)#
+
         #(showURL)#
         ::
         <td>

htroot/CrawlResults.java

@@ -40,7 +40,6 @@ import net.yacy.kelondro.logging.Log;
 import net.yacy.peers.yacySeed;
 import net.yacy.search.Switchboard;
 import net.yacy.search.index.Segments;
-
 import de.anomic.crawler.ResultURLs;
 import de.anomic.crawler.ResultURLs.EventOrigin;
 import de.anomic.crawler.ResultURLs.InitExecEntry;
@@ -61,6 +60,8 @@ public class CrawlResults {
         boolean showDate    = env.getConfigBool("IndexMonitorDate", true);
         boolean showWords   = env.getConfigBool("IndexMonitorWords", true);
         boolean showTitle   = env.getConfigBool("IndexMonitorTitle", true);
+        boolean showCountry = env.getConfigBool("IndexMonitorCountry", true);
+        boolean showIP      = env.getConfigBool("IndexMonitorIP", true);
         boolean showURL     = env.getConfigBool("IndexMonitorURL", true);
 
         if (post == null) {
@@ -128,7 +129,7 @@ public class CrawlResults {
                     try {
                         sb.indexSegments.urlMetadata(Segments.Process.LOCALCRAWLING).deleteDomain(hashpart);
                         ResultURLs.deleteDomain(tabletype, domain, hashpart);
-                    } catch (IOException e) {
+                    } catch (final IOException e) {
                         Log.logException(e);
                     }
                 }
@@ -143,6 +144,8 @@ public class CrawlResults {
             if (post.get("sd") != null) showDate    = !("0".equals(post.get("sd")));
             if (post.get("sw") != null) showWords   = !("0".equals(post.get("sw")));
             if (post.get("st") != null) showTitle   = !("0".equals(post.get("st")));
+            if (post.get("sc") != null) showCountry = !("0".equals(post.get("sc")));
+            if (post.get("sp") != null) showIP      = !("0".equals(post.get("sp")));
             if (post.get("su") != null) showURL     = !("0".equals(post.get("su")));
         } // end != null
 
@@ -169,6 +172,8 @@ public class CrawlResults {
             prop.put("table_showDate",    (showDate) ? "1" : "0");
             prop.put("table_showWords",   (showWords) ? "1" : "0");
             prop.put("table_showTitle",   (showTitle) ? "1" : "0");
+            prop.put("table_showCountry", (showCountry) ? "1" : "0");
+            prop.put("table_showIP",      (showIP) ? "1" : "0");
             prop.put("table_showURL",     (showURL) ? "1" : "0");
 
             boolean dark = true;
@@ -243,6 +248,18 @@ public class CrawlResults {
                     } else
                         prop.put("table_indexed_" + cnt + "_showTitle", "0");
 
+                    if (showCountry && urle != null) {
+                        prop.put("table_indexed_" + cnt + "_showCountry", "1");
+                        prop.put("table_indexed_" + cnt + "_showCountry_country", metadata.url().getLocale().getCountry());
+                    } else
+                        prop.put("table_indexed_" + cnt + "_showCountry", "0");
+
+                    if (showIP && urle != null) {
+                        prop.put("table_indexed_" + cnt + "_showIP", "1");
+                        prop.put("table_indexed_" + cnt + "_showIP_ip", metadata.url().getInetAddress().getHostAddress());
+                    } else
+                        prop.put("table_indexed_" + cnt + "_showIP", "0");
+
                     if (showURL) {
                         prop.put("table_indexed_" + cnt + "_showURL", "1");
                         prop.put("table_indexed_" + cnt + "_showURL_available", "1");