Skip to content

Commit fef7e2e

Browse files
committed
updated option handling and fix check
1 parent 58aee67 commit fef7e2e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.util.Locale;
99
import java.util.Optional;
1010
import java.util.concurrent.Callable;
11+
import java.util.stream.Collectors;
1112

1213
import org.jabref.cli.converter.CygWinPathConverter;
1314
import org.jabref.logic.importer.ParserResult;
@@ -48,11 +49,12 @@ class CheckIntegrity implements Callable<Integer> {
4849
private String outputFormat;
4950

5051
// 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;
5354

5455
@Override
5556
public Integer call() {
57+
System.err.println(allowIntegerEdition);
5658
Optional<ParserResult> parserResult = ArgumentProcessor.importFile(
5759
inputFile,
5860
"bibtex",
@@ -83,7 +85,11 @@ public Integer call() {
8385
allowIntegerEdition
8486
);
8587

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()));
8793

8894
Writer writer = new OutputStreamWriter(System.out);
8995
IntegrityCheckResultWriter checkResultWriter;

jablib/src/main/java/org/jabref/logic/integrity/IntegrityCheckResultErrorFormatWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void writeFindings() throws IOException {
2727
Map<Field, ParserResult.Range> fieldRangeMap = parserResult.getFieldRanges().getOrDefault(message.entry(), Map.of());
2828
ParserResult.Range fieldRange = fieldRangeMap.getOrDefault(message.field(), fieldRangeMap.getOrDefault(InternalField.KEY_FIELD, parserResult.getArticleRanges().getOrDefault(message.entry(), ParserResult.Range.NULL_RANGE)));
2929

30-
writer.write("%s:%d:%d: %s\n".formatted(
30+
writer.append("%s:%d:%d: %s\n".formatted(
3131
inputFile,
3232
fieldRange.startLine(),
3333
fieldRange.startColumn(),

0 commit comments

Comments
 (0)