Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/CrawlStartScanner_p.html

@@ -77,15 +77,15 @@
 		<select name="repeat_time">
            <option value="1">1</option><option value="2">2</option><option value="3">3</option>
            <option value="4">4</option><option value="5">5</option><option value="6">6</option>
-           <option value="7">7</option><option value="8">8</option>
-           <option value="9">9</option><option value="10" selected="selected">10</option>
+           <option value="7" selected="selected">7</option><option value="8">8</option>
+           <option value="9">9</option><option value="10">10</option>
            <option value="12">12</option><option value="14">14</option><option value="15">15</option>
            <option value="21">21</option><option value="28">28</option><option value="30">30</option>
 		</select>
 		<select name="repeat_unit">
-           <option value="selminutes" selected="selected">minutes</option>
+           <option value="selminutes">minutes</option>
            <option value="selhours">hours</option>
-           <option value="seldays">days</option>
+           <option value="seldays" selected="selected">days</option>
         </select> again and add new sites automatically to indexer.<br />
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sites that do not appear during a scheduled scan period will be excluded from search results.
     </dd>

htroot/CrawlStartScanner_p.java

@@ -155,6 +155,16 @@ public class CrawlStartScanner_p
                         Collection<InetAddress> scanbase = new ArrayList<InetAddress>();
                         if (host.length() > 0) {
                             ip = Domains.dnsResolve(host); if (ip != null) scanbase.add(ip);
+                            if (host.startsWith("ftp.") || host.startsWith("www.") ||
+                                host.startsWith("blog.") || host.startsWith("wiki.") ||
+                                host.startsWith("forum.") || host.startsWith("forums.") ||
+                                host.startsWith("events.") || host.startsWith("bugs.")) {
+                                host = host.substring(host.indexOf('.') + 1);
+                                if (!hostSet.contains(host)) {
+                                    ip = Domains.dnsResolve(host);
+                                    if (ip != null) scanbase.add(ip);
+                                }
+                            }
                             if (scanftp && !hostSet.contains("ftp." + host)) {
                                 ip = Domains.dnsResolve("ftp." + host);
                                 if (ip != null) scanbase.add(ip);

htroot/env/templates/submenuIndexControl.template

@@ -5,7 +5,7 @@
     <li><a href="/IndexDeletion_p.html" class="MenuItemLink lock">Index Deletion</a></li>
     <li><a href="/IndexFederated_p.html" class="MenuItemLink lock">Index Sources &amp; Targets</a></li>
     <li><a href="/IndexSchema_p.html" class="MenuItemLink lock">Solr Schema Editor</a></li>
-    <li><a href="/IndexReindexMonitor_p.html" class="MenuItemLink lock">Field Re-Indexing</a></li>
+    <li><a href="/IndexReIndexMonitor_p.html" class="MenuItemLink lock">Field Re-Indexing</a></li>
     #(p2p)#::<li><a href="/IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/p2p)#
     <!--<li><a href="/IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>-->
     <!--<li><a href="/ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>-->

source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java

@@ -212,6 +212,11 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen
                     Log.logException(ee);
                     try {
                         this.server.commit();
+                    } catch (Throwable eee) {
+                        Log.logException(eee);
+                        // a time-out may occur here
+                    }
+                    try {
                         this.server.add(solrdoc, -1);
                     } catch (Throwable eee) {
                         Log.logException(eee);
@@ -240,7 +245,13 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen
                     this.server.deleteById(ids);
                 } catch (SolrServerException e1) {
                     Log.logException(e1);
-                    }
+                }
+                try {
+                    this.server.commit();
+                } catch (Throwable eee) {
+                    Log.logException(eee);
+                    // a time-out may occur here
+                }
                 try {
                     this.server.add(solrdocs, -1);
                 } catch (Throwable ee) {