Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix aux duplicates #2480

Merged
merged 2 commits into from
Jan 23, 2017
Merged

Fix aux duplicates #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ee181b
Do not add duplicates of entry that have already been found via crossref
lenhard Jan 23, 2017
9747677
Add Changelog entry
lenhard Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
- If one deleted the current query it was not saved (every basepanel can have it's own query). Fixes [#2468](https://github.com/JabRef/jabref/issues/2468).
- The [ACM fetcher](https://help.jabref.org/en/ACMPortal) does no longer add HTML code to the bib-file. Fixes [#2472](https://github.com/JabRef/jabref/issues/2472)
- When [finding unlinked files](https://help.jabref.org/en/FindUnlinkedFiles), JabRef does not freeze any more. Fixes [#2309]()https://github.com/JabRef/jabref/issues/2309)
- Collapse and expand all buttons in the group assignment dialog no longer lead to a crash of JabRef.
- Collapse and expand all buttons in the group assignment dialog no longer lead to a crash of JabRef.
- Fixes [#2475](https://github.com/JabRef/jabref/issues/2475): The aux export command line function does no longer add duplicates of references that were resolved via crossref

### Removed

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/sf/jabref/logic/auxparser/AuxParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ private void resolveTags(AuxParserResult result) {
for (String key : result.getUniqueKeys()) {
Optional<BibEntry> entry = masterDatabase.getEntryByKey(key);

if (entry.isPresent()) {
if(result.getGeneratedBibDatabase().getEntryByKey(key).isPresent()) {
// do nothing, key has already been processed
} else if (entry.isPresent()) {
insertEntry(entry.get(), result);
resolveCrossReferences(entry.get(), result);
} else {
Expand Down