mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
This commit is contained in:
commit
89ede0fe84
|
@ -256,7 +256,7 @@
|
|||
<jar destfile="${lib}/yacycore.jar" basedir="${build}/">
|
||||
<manifest>
|
||||
<attribute name="Main-Class" value="net.yacy.yacy"/>
|
||||
<attribute name="Class-Path" value="../htroot ${manifest.classpath}"/>
|
||||
<attribute name="Class-Path" value="${manifest.classpath}"/>
|
||||
</manifest>
|
||||
</jar>
|
||||
|
||||
|
|
|
@ -204,6 +204,7 @@ function resultLine(type, item, linenumber) {
|
|||
if (title == "") title = path;
|
||||
if (title.length >= 60) title = title.substring(0, 28) + "..." + title.substring(title.length - 29);
|
||||
pd = item.pubDate;
|
||||
if (pd == undefined) pd = "";
|
||||
if (pd.substring(pd.length - 6) == " +0000") pd = pd.substring(0, pd.length - 6);
|
||||
if (pd.substring(pd.length - 9) == " 00:00:00") pd = pd.substring(0, pd.length - 9);
|
||||
if (pd.substring(pd.length - 5) == " 2010") pd = pd.substring(0, pd.length - 5);
|
||||
|
|
139
startYACY.bat
139
startYACY.bat
|
@ -1,73 +1,66 @@
|
|||
@Echo Off
|
||||
title YaCy
|
||||
|
||||
REM setting startup type for proper restart
|
||||
if not exist DATA md DATA
|
||||
echo . >DATA\yacy.noconsole
|
||||
|
||||
If %1.==CPGEN. GoTo :CPGEN
|
||||
|
||||
Rem Generating the proper classpath unsing loops and labels
|
||||
Set CLASSPATH=htroot
|
||||
For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
|
||||
|
||||
REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced"
|
||||
set jmx=
|
||||
set jms=
|
||||
set javacmd=-Xmx600m -Xms180m
|
||||
set priolvl=10
|
||||
set priority=/BELOWNORMAL
|
||||
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
|
||||
if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
||||
|
||||
:STARTJAVA
|
||||
set javacmd=%javacmd% -Xss256k -XX:MaxPermSize=256m -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
|
||||
Rem Starting YaCy
|
||||
Echo Generated classpath:%CLASSPATH%
|
||||
Echo JRE Parameters:%javacmd%
|
||||
Echo Priority:%priority%
|
||||
Echo ***************************************************************************
|
||||
Echo.
|
||||
Echo If you see a message like "javaw" not found, you probably have to install Java.
|
||||
Echo.
|
||||
Echo You can download Java at http://java.com/
|
||||
Echo.
|
||||
Echo ***************************************************************************
|
||||
start %priority% javaw %javacmd% -classpath %CLASSPATH% net.yacy.yacy
|
||||
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 (
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
)
|
||||
if defined jmx set javacmd=-%jmx%
|
||||
if defined jms set javacmd=-%jms% %javacmd%
|
||||
if defined priolvl (
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
)
|
||||
|
||||
GoTo :STARTJAVA
|
||||
|
||||
Rem This target is used to concatenate the classpath parts
|
||||
:CPGEN
|
||||
Set CLASSPATH=%CLASSPATH%;%2
|
||||
|
||||
Rem Target needed to jump to the end of the file
|
||||
:END
|
||||
@Echo Off
|
||||
title YaCy
|
||||
|
||||
REM setting startup type for proper restart
|
||||
if not exist DATA md DATA
|
||||
echo . >DATA\yacy.noconsole
|
||||
|
||||
Rem Setting the classpath
|
||||
Set CLASSPATH=lib\yacycore.jar;htroot
|
||||
|
||||
REM Please change the "javastart" settings in the web-interface "Basic Configuration" -> "Advanced"
|
||||
set jmx=
|
||||
set jms=
|
||||
set javacmd=-Xmx600m -Xms180m
|
||||
set priolvl=10
|
||||
set priority=/BELOWNORMAL
|
||||
if exist DATA\SETTINGS\httpProxy.conf GoTo :RENAMEINDEX
|
||||
if exist DATA\SETTINGS\yacy.conf GoTo :GETSTARTOPTS
|
||||
|
||||
:STARTJAVA
|
||||
set javacmd=%javacmd% -Xss256k -XX:MaxPermSize=256m -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8
|
||||
Rem Starting YaCy
|
||||
Echo Generated classpath:%CLASSPATH%
|
||||
Echo JRE Parameters:%javacmd%
|
||||
Echo Priority:%priority%
|
||||
Echo ***************************************************************************
|
||||
Echo.
|
||||
Echo If you see a message like "javaw" not found, you probably have to install Java.
|
||||
Echo.
|
||||
Echo You can download Java at http://java.com/
|
||||
Echo.
|
||||
Echo ***************************************************************************
|
||||
start %priority% javaw %javacmd% -classpath %CLASSPATH% net.yacy.yacy
|
||||
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 (
|
||||
if "%%i"=="javastart_Xmx" set jmx=%%j
|
||||
if "%%i"=="javastart_Xms" set jms=%%j
|
||||
if "%%i"=="javastart_priority" set priolvl=%%j
|
||||
)
|
||||
if defined jmx set javacmd=-%jmx%
|
||||
if defined jms set javacmd=-%jms% %javacmd%
|
||||
if defined priolvl (
|
||||
if %priolvl% == 20 set priority=/LOW
|
||||
if %priolvl% == 10 set priority=/BELOWNORMAL
|
||||
)
|
||||
|
||||
GoTo :STARTJAVA
|
||||
|
||||
Rem Target needed to jump to the end of the file
|
||||
:END
|
||||
|
|
31
stopYACY.bat
31
stopYACY.bat
|
@ -1,21 +1,10 @@
|
|||
@Echo Off
|
||||
title YaCy
|
||||
If %1.==CPGEN. GoTo :CPGEN
|
||||
|
||||
Rem Generating the proper classpath unsing loops and labels
|
||||
Set CLASSPATH=classes;htroot
|
||||
For %%X in (lib/*.jar) Do Call %0 CPGEN lib\%%X
|
||||
For %%X in (libx/*.jar) Do Call %0 CPGEN libx\%%X
|
||||
|
||||
Rem Stopping yacy
|
||||
Echo Generated Classpath:%CLASSPATH%
|
||||
java -classpath %CLASSPATH% net.yacy.yacy -shutdown
|
||||
|
||||
GoTo :END
|
||||
|
||||
Rem This target is used to concatenate the classpath parts
|
||||
:CPGEN
|
||||
Set CLASSPATH=%CLASSPATH%;%2
|
||||
|
||||
Rem Target needed to jump to the end of the file
|
||||
:END
|
||||
@Echo Off
|
||||
title YaCy
|
||||
|
||||
Rem Setting the classpath
|
||||
Set CLASSPATH=classes;lib\yacycore.jar;htroot
|
||||
|
||||
Rem Stopping yacy
|
||||
Echo Generated Classpath:%CLASSPATH%
|
||||
java -classpath %CLASSPATH% net.yacy.yacy -shutdown
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user