mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-21 00:00:13 +02:00
Merge remote-tracking branch 'origin/master' into jetty
This commit is contained in:
commit
13fc86c960
|
@ -141,10 +141,12 @@ public class searchresult {
|
|||
String origfq = post.get(CommonParams.FQ);
|
||||
String datefq = "";
|
||||
for (String dr: daterange) {
|
||||
String from_to[] = dr.split("\\.\\.");
|
||||
String from_to[] = dr.endsWith("..") ? new String[]{dr.substring(0, dr.length() - 2), ""} : dr.startsWith("..") ? new String[]{"", dr.substring(2)} : dr.split("\\.\\.");
|
||||
if (from_to.length != 2) continue;
|
||||
Date from = HeaderFramework.parseGSAFS(from_to[0]); if (from == null) continue;
|
||||
Date to = HeaderFramework.parseGSAFS(from_to[1]); if (to == null) continue;
|
||||
Date from = HeaderFramework.parseGSAFS(from_to[0]);
|
||||
if (from == null) from = new Date(0);
|
||||
Date to = HeaderFramework.parseGSAFS(from_to[1]);
|
||||
if (to == null) to = new Date();
|
||||
to.setTime(to.getTime() + 24L * 60L * 60L * 1000L); // we add a day because the day is inclusive
|
||||
String z = CollectionSchema.last_modified.getSolrFieldName() + ":[" + ISO8601Formatter.FORMATTER.format(from) + " TO " + ISO8601Formatter.FORMATTER.format(to) + "]";
|
||||
datefq = datefq.length() == 0 ? z : " OR " + z;
|
||||
|
|
|
@ -34,7 +34,6 @@ public class RequestHeader extends HeaderFramework {
|
|||
public static final String CONNECTION = "Connection";
|
||||
public static final String PROXY_CONNECTION = "Proxy-Connection";
|
||||
public static final String KEEP_ALIVE = "Keep-Alive";
|
||||
public static final String USER_AGENT = "User-Agent";
|
||||
|
||||
public static final String AUTHORIZATION = "Authorization";
|
||||
public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
|
||||
|
|
|
@ -83,7 +83,7 @@ public final class Cache {
|
|||
// open the response header database
|
||||
final File dbfile = new File(cachePath, RESPONSE_HEADER_DB_NAME);
|
||||
try {
|
||||
responseHeaderDB = new MapHeap(dbfile, Word.commonHashLength, Base64Order.enhancedCoder, 1024 * 1024, 100, ' ');
|
||||
responseHeaderDB = new MapHeap(dbfile, Word.commonHashLength, Base64Order.enhancedCoder, 2048, 100, ' ');
|
||||
} catch (final IOException e) {
|
||||
ConcurrentLog.logException(e);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user