- added navigation icons for search result pages

- modified result page rendering to use new icons instead of numbers
- set different default values in yacy.init for higher indexing performance; removed pro-values
- modified WatchCrawler to accept 30000 PPM instead of only a maximum of 6000 PPM

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

build.properties

@@ -3,7 +3,7 @@ javacSource=1.5
 javacTarget=1.5
 
 # Release Configuration
-releaseVersion=0.78
+releaseVersion=0.79
 stdReleaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 embReleaseFile=yacy_emb_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
 proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz

defaults/yacy.init

@@ -159,8 +159,7 @@ clientTimeout = 10000
 # maximal number of httpd sessions
 # a client may open several connections at once, and the httpdMaxBusySessions value sets
 # a limit on the number of concurrent connections
-httpdMaxBusySessions = 100
-httpdMaxBusySessions__pro = 200
+httpdMaxBusySessions = 200
 
 # default root path for the file server
 # may be overridden by the htdocs parameter
@@ -220,8 +219,7 @@ mimeConfig = httpd.mime
 proxyCache = DATA/HTCACHE
 
 # the maximum disc cache size for files in proxyCache in megabytes
-proxyCacheSize = 100
-proxyCacheSize__pro = 1024
+proxyCacheSize = 1024
 
 # a path to the surrogate input directory
 surrogates.in = DATA/SURROGATES/in
@@ -246,16 +244,11 @@ minimumGlobalDelta = 500
 # parseableMimeTypes.HTML: specifies mime-types that can be indexed with built-in html parser
 # parseableMime: specifies mime-types that can be indexed but not on the fly
 parseableMimeTypes.HTML=application/xhtml+xml,text/html,text/plain,text/sgml
-parseableMimeTypes=
-parseableMimeTypes__pro=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
-parseableMimeTypes.CRAWLER=
-parseableMimeTypes.CRAWLER__pro=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
-parseableMimeTypes.PROXY=
-parseableMimeTypes.PROXY__pro=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
-parseableMimeTypes.ICAP=
-parseableMimeTypes.ICAP__pro=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
-parseableMimeTypes.URLREDIRECTOR=
-parseableMimeTypes.URLREDIRECTOR__pro=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
+parseableMimeTypes=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
+parseableMimeTypes.CRAWLER=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
+parseableMimeTypes.PROXY=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
+parseableMimeTypes.ICAP=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
+parseableMimeTypes.URLREDIRECTOR=application/atom+xml,application/bzip2,application/excel,application/gzip,application/java-archive,application/msexcel,application/mspowerpoint,application/msword,application/octet-stream,application/pdf,application/postscript,application/powerpoint,application/rdf+xml,application/rss+xml,application/rtf,application/tar,application/vcard,application/vnd.ms-excel,application/vnd.ms-powerpoint,application/vnd.oasis.opendocument.text,application/x-7z-compressed,application/x-bz2,application/x-bzip2,application/x-compress,application/x-compressed,application/x-excel,application/x-gzip,application/x-msexcel,application/x-redhat packet manager,application/x-redhat-package-manager,application/x-rpm,application/x-shockwave-flash,application/x-shockwave-flash2-preview,application/x-tar,application/x-vnd.oasis.opendocument.text,application/x-xml,application/x-zip,application/x-zip-compressed,application/xml,application/zip,text/postscript,text/rss,text/rtf,text/x-vcard,text/xml
 parseableMimeTypes.IMAGE=image/gif,image/jpeg,image/png,image/tiff,image/vnd.wap.wbmp,image/x-icon,image/bmp
 
 # media extension string
@@ -580,7 +573,7 @@ filterOutStopwordsFromTopwords=true
 40_peerseedcycle_busysleep=1200000
 40_peerseedcycle_memprereq=4194304
 50_localcrawl_idlesleep=2000
-50_localcrawl_busysleep=50
+50_localcrawl_busysleep=2
 50_localcrawl_memprereq=12582912
 50_localcrawl_isPaused=false
 60_remotecrawlloader_idlesleep=60000
@@ -592,7 +585,7 @@ filterOutStopwordsFromTopwords=true
 62_remotetriggeredcrawl_memprereq=12582912
 62_remotetriggeredcrawl_isPaused=false
 80_indexing_idlesleep=1000
-80_indexing_busysleep=10
+80_indexing_busysleep=0
 80_indexing_memprereq=12582912
 90_cleanup_idlesleep=300000
 90_cleanup_busysleep=300000
@@ -883,10 +876,7 @@ wikiParser.class = de.anomic.data.wikiCode
 # settings for automatic deletion of old entries in passive and potential seed-db
 # time means max time (in days) a peer may not have been seen before it is deleted
 routing.deleteOldSeeds.permission = true
-routing.deleteOldSeeds.permission__pro = true
 routing.deleteOldSeeds.time = 7
-routing.deleteOldSeeds.time__pro = 30
-
 
 # options to remember the default search engines when using the search compare features
 compare_yacy.left = YaCy

htroot/ViewFile.java

@@ -111,7 +111,7 @@ public class ViewFile {
             }
             url = metadata.url();
             descr = metadata.dc_title();
-            urlEntry.wordCount();
+            //urlEntry.wordCount();
             size = urlEntry.size();
             pre = urlEntry.flags().get(Condenser.flag_cat_indexof);
         }

htroot/WatchCrawler_p.html

@@ -75,7 +75,7 @@
           </tr>
           <tr class="TableCellLight">
             <td align="left" #(crawlingSpeedMinChecked)#::class="TableCellDark"#(/crawlingSpeedMinChecked)#><input type="submit" name="crawlingPerformance" value="minimum" /></td>
