Fix clear year and month field when converting to biblatex #6434

catarinagomespt · 2020-05-06T23:51:09Z

After Cleanup entries with the selected option -> "Convert to biblatex format (for example, move the value of the 'journal' field to 'journal tile')
Should have two behaviours:

if the field date is filled: remains the date and removes the year and month fields;
if the field date is blank: sets the date value and removes the year and month fields.

Change in CHANGELOG.md described (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for UI changes)
Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

calixtus

Looks good to me. Thank you very much.
Please add a changelog entry and this PR should be mergeable.

…6224

catarinagomespt · 2020-05-07T11:42:25Z

Looks good to me. Thank you very much.
Please add a changelog entry and this PR should be mergeable.

@calixtus
Done. I changed and pushed Changelog.md file with the description of the issue solved.
Please confirm. Thanks

tobiasdiez

Thanks for your contribution. I think there should be one additional check for consistent information before cleaning the month/year field. Moreover, can you please add a unit test for your change. Thanks!

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java

CHANGELOG.md

silverhorse · 2020-05-07T21:14:30Z

ConvertToBiblatexCleanupTest.cleanupWithDateAlreadyPresentDoesNothing() needs to be fixed to assert that year and month are empty when all 3 date, year, month are present. May be add more test as per changes requested. I started fixing the issue at the same time as you @catarinagomespt :)

…ed the year and month fields

… Removes Year And Month

catarinagomespt · 2020-05-08T00:34:11Z

@tobiasdiez
Summarize:

Added additional check before cleaning month/year field:

Check if the date field is filled
Check if the date field is equal to year
Check if the year field is not empty

Added a unit test for the change.
Thanks!

catarinagomespt · 2020-05-08T00:35:56Z

Thanks @silverhorse. I already saw the ConvertToBiblatexCleanupTest tests.

…imports

…6224

calixtus

Just one nitpick, besides that, looks good to me. Again. 😉

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java

koppor

Thank you for taking the challange to contribute to JabRef!

I just checked the BibLaTeX manual: It supports having year and month in the date field:

See also the test case cleanupMovesYearMonthToDate.

Thus, the code should be adapted: If year is present in the date field, copy over the month value to the date field. Log a warning if the month differs. No need for a user warning, because this will be seldom. - Nevertheless, I would question the functionality of JabRef if it silently removes the month value in the case it exists just in the month field.

…6224

src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java

koppor · 2020-05-12T05:01:51Z

Tests currently failing. Think @catarinagomespt is working on it.

tobiasdiez · 2020-05-12T19:30:43Z

@catarinagomespt why did you removed the new tests? I think they were pretty good and important to verify that the implementation is also working in certain edge cases.

…6224

catarinagomespt

@tobiasdiez
I put it back.

src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java

catarinagomespt

@tobiasdiez @silverhorse
Now, i check if month or year are different from date do not overwrite/ move, avoiding inconsistent data.

Siedlerchr

See my comment, that allows you to simplify your code

src/main/java/org/jabref/model/entry/Date.java

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java

…6224

tobiasdiez

Thanks!

