0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#376 : add paramMap

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-02-21 00:03:36 +09:00
parent 45b4054aeb
commit ddee56806f
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/ds/IndexUpdateCallback.java
View file

@ -19,7 +19,7 @@ import java.util.Map;
public interface IndexUpdateCallback {
boolean store(Map<String, Object> dataMap);
boolean store(Map<String, String> paramMap, Map<String, Object> dataMap);
long getDocumentSize();

2
src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
View file

@ -234,7 +234,7 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
}
try {
loop = callback.store(dataMap);
loop = callback.store(paramMap, dataMap);
} catch (final CrawlingAccessException e) {
logger.warn("Crawling Access Exception at : " + dataMap, e);

2
src/main/java/org/codelibs/fess/ds/impl/DatabaseDataStoreImpl.java
View file

@ -110,7 +110,7 @@ public class DatabaseDataStoreImpl extends AbstractDataStoreImpl {
}
try {
loop = callback.store(dataMap);
loop = callback.store(paramMap, dataMap);
} catch (final Exception e) {
logger.warn("Failed to store data: " + dataMap, e);
}

18
src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java
View file

@ -143,22 +143,22 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
}
@Override
public boolean store(final Map<String, Object> dataMap) {
public boolean store(final Map<String, String> paramMap, final Map<String, Object> dataMap) {
final Object eventType = dataMap.remove(eventTypeField);
if (createEventName.equals(eventType) || modifyEventName.equals(eventType)) {
// updated file
return addDocument(dataMap);
return addDocument(paramMap, dataMap);
} else if (deleteEventName.equals(eventType)) {
// deleted file
return deleteDocument(dataMap);
return deleteDocument(paramMap, dataMap);
}
logger.warn("unknown event: " + eventType + ", data: " + dataMap);
return false;
}
protected boolean addDocument(final Map<String, Object> dataMap) {
protected boolean addDocument(final Map<String, String> paramMap, final Map<String, Object> dataMap) {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
synchronized (indexUpdateCallback) {
// required check
@ -178,7 +178,11 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
final long startTime = System.currentTimeMillis();
final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build());
responseData.setExecutionTime(System.currentTimeMillis() - startTime);
responseData.setSessionId((String) dataMap.get(Constants.CRAWLING_INFO_ID));
if (dataMap.containsKey(Constants.SESSION_ID)) {
responseData.setSessionId((String) dataMap.get(Constants.SESSION_ID));
} else {
responseData.setSessionId((String) paramMap.get(Constants.CRAWLING_INFO_ID));
}
final RuleManager ruleManager = SingletonLaContainer.getComponent(RuleManager.class);
final Rule rule = ruleManager.getRule(responseData);
@ -208,7 +212,7 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
dataMap.remove(fieldName);
}
return indexUpdateCallback.store(dataMap);
return indexUpdateCallback.store(paramMap, dataMap);
} else {
logger.warn("The response processor is not DefaultResponseProcessor. responseProcessor: " + responseProcessor
+ ", Data: " + dataMap);
@ -221,7 +225,7 @@ public class FileListDataStoreImpl extends CsvDataStoreImpl {
}
}
protected boolean deleteDocument(final Map<String, Object> dataMap) {
protected boolean deleteDocument(final Map<String, String> paramMap, final Map<String, Object> dataMap) {
if (logger.isDebugEnabled()) {
logger.debug("Deleting " + dataMap);

2
src/main/java/org/codelibs/fess/ds/impl/IndexUpdateCallbackImpl.java
View file

@ -45,7 +45,7 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
* @see org.codelibs.fess.ds.impl.IndexUpdateCallback#store(java.util.Map)
*/
@Override
public synchronized boolean store(final Map<String, Object> dataMap) {
public synchronized boolean store(final Map<String, String> paramMap, final Map<String, Object> dataMap) {
final long startTime = System.currentTimeMillis();
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final FessEsClient fessEsClient = ComponentUtil.getElasticsearchClient();