Skip to content

Commit 4393ffa

Browse files
authored
Merge branch 'main' into fix-9668
2 parents 2dcab10 + 1bba627 commit 4393ffa

File tree

15 files changed

+1683
-735
lines changed

15 files changed

+1683
-735
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ The title of the PR must not reference an issue, because GitHub does not support
1111
- [x] done; [ ] not done / not applicable
1212
-->
1313

14+
```[tasklist]
15+
### Compulsory checks
1416
- [ ] Change in `CHANGELOG.md` described in a way that is understandable for the average user (if applicable)
1517
- [ ] Tests created for changes (if applicable)
1618
- [ ] Manually tested changed features in running JabRef (always required)
1719
- [ ] Screenshots added in PR description (for UI changes)
1820
- [ ] [Checked developer's documentation](https://devdocs.jabref.org/): Is the information available and up to date? If not, I outlined it in this pull request.
1921
- [ ] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not, I created an issue at <https://github.com/JabRef/user-documentation/issues> or, even better, I submitted a pull request to the documentation repository.
22+
```

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
2424

2525
- 'Get full text' now also checks the file url. [#568](https://github.com/koppor/jabref/issues/568)
2626
- `log.txt` now contains an entry if a BibTeX entry could not be parsed.
27+
- JabRef writes a new backup file only if there is a change. Before, JabRef created a backup upon start. [#9679](https://github.com/JabRef/jabref/pull/9679)
2728
- We refined the 'main directory not found' error message. [#9625](https://github.com/JabRef/jabref/pull/9625)
2829
- We modified the `Add Group` dialog to use the most recently selected group hierarchical context [#9141](https://github.com/JabRef/jabref/issues/9141)
30+
- We improved the Medline importer to correctly import ISO dates for `revised`. [#9536](https://github.com/JabRef/jabref/issues/9536)
2931

3032

3133

build.gradle

-10
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ processResources {
259259

260260
task generateSource(dependsOn: ["generateBstGrammarSource",
261261
"generateSearchGrammarSource",
262-
"generateMedlineSource",
263262
"generateBibtexmlSource",
264263
"generateEndnoteSource",
265264
"generateModsSource",
@@ -290,15 +289,6 @@ tasks.register("generateSearchGrammarSource", JavaExec) {
290289
args = ["-o","src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"]
291290
}
292291

293-
task generateMedlineSource(type: XjcTask) {
294-
group = 'JabRef'
295-
description = "Generates java files for the medline importer."
296-
297-
schemaFile = "src/main/resources/xjc/medline/medline.xsd"
298-
outputDirectory = "src-gen/main/java"
299-
javaPackage = "org.jabref.logic.importer.fileformat.medline"
300-
}
301-
302292
task generateBibtexmlSource(type: XjcTask) {
303293
group = 'JabRef'
304294
description = "Generates java files for the bibtexml importer."

docs/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gem "jekyll", "~> 4.3" # installed by `gem jekyll`
55
# Homepage: https://github.com/paulrobertlloyd/jekyll-figure#jekyll-figure
66
gem 'jekyll-figure'
77

8-
gem "just-the-docs", "0.4.0.rc3"
8+
gem "just-the-docs", "0.4.2"
99

1010
gem "jekyll-remote-theme"
1111

src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class BackupManager {
6464
// During a write, the less recent backup file is deleted
6565
private final Queue<Path> backupFilesQueue = new LinkedBlockingQueue<>();
6666

67-
private boolean needsBackup = true;
67+
private boolean needsBackup = false;
6868

6969
BackupManager(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
7070
this.bibDatabaseContext = bibDatabaseContext;

src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java

+957-408
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.jabref.logic.importer.fileformat.medline;
2+
3+
public record ArticleId(
4+
String idType,
5+
String content
6+
) {
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.jabref.logic.importer.fileformat.medline;
2+
3+
import java.util.List;
4+
5+
public record Investigator(
6+
String lastName,
7+
String foreName,
8+
List<String> affiliationList
9+
) {
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package org.jabref.logic.importer.fileformat.medline;
2+
3+
import java.util.List;
4+
5+
public record MeshHeading(
6+
String descriptorName,
7+
List<String> qualifierNames
8+
) {
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.jabref.logic.importer.fileformat.medline;
2+
3+
public record OtherId(
4+
String source,
5+
String content
6+
) {
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.jabref.logic.importer.fileformat.medline;
2+
3+
public record PersonalNameSubject(
4+
String lastName,
5+
String foreName
6+
) {
7+
}

0 commit comments

Comments
 (0)