added mime types

added peer name in search statistics

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.4
 javacTarget=1.4
 
 # Release Configuration
-releaseVersion=0.501
+releaseVersion=0.502
 releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}

htroot/SearchStatistics_p.html

@@ -102,12 +102,14 @@
     <table border="0" cellpadding="2" cellspacing="1">
       <tr class="TableHeader">
         <td>Requesting Host</td>
+        <td>Peer Name</td>
         <td>Count</td>
         <td>Access Dates</td>
       </tr>
       #{list}#
       <tr class="TableCell#(dark)#Light::Dark#(/dark)#">
         <td>#[host]#</td>
+        <td>#[peername]#</td>
         <td>#[count]#</td>
         <td>#[dates]#</td>
       </tr>

htroot/SearchStatistics_p.java

@@ -32,11 +32,13 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import de.anomic.http.httpHeader;
+import de.anomic.net.natLib;
 import de.anomic.plasma.plasmaSearchQuery;
 import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyCore;
+import de.anomic.yacy.yacySeed;
 
 public class SearchStatistics_p {
  
@@ -109,6 +111,10 @@ public class SearchStatistics_p {
                 }
                 prop.put("page_list_" + entCount + "_dark", ((dark) ? 1 : 0) ); dark =! dark;
                 prop.put("page_list_" + entCount + "_host", host);
+                if (page == 4) {
+                    yacySeed remotepeer = yacyCore.seedDB.lookupByIP(natLib.getInetAddress(host), true, true, true);
+                    prop.put("page_list_" + entCount + "_peername", remotepeer);
+                }
                 prop.put("page_list_" + entCount + "_count", new Integer(handles.size()).toString());
                 prop.put("page_list_" + entCount + "_dates", handlestring);
                 // next

httpd.mime

@@ -34,7 +34,11 @@ jpg     = image/jpeg
 js      = text/javascript
 lha     = application/x-lzh
 lzh     = application/x-lzh
+m4v     = video/x-m4v
 mov     = video/quicktime
+mp2     = audio/mpeg
+mp3     = audio/mpeg
+mp4     = video/mp4
 mpe     = video/mpeg
 mpeg    = video/mpeg
 mpg     = video/mpeg