- fix for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=14&p=137#p137

- fix for missing restart script in ant built target
- removed some more synchronization for size() operations
- removed blocking statement on search page

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

build.xml

@@ -472,6 +472,7 @@
 	    <include name="startYACY.sh"/>
 	    <include name="stopYACY.sh"/>
 	    <include name="killYACY.sh"/>
+	  	<include name="restart.sh"/>
 	    <include name="startYACY.command"/>
 	    <include name="stopYACY.command"/>
 	  </fileset>	

htroot/index.html

@@ -115,7 +115,7 @@
         </tr>
       </table>
       #(/searchoptions)#
-      <p>This peer holds #[links]# URLs of #[total-links]# in the known network.</p>
+      <p>This peer holds #[links]# URLs</p>
     </form>
     #(searchoptions)#::
     <p>

htroot/index.java

@@ -105,11 +105,11 @@ public class index {
         if (cds.equals("image")) contentdom = plasmaSearchQuery.CONTENTDOM_IMAGE;
         if (cds.equals("app")) contentdom = plasmaSearchQuery.CONTENTDOM_APP;
         
-        long mylinks = 0;
+        //long mylinks = 0;
         try {
-            prop.put("links", groupDigits(mylinks = Long.parseLong(yacyCore.seedDB.mySeed.get(yacySeed.LCOUNT, "0"))));
+            prop.put("links", groupDigits(/*mylinks = */Long.parseLong(yacyCore.seedDB.mySeed.get(yacySeed.LCOUNT, "0"))));
         } catch (NumberFormatException e) { prop.put("links", "0"); }
-        prop.put("total-links", groupDigits(mylinks + yacyCore.seedDB.countActiveURL()));
+        //prop.put("total-links", groupDigits(mylinks + yacyCore.seedDB.countActiveURL())); // extremely time-intensive!
         
         // we create empty entries for template strings
         String promoteSearchPageGreeting = env.getConfig("promoteSearchPageGreeting", "");

source/de/anomic/kelondro/kelondroStack.java

@@ -138,7 +138,7 @@ public final class kelondroStack extends kelondroRecords {
         }
     }
 
-    public synchronized int size() {
+    public int size() {
         return super.size();
     }
     

source/de/anomic/plasma/plasmaCrawlBalancer.java

@@ -190,7 +190,7 @@ public class plasmaCrawlBalancer {
         }
     }
     
-    public synchronized int size() {
+    public int size() {
         int componentsize = urlFileStack.size() + urlRAMStack.size() + sizeDomainStacks();
         if (componentsize != urlFileIndex.size()) {
 		    // here is urlIndexFile.size() always smaller. why?

source/de/anomic/yacy/yacyVersion.java

@@ -265,7 +265,7 @@ public final class yacyVersion implements Comparator, Comparable {
     }
     
     public static void writeDeployScript(String release) {
-        byte[] script = ("tar xfz " + release + ";cp -Rf yacy/* ../../;rm -Rf yacy;cd ../../;startYACY.sh").getBytes();
+        byte[] script = ("cd `dirname $0`;while [ -e ../yacy.running ]; do sleep 1;done;tar xfz " + release + ";cp -Rf yacy/* ../../;rm -Rf yacy;cd ../../;startYACY.sh").getBytes();
         
     }
 }