-            <td align="left" #(crawlingSpeedCustChecked)#::class="TableCellDark"#(/crawlingSpeedCustChecked)#><input name="customPPM" type="text" size="4" maxlength="4" value="#[customPPMdefault]#" />PPM <input type="submit" name="crawlingPerformance" value="custom" /></td>
+            <td align="left" #(crawlingSpeedCustChecked)#::class="TableCellDark"#(/crawlingSpeedCustChecked)#><input name="customPPM" type="text" size="5" maxlength="5" value="#[customPPMdefault]#" />PPM <input type="submit" name="crawlingPerformance" value="custom" /></td>
             <td align="left" #(crawlingSpeedMaxChecked)#::class="TableCellDark"#(/crawlingSpeedMaxChecked)#><input type="submit" name="crawlingPerformance" value="maximum" /></td>
           </tr>
         </tbody>

htroot/WatchCrawler_p.java

@@ -436,8 +436,8 @@ public class WatchCrawler_p {
         // performance settings
         final long LCbusySleep = Integer.parseInt(env.getConfig(plasmaSwitchboardConstants.CRAWLJOB_LOCAL_CRAWL_BUSYSLEEP, "1000"));
         final int LCppm = (int) (60000L / Math.max(1,LCbusySleep));
-        prop.put("crawlingSpeedMaxChecked", (LCppm >= 6000) ? "1" : "0");
-        prop.put("crawlingSpeedCustChecked", ((LCppm > 10) && (LCppm < 6000)) ? "1" : "0");
+        prop.put("crawlingSpeedMaxChecked", (LCppm >= 30000) ? "1" : "0");
+        prop.put("crawlingSpeedCustChecked", ((LCppm > 10) && (LCppm < 30000)) ? "1" : "0");
         prop.put("crawlingSpeedMinChecked", (LCppm <= 10) ? "1" : "0");
         prop.put("customPPMdefault", Integer.toString(LCppm));
         
@@ -457,12 +457,12 @@ public class WatchCrawler_p {
     private static void setPerformance(final plasmaSwitchboard sb, final serverObjects post) {
         final String crawlingPerformance = post.get("crawlingPerformance", "custom");
         final long LCbusySleep = Integer.parseInt(sb.getConfig(plasmaSwitchboardConstants.CRAWLJOB_LOCAL_CRAWL_BUSYSLEEP, "1000"));
-        int wantedPPM = (LCbusySleep == 0) ? 6000 : (int) (60000L / LCbusySleep);
+        int wantedPPM = (LCbusySleep == 0) ? 30000 : (int) (60000L / LCbusySleep);
         try {
             wantedPPM = Integer.parseInt(post.get("customPPM", Integer.toString(wantedPPM)));
         } catch (final NumberFormatException e) {}
         if (crawlingPerformance.toLowerCase().equals("minimum")) wantedPPM = 10;
-        if (crawlingPerformance.toLowerCase().equals("maximum")) wantedPPM = 6000;
+        if (crawlingPerformance.toLowerCase().equals("maximum")) wantedPPM = 30000;
         sb.setPerformance(wantedPPM);
     }
     

htroot/yacysearch.java

@@ -456,25 +456,50 @@ public class yacysearch {
             // compose page navigation
             final StringBuilder resnav = new StringBuilder();
             final int thispage = offset / theQuery.displayResults();
-            if (thispage == 0) resnav.append("< "); else {
+            if (thispage == 0) {
+            	//resnav.append("< ");
+            	resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\">&nbsp;");
+            } else {
+            	/*
                 resnav.append(navurla(thispage - 1, display, theQuery, originalUrlMask));
                 resnav.append("<strong>&lt;</strong></a>&nbsp;");
+                */
+            	resnav.append(navurla(thispage - 1, display, theQuery, originalUrlMask));
+            	resnav.append("<img src=\"env/grafics/navdl.gif\" width=\"16\" height=\"16\"></a>&nbsp;");
             }
             final int numberofpages = Math.min(10, Math.max(thispage + 2, totalcount / theQuery.displayResults()));
             for (int i = 0; i < numberofpages; i++) {
                 if (i == thispage) {
+                	/*
                     resnav.append("<strong>");
                     resnav.append(i + 1);
                     resnav.append("</strong>&nbsp;");
+                    */
+                    resnav.append("<img src=\"env/grafics/navs");
+                    resnav.append(i + 1);
+                    resnav.append(".gif\" width=\"16\" height=\"16\">&nbsp;");
                 } else {
+                	/*
                     resnav.append(navurla(i, display, theQuery, originalUrlMask));
                     resnav.append(i + 1);
                     resnav.append("</a>&nbsp;");
+                    */
+                	resnav.append(navurla(i, display, theQuery, originalUrlMask));
+                	resnav.append("<img src=\"env/grafics/navd");
+                	resnav.append(i + 1);
+                	resnav.append(".gif\" width=\"16\" height=\"16\"></a>&nbsp;");
                 }
             }
-            if (thispage >= numberofpages) resnav.append("&gt;"); else {
+            if (thispage >= numberofpages) {
+            	//resnav.append("&gt;");
+            	resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\">");
+            } else {
+            	/*
                 resnav.append(navurla(thispage + 1, display, theQuery, originalUrlMask));
                 resnav.append("<strong>&gt;</strong></a>");
+                */
+            	resnav.append(navurla(thispage + 1, display, theQuery, originalUrlMask));
+            	resnav.append("<img src=\"env/grafics/navdr.gif\" width=\"16\" height=\"16\"></a>");
             }
             prop.put("num-results_resnav", resnav.toString());