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

#217

Browse source
This commit is contained in:
Shinsuke Sugaya 2014-10-29 06:37:50 +09:00
parent 0dcfcbdb11
commit bda72c02ea
4 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/jp/sf/fess/action/admin/SuggestBadWordAction.java
View file

@ -224,24 +224,18 @@ public class SuggestBadWordAction extends BsSuggestBadWordAction {
final HttpServletResponse response = ResponseUtil.getResponse();
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment; filename=\""
+ "suggestbadword.csv" + "\"");
+ "badword.csv" + "\"");
Writer writer = null;
try {
writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
try (Writer writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8)))) {
suggestBadWordService.exportCsv(writer);
writer.flush();
return null;
} catch (final Exception e) {
log.error("Failed to export data.", e);
throw new SSCActionMessagesException(e,
"errors.failed_to_export_data");
} finally {
IOUtils.closeQuietly(writer);
}
return null;
}
@Token(save = true, validate = false)

16
src/main/java/jp/sf/fess/action/admin/SuggestElevateWordAction.java
View file

@ -221,24 +221,18 @@ public class SuggestElevateWordAction extends BsSuggestElevateWordAction {
final HttpServletResponse response = ResponseUtil.getResponse();
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment; filename=\""
+ "suggestelevateword.csv" + "\"");
+ "elevateword.csv" + "\"");
Writer writer = null;
try {
writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY,
Constants.UTF_8)));
try (Writer writer = new BufferedWriter(new OutputStreamWriter(
response.getOutputStream(), crawlerProperties.getProperty(
Constants.CSV_FILE_ENCODING_PROPERTY, Constants.UTF_8)))) {
suggestElevateWordService.exportCsv(writer);
writer.flush();
return null;
} catch (final Exception e) {
log.error("Failed to export data.", e);
throw new SSCActionMessagesException(e,
"errors.failed_to_export_data");
} finally {
IOUtils.closeQuietly(writer);
}
return null;
}
@Token(save = true, validate = false)

8
src/main/java/jp/sf/fess/service/SuggestBadWordService.java
View file

@ -133,14 +133,15 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
cfg.setQuoteDisabled(false);
@SuppressWarnings("resource")
final CsvWriter csvWriter = new CsvWriter(writer, cfg);
final SuggestBadWordCB cb = new SuggestBadWordCB();
cb.query().setDeletedBy_IsNull();
try {
final List<String> list = new ArrayList<String>();
final List<String> list = new ArrayList<>();
list.add("SuggestWord");
list.add("Role");
list.add("Label");
csvWriter.writeValues(list);
final SuggestBadWordCB cb = new SuggestBadWordCB();
cb.query().setDeletedBy_IsNull();
suggestBadWordBhv.selectCursor(cb,
new EntityRowHandler<SuggestBadWord>() {
@Override
@ -166,6 +167,7 @@ public class SuggestBadWordService extends BsSuggestBadWordService implements
}
}
});
csvWriter.flush();
} catch (final IOException e) {
log.warn("Failed to write a sugget bad word.", e);

6
src/main/java/jp/sf/fess/service/SuggestElevateWordService.java
View file

@ -143,8 +143,6 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
cfg.setQuoteDisabled(false);
@SuppressWarnings("resource")
final CsvWriter csvWriter = new CsvWriter(writer, cfg);
final SuggestElevateWordCB cb = new SuggestElevateWordCB();
cb.query().setDeletedBy_IsNull();
try {
final List<String> list = new ArrayList<String>();
list.add("SuggestWord");
@ -153,6 +151,9 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
list.add("Label");
list.add("Boost");
csvWriter.writeValues(list);
final SuggestElevateWordCB cb = new SuggestElevateWordCB();
cb.query().setDeletedBy_IsNull();
suggestElevateWordBhv.selectCursor(cb,
new EntityRowHandler<SuggestElevateWord>() {
@Override
@ -181,6 +182,7 @@ public class SuggestElevateWordService extends BsSuggestElevateWordService
}
}
});
csvWriter.flush();
} catch (final IOException e) {
log.warn("Failed to write a sugget elevate word.", e);