3 files changed, 27 insertions, 2 deletions
diff --git a/htroot/CrawlProfileEditor_p.java b/htroot/CrawlProfileEditor_p.java
index 30ed6f471..b91adffd4 100644
--- a/htroot/CrawlProfileEditor_p.java
+++ b/htroot/CrawlProfileEditor_p.java
@@ -87,7 +87,8 @@ public class CrawlProfileEditor_p {
         if (post != null) {
             if (post.containsKey("terminate")) {
                 // termination of a crawl: shift the crawl from active to passive
-                sb.profilesPassiveCrawls.newEntry(sb.profilesActiveCrawls.getEntry(handle).map());
+                plasmaCrawlProfile.entry entry = sb.profilesActiveCrawls.getEntry(handle);
+                if (entry != null) sb.profilesPassiveCrawls.newEntry(entry.map());
                 sb.profilesActiveCrawls.removeEntry(handle);
                 // delete all entries from the crawl queue that are deleted here
                 sb.crawlQueues.noticeURL.removeByProfileHandle(handle);
diff --git a/startYACY.bat b/startYACY.bat
index f1088b732..df5c5c434 100644
--- a/startYACY.bat
+++ b/startYACY.bat
@@ -14,6 +14,7 @@ set jms=
 set javacmd=-Xmx64m -Xms10m
 set priolvl=0
 set priority=/NORMAL
+if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
@@ -36,6 +37,17 @@ start "YaCy" %priority% /B /WAIT java %javacmd% -classpath %CLASSPATH% yacy
 if not exist DATA\yacy.restart GoTo :END
 del DATA\yacy.restart
 
+Rem PUBLIC is now freeworld (r4575)
+:RENAMEINDEX
+for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do (
+    if "%%i"=="network.unit.name" set networkname=%%j
+)
+if not defined networkname set networkname=PUBLIC
+cd DATA\INDEX
+ren PUBLIC %networkname%
+cd ..
+cd ..
+
 Rem This target is used to read java runtime parameters out of the yacy config file
 :GETSTARTOPTS
 for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\yacy.conf) do (
diff --git a/startYACY_noconsole.bat b/startYACY_noconsole.bat
index d26d111ab..ae78ca43b 100644
--- a/startYACY_noconsole.bat
+++ b/startYACY_noconsole.bat
@@ -11,9 +11,10 @@ For %%X in (libx/*.jar) Do Call %0 CPGEN libx\%%X
 REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced" 
 set jmx=
 set jms=
-set javacmd=-Xmx64m -Xms10m
+set javacmd=-Xmx94m -Xms94m
 set priolvl=0
 set priority=/NORMAL
+if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
 if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
 
 :STARTJAVA
@@ -26,6 +27,17 @@ Echo You can close the console safely now.
 
 GoTo :END
 
+Rem PUBLIC is now freeworld (r4575)
+:RENAMEINDEX
+for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\httpProxy.conf) do (
+    if "%%i"=="network.unit.name" set networkname=%%j
+)
+if not defined networkname set networkname=PUBLIC
+cd DATA\INDEX
+ren PUBLIC %networkname%
+cd ..
+cd ..
+
 Rem This target is used to read java runtime parameters out of the yacy config file
 :GETSTARTOPTS
 for /F "tokens=1,2 delims==" %%i in (DATA\SETTINGS\yacy.conf) do (