mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
- fixed bug with constraint default
- 0.556 - default RAM for pro releases now 120MB (because pro will become default) git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4258 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
parent
2954f96fae
commit
515e1bde6d
|
@ -3,7 +3,7 @@ javacSource=1.4
|
||||||
javacTarget=1.4
|
javacTarget=1.4
|
||||||
|
|
||||||
# Release Configuration
|
# Release Configuration
|
||||||
releaseVersion=0.555
|
releaseVersion=0.556
|
||||||
releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
||||||
proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
proReleaseFile=yacy_pro_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz
|
||||||
releaseFileParentDir=yacy
|
releaseFileParentDir=yacy
|
||||||
|
|
23
build.xml
23
build.xml
|
@ -19,34 +19,15 @@
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
# (at your option) any later version.
|
# (at your option) any later version.
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#
|
|
||||||
# Using this software in any meaning (reading, learning, copying, compiling,
|
|
||||||
# running) means that you agree that the Author(s) is (are) not responsible
|
|
||||||
# for cost, loss of data or any harm that may be caused directly or indirectly
|
|
||||||
# by usage of this softare or this documentation. The usage of this software
|
|
||||||
# is on your own risk. The installation and usage (starting/running) of this
|
|
||||||
# software may allow other people or application to access your computer and
|
|
||||||
# any attached devices and is highly dependent on the configuration of the
|
|
||||||
# software which must be done by the user of the software; the author(s) is
|
|
||||||
# (are) also not responsible for proper configuration and usage of the
|
|
||||||
# software, even if provoked by documentation provided together with
|
|
||||||
# the software.
|
|
||||||
#
|
|
||||||
# Any changes to this file according to the GPL as documented in the file
|
|
||||||
# gpl.txt aside this file in the shipment you received can be done to the
|
|
||||||
# lines that follows this copyright notice here, but changes must not be
|
|
||||||
# done inside the copyright notive above. A re-distribution must contain
|
|
||||||
# the intact and unchanged copyright notice.
|
|
||||||
# Contributions and changes to the program code must be marked as such.
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- defining the timestamp format -->
|
<!-- defining the timestamp format -->
|
||||||
|
|
|
@ -63,7 +63,7 @@ public class index {
|
||||||
final int time = Math.min(60, (post == null) ? (int) sb.getConfigLong("network.unit.search.time", 3) : post.getInt("time", (int) sb.getConfigLong("network.unit.search.time", 3)));
|
final int time = Math.min(60, (post == null) ? (int) sb.getConfigLong("network.unit.search.time", 3) : post.getInt("time", (int) sb.getConfigLong("network.unit.search.time", 3)));
|
||||||
final String urlmaskfilter = (post == null) ? ".*" : post.get("urlmaskfilter", ".*");
|
final String urlmaskfilter = (post == null) ? ".*" : post.get("urlmaskfilter", ".*");
|
||||||
final String prefermaskfilter = (post == null) ? "" : post.get("prefermaskfilter", "");
|
final String prefermaskfilter = (post == null) ? "" : post.get("prefermaskfilter", "");
|
||||||
final String constraint = (post == null) ? null : post.get("constraint", null);
|
final String constraint = (post == null) ? "" : post.get("constraint", "");
|
||||||
final String cat = (post == null) ? "href" : post.get("cat", "href");
|
final String cat = (post == null) ? "href" : post.get("cat", "href");
|
||||||
final int type = (post == null) ? 0 : post.getInt("type", 0);
|
final int type = (post == null) ? 0 : post.getInt("type", 0);
|
||||||
|
|
||||||
|
|
|
@ -644,8 +644,8 @@ ramCacheProfiles_time= 500
|
||||||
# othervise the YaCy-internal memory supervision does not work
|
# othervise the YaCy-internal memory supervision does not work
|
||||||
javastart_Xmx=Xmx96m
|
javastart_Xmx=Xmx96m
|
||||||
javastart_Xms=Xms96m
|
javastart_Xms=Xms96m
|
||||||
javastart_Xmx__pro=Xmx512m
|
javastart_Xmx__pro=Xmx120m
|
||||||
javastart_Xms__pro=Xms512m
|
javastart_Xms__pro=Xms120m
|
||||||
|
|
||||||
# priority of the yacy-process
|
# priority of the yacy-process
|
||||||
# is valid in unix/shell and windows environments but
|
# is valid in unix/shell and windows environments but
|
||||||
|
|
Loading…
Reference in New Issue
Block a user