|
8 | 8 | import java.util.Locale; |
9 | 9 | import java.util.Optional; |
10 | 10 | import java.util.concurrent.Callable; |
| 11 | +import java.util.stream.Collectors; |
11 | 12 |
|
12 | 13 | import org.jabref.cli.converter.CygWinPathConverter; |
13 | 14 | import org.jabref.logic.importer.ParserResult; |
@@ -48,11 +49,12 @@ class CheckIntegrity implements Callable<Integer> { |
48 | 49 | private String outputFormat; |
49 | 50 |
|
50 | 51 | // in BibTeX it could be preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex() |
51 | | - @Option(names = {"--allow-integer-edition"}, description = "Allows Integer edition: true or false", defaultValue = "true") |
52 | | - private boolean allowIntegerEdition = true; |
| 52 | + @Option(names = {"--allow-integer-edition"}, description = "Allows Integer edition", negatable = true, defaultValue = "true", fallbackValue = "true") |
| 53 | + private boolean allowIntegerEdition; |
53 | 54 |
|
54 | 55 | @Override |
55 | 56 | public Integer call() { |
| 57 | + System.err.println(allowIntegerEdition); |
56 | 58 | Optional<ParserResult> parserResult = ArgumentProcessor.importFile( |
57 | 59 | inputFile, |
58 | 60 | "bibtex", |
@@ -83,7 +85,11 @@ public Integer call() { |
83 | 85 | allowIntegerEdition |
84 | 86 | ); |
85 | 87 |
|
86 | | - List<IntegrityMessage> messages = integrityCheck.checkDatabase(databaseContext.getDatabase()); |
| 88 | + List<IntegrityMessage> messages = databaseContext.getEntries().stream() |
| 89 | + .flatMap(entry -> integrityCheck.checkEntry(entry).stream()) |
| 90 | + .collect(Collectors.toList()); |
| 91 | + |
| 92 | + messages.addAll(integrityCheck.checkDatabase(databaseContext.getDatabase())); |
87 | 93 |
|
88 | 94 | Writer writer = new OutputStreamWriter(System.out); |
89 | 95 | IntegrityCheckResultWriter checkResultWriter; |
|
0 commit comments