* upstream/master: (50 commits) Keep group pane size when resizing window (#6180) (#6423) Changelog: Fix missing citation for biblatex-mla Update AUTHORS Check duplicate DOI (#6333) Fix missing citation for biblatex-mla Change EasyBind dependency (#6480) Add testing of latest dev version as mandatory Squashed 'src/main/resources/csl-styles/' changes from 5dad23d..586e0b8 Fix libre office connection and other progress dialogs (#6478) Fix clear year and month field when converting to biblatex (#6434) Add truncate as a BibTex key modifier (#6427) Add new authors (not all - they need more work) Remove empty line Add simple Unit Tests for #6207 (#6240) Enforce LeftCurly rule (#6452) Implement task progress indicator (and dialog) in the toolbar (#6443) Consider empty brackets Changelog update Added a test Fixed brackets in regular expressions ...

e9fd2027de Add Medicine Publishing Styles (#6434) cae128f35f Create Bristol University Press (#6356) 74b4af3b82 Create internet-archaeology.csl (#6357) ee7ece480b Add Bio-Protocol style (#6429) 9a455efcee Create archives-of-medical-research.csl (#6415) e91aba46fc Remove some bursa-uludag styles (#6423) 03f3962657 Update offa.csl (#6428) 95dc9b9f5a Update journal-of-neolithic-archaeology.csl (#6427) a4e6c7f477 Update the-university-of-winchester-harvard.csl (#6374) c0bf10647a add manuscript formatting to ASA (#6387) 3a673a564a Update universite-de-sherbrooke-histoire.csl (#6392) 0c48c7289e Update chemistry-education-research-and-practice.csl (#6397) 51f718a7b9 Update journal-of-endodontics.csl (#6409) 51e419051f Update presses-universitaires-de-rennes.csl (#6413) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: e9fd2027de4e2355f3244ac662960467e225774d

catarinagomespt added 2 commits May 7, 2020 00:36

ISSUE :: 6224 - allow merging of year and date if identical

788f395

fix comment

05518d2

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 7, 2020

Siedlerchr changed the title ~~Fix for issue 6224~~ Fix clear year and month field when converting to biblatex May 7, 2020

calixtus requested changes May 7, 2020

View reviewed changes

catarinagomespt added 2 commits May 7, 2020 12:30

Merge branch 'master' of github.com:JabRef/jabref into fix-for-issue-…

e1cfa25

…6224

Updated Changelog.md file with fixed issue

93de4bc

tobiasdiez requested changes May 7, 2020

View reviewed changes

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

tobiasdiez added the status: changes required Pull requests that are not yet complete label May 7, 2020

Fix changelog.md file

29ae438

catarinagomespt added 2 commits May 8, 2020 01:17

Check If date field is filled and is equal to year it should be remov…

559e749

…ed the year and month fields

Added unit test: Cleanup With Date Already Present And Equals To Year…

c4a4b15

… Removes Year And Month

catarinagomespt added 4 commits May 8, 2020 01:39

ISSUE :: 6224 - Removed Unused import - java.util.Optional

e810e1e

ISSUE :: 6224 - Separated org.jabref.model.FieldChange from previous …

8750df7

…imports

Merge branch 'master' of github.com:JabRef/jabref into fix-for-issue-…

433e800

…6224

remove checkstyle warning

bf16459

calixtus reviewed May 8, 2020

View reviewed changes

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java Outdated Show resolved Hide resolved

Change variable newYear name

0eb5906

calixtus approved these changes May 8, 2020

View reviewed changes

calixtus removed the status: changes required Pull requests that are not yet complete label May 8, 2020

koppor requested changes May 8, 2020

View reviewed changes

koppor removed the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label May 8, 2020

catarinagomespt added 2 commits May 9, 2020 16:59

Merge branch 'master' of github.com:JabRef/jabref into fix-for-issue-…

1628f21

…6224

Update Changelog.md

5b1c852

tobiasdiez requested changes May 9, 2020

View reviewed changes

src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java Outdated Show resolved Hide resolved

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java Outdated Show resolved Hide resolved

ISSUE :: 6224 - Added month validation and tests

05c86c2

ISSUE :: 6224 - For inconsistent data: Do not overwrite/move

fb75aa5

catarinagomespt added 4 commits May 12, 2020 20:33

ISSUE :: 6224 - Fix Test

3541c2f

Merge branch 'master' of github.com:JabRef/jabref into fix-for-issue-…

23b9878

…6224

ISSUE :: 6224 - Added month checking Test

935f656

ISSUE :: 6224 - Fix Test

c2b1950

catarinagomespt commented May 12, 2020

View reviewed changes

src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java Outdated Show resolved Hide resolved

catarinagomespt commented May 12, 2020

View reviewed changes

Siedlerchr requested changes May 13, 2020

View reviewed changes

src/main/java/org/jabref/model/entry/Date.java Show resolved Hide resolved

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java Outdated Show resolved Hide resolved

catarinagomespt added 3 commits May 13, 2020 20:04

ISSUE :: 6224 - Change Date.parse

5604f3c

ISSUE :: 6224 - Update Date class

28e9c6d

ISSUE :: 6224 - Fix Date

3c0d2a4

Siedlerchr reviewed May 13, 2020

View reviewed changes

src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java Show resolved Hide resolved

catarinagomespt added 2 commits May 14, 2020 00:02

ISSUE :: 6224 - Added new test

3b910f6

Merge branch 'master' of github.com:JabRef/jabref into fix-for-issue-…

440db88

…6224

catarinagomespt requested review from koppor, calixtus, tobiasdiez and Siedlerchr May 13, 2020 23:32

Siedlerchr approved these changes May 14, 2020

View reviewed changes

tobiasdiez approved these changes May 14, 2020

View reviewed changes

tobiasdiez merged commit 09111be into JabRef:master May 14, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix clear year and month field when converting to biblatex #6434

Fix clear year and month field when converting to biblatex #6434

catarinagomespt commented May 6, 2020 •

edited

Loading

calixtus left a comment

catarinagomespt commented May 7, 2020 •

edited

Loading

tobiasdiez left a comment

silverhorse commented May 7, 2020

catarinagomespt commented May 8, 2020

catarinagomespt commented May 8, 2020

calixtus left a comment

koppor left a comment

koppor commented May 12, 2020

tobiasdiez commented May 12, 2020

catarinagomespt left a comment

catarinagomespt left a comment

Siedlerchr left a comment

tobiasdiez left a comment

Fix clear year and month field when converting to biblatex #6434

Fix clear year and month field when converting to biblatex #6434

Conversation

catarinagomespt commented May 6, 2020 • edited Loading

calixtus left a comment

Choose a reason for hiding this comment

catarinagomespt commented May 7, 2020 • edited Loading

tobiasdiez left a comment

Choose a reason for hiding this comment

silverhorse commented May 7, 2020

catarinagomespt commented May 8, 2020

catarinagomespt commented May 8, 2020

calixtus left a comment

Choose a reason for hiding this comment

koppor left a comment

Choose a reason for hiding this comment

koppor commented May 12, 2020

tobiasdiez commented May 12, 2020

catarinagomespt left a comment

Choose a reason for hiding this comment

catarinagomespt left a comment

Choose a reason for hiding this comment

Siedlerchr left a comment

Choose a reason for hiding this comment

tobiasdiez left a comment

Choose a reason for hiding this comment

catarinagomespt commented May 6, 2020 •

edited

Loading

catarinagomespt commented May 7, 2020 •

edited

Loading