- fix for UPNP error, TODO: via ajax

- removed unused "type" argument in yacysearch.html

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

htroot/ConfigBasic.java

@@ -102,6 +102,7 @@ public class ConfigBasic {
         } 
         
         // scan for Upnp routers
+        /*
         long begin = System.currentTimeMillis();
         boolean upnpRouterFound = false;
         if (yacyCore.seedDB.mySeed.isVirgin() || yacyCore.seedDB.mySeed.isJunior()) {
@@ -112,8 +113,8 @@ public class ConfigBasic {
         // if the upnp router scan has taken less than 3 sec, we need to wait
         // a little bit for success of peer ping
         if ((doPeerPing) && ((end - begin) < 3000 )) {
-            try {Thread.sleep(3000-(end - begin));} catch (InterruptedException e) {/* */} 
-        }
+            try {Thread.sleep(3000-(end - begin));} catch (InterruptedException e) {/* *///} 
+        /*}
         
         // if a UPnP router is available
         String currentForwarder = env.getConfig("portForwarding.Type", "none");
@@ -127,7 +128,7 @@ public class ConfigBasic {
         
         // if UPnp is already enabled
         prop.put("upnp_enabled", currentForwarder.equalsIgnoreCase("upnp") && forwardingEnabled ? 1 : 0);
-        
+        */
         // language settings
         if ((post != null) && (!(post.get("language", "default").equals(lang)))) {
             translator.changeLang(env, langPath, post.get("language", "default") + ".lng");

htroot/yacysearch.html

@@ -48,7 +48,7 @@
       <fieldset class="yacys">
               <input id="search" name="search" type="text" size="50" maxlength="80" value="#[former]#" onclick="document.getElementById('Enter').value = 'Search'" />
               <input id="Enter" type="submit" name="Enter" value="Search" /> &nbsp;
-              <a href="index.html?display=#[display]#&amp;input=#[input]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;type=#[type]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
+              <a href="index.html?display=#[display]#&amp;input=#[input]#&amp;searchoptions=1&amp;count=#[count]#&amp;resource=#[resource]#&amp;time=#[time]#&amp;urlmaskfilter=#[urlmaskfilter]#&amp;prefermaskfilter=#[prefermaskfilter]#&amp;cat=#[cat]#&amp;constraint=#[constraint]#&amp;contentdom=#[contentdom]#&amp;former=#[former]#">more options</a>
           <div class="yacysearch">
               <input type="radio" id="text" name="contentdom" value="text"#(contentdomCheckText)#:: checked="checked"#(/contentdomCheckText)# />
               <label for="text">Text</label>&nbsp;&nbsp;
@@ -69,7 +69,7 @@
         <input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
         <input type="hidden" name="depth" value="#[depth]#" />
         <input type="hidden" name="cat" value="#[cat]#" />
-        <input type="hidden" name="type" value="#[type]#" />
+        <!--<input type="hidden" name="type" value="#[type]#" />-->
         <input type="hidden" name="display" value="#[display]#" />
         <input type="hidden" name="input" value="#[input]#" />
         <input type="hidden" name="constraint" value="#[constraint]#" />