Skip to content

Feature/enable lucene query parsing#6799

Merged
koppor merged 25 commits into
JabRef:masterfrom
DominikVoigt:feature/enable-lucene-query-parsing
Aug 31, 2020
Merged

Feature/enable lucene query parsing#6799
koppor merged 25 commits into
JabRef:masterfrom
DominikVoigt:feature/enable-lucene-query-parsing

Conversation

@DominikVoigt

@DominikVoigt DominikVoigt commented Aug 27, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

This PR enables the conversion of user queries, formulated in a simplified lucene syntax (see ADR 0014), into complex search queries for fetchers. Refs JabRef#456.

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • 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.

github actions and others added 11 commits August 1, 2020 02:13
Squashed 'src/main/resources/csl-styles/' changes from bf698ac..827b986
c8ebc91 
827b986 add DOI preprint to american-society-for-microbiology.csl (JabRef#4946)
7cab2f7 Create depro-ufs.csl (JabRef#4947)
2fcda1f Create journal-of-sport-science-and-medicine.csl (JabRef#4949)
cd457d4 Update american-marketing-association.csl (JabRef#4945)
cacc4ee Create nejm-catalyst.csl (JabRef#4943)
bd769b9 Update and rename dependent/chinese-medical-journal.csl to chinese-me… (JabRef#4941)
1f706cd Update health-services-research.csl (JabRef#4939)
76bcd1d Update journal-of-the-royal-society-of-western-australia.csl (JabRef#4932)
e79640e Create afro-asia.csl (JabRef#4934)
c601aa4 Update lancaster-university-harvard.csl (JabRef#4938)
184fd90 Update collection-du-centre-jean-berard.csl (JabRef#4936)
82f9aec fix et-al & add DOI thyroid.csl (JabRef#4937)
4af169f Create universidade-estadual-de-alagoas-uneal-abnt (JabRef#4885)
47165b3 Update and rename medical-physics.csl to dependent/medical-physics.csl (AMA) (JabRef#4905)
3cab27d Update thieme-german.csl (JabRef#4931)
eb2c977 Create zeitschrift-fur-zahnarztliche-implantologie.csl (JabRef#4925)
4adb1ea Create karstenia.csl (JabRef#4929)
530a136 Fix author substitute in Universita Cattolica

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 827b986
Merge commit 'c8ebc91d4799e59518ac887f69e584040cf29994'
f5f02cf
Squashed 'src/main/resources/csl-styles/' changes from 827b986..eb0d37e
37c2d64 
eb0d37e Create natbib-plainnat-author-dat.csl (JabRef#4967)
fb1592a Update journal-of-fish-biology.csl (JabRef#4969)
f6876cb Update .travis.yml (JabRef#4970)
d6d400b Create london-review-of-international-law.csl (JabRef#4966)
d2a5ae1 Update harvard-stellenbosch-university.csl (JabRef#4965)
9c62141 Create phytopathologia-mediterranea.csl (JabRef#4964)
8ca2ea1 Update historical-materialism.csl (JabRef#4960)
80456dc Update historical-materialism.csl
be2d910 Update historical-materialism.csl
1d1cf09 Create atlande.csl (JabRef#4930)
89f41d4 Create juristische-zitierweise-oeffentliches-recht.csl (JabRef#4944)
8c677a0 Create korean-journal-of-gastroenterology.csl (JabRef#4954)
eadb950 Create historical-materialism.csl (JabRef#4955)
5553dcd Create revista-materia.csl (JabRef#4957)
d23a3ab Bug fix in APA 6 original publication macro (JabRef#4959)
66f9974 Always print publisher in APA 6th edition (JabRef#4899)
868809c Create agora.csl (JabRef#4940)
99c19c3 Update anthropologie-et-societes.csl (JabRef#4952)
ee17423 Create critical-reviews-in-solid-state-and-materials-science.csl (JabRef#4951)
7a13a7d Create korean-journal-of-internal-medicine.csl (JabRef#4953)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: eb0d37e
Merge commit '37c2d64e449ef617bb98c0ad3b39a903d8f3d886' into master
b85ebe3
@DominikVoigt
Merge remote-tracking branch 'upstream/master'
f10ea5f
@DominikVoigt
Enable Query String into ComplexQuery parsing using lucene.
172b113 
Fix some FetcherTests.

Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Add ADR
90a629e 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Add Changelog entry
3af3781 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Merge remote-tracking branch 'upstream/master' into feature/enable-lu…
26851a7 
…cene-query-parsing
@DominikVoigt
Move Changelog entry
8468ad4 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Increment ADR number
d592a47 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
tobiasdiez
tobiasdiez requested changes Aug 27, 2020
View reviewed changes

@tobiasdiez tobiasdiez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! This looks nice, and is a really helpful addition for the user. I've some remarks, but they are mostly minor.

Do you want to develop the user interface also in this PR, or do you plan to have a follow-up PR?

Comment thread src/main/java/org/jabref/logic/importer/QueryConverter.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/QueryConverter.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
Comment thread src/test/java/org/jabref/logic/importer/QueryConverterTest.java Outdated
Comment thread src/test/java/org/jabref/logic/importer/QueryConverterTest.java Outdated
@DominikVoigt
Remove Optional from Lists
4610451 
Rename QueryConverter to QueryParser
Modify parser tests to compare complex queries
Make complex query construction from terms independent from normal building

Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt

DominikVoigt commented Aug 27, 2020

Copy link
Copy Markdown
Contributor Author

Thanks for the comments! :)
I added all of your suggestions.
The UI changes will be added as a follow-up PR.

tobiasdiez
tobiasdiez requested changes Aug 27, 2020
View reviewed changes

@tobiasdiez tobiasdiez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good to me now.

There are the two things that slipped through the rename, if this is fixed and 5.1 released, then this can be merged.

Comment thread src/test/java/org/jabref/logic/importer/QueryParserTest.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/QueryParser.java Outdated
@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 27, 2020
@DominikVoigt
Rename slipped occurences of converter
86c6576 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
Siedlerchr
Siedlerchr approved these changes Aug 28, 2020
View reviewed changes

@Siedlerchr Siedlerchr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I would say, we merge this after the release of 5.1

@Siedlerchr Siedlerchr added this to the v5.2 milestone Aug 28, 2020
@DominikVoigt DominikVoigt mentioned this pull request Aug 28, 2020
Merged
5 tasks
@koppor koppor removed the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 28, 2020
@Siedlerchr

Siedlerchr commented Aug 29, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Maybe also Refs #840 I don't know if this is already possible. If yes, then we can close that super old issue.
Refs/Fixes probably #1975 as well.

DominikVoigt and others added 6 commits August 30, 2020 14:05
@DominikVoigt
Mapping of unknown fields onto default field
0642d49 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Ignores unknown fields
11afbe9 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@koppor
Merge branch 'master' into feature/enable-lucene-query-parsing
6fde881
@DominikVoigt
Merge remote-tracking branch 'upstream/master' into feature/enable-lu…
e27ebcc 
…cene-query-parsing
@DominikVoigt
Fix checkstyle issues
239095e 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@koppor
Merge branch 'master' into feature/enable-lucene-query-parsing
467cbfc
koppor
koppor requested changes Aug 31, 2020
View reviewed changes

@koppor koppor left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some improvement suggestions at the ADR

Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread docs/adr/0015-support-an-abstract-query-syntax-for-query-conversion.md Outdated
Comment thread src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java Outdated
Comment thread src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java Outdated
DominikVoigt and others added 4 commits August 31, 2020 13:11
@DominikVoigt @koppor
Apply suggestions from code review
542d3a7 
Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
@DominikVoigt
Handle year-range parsing in a more robust way
4b2ab98 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Move extracted method into builder
8b3b7cd 
Signed-off-by: Dominik Voigt <dominik.ingo.voigt@gmail.com>
@DominikVoigt
Merge branch 'feature/enable-lucene-query-parsing' of https://github.…
ec60734 
…com/DominikVoigt/jabref into feature/enable-lucene-query-parsing
@koppor koppor merged commit dfefd4d into JabRef:master Aug 31, 2020
@koppor

koppor commented Aug 31, 2020

Copy link
Copy Markdown
Member

This refs https://github.com/koppor/jabref/issues/341.

Siedlerchr added a commit that referenced this pull request Aug 31, 2020
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into writebackupToTemp
548fac1 
* upstream/master: (120 commits)
  Follow up fix for copy paste (#6820)
  Add CSS Customisation (#6725)
  Separate signing and notarizing (#6822)
  Remove checkstyle hack. 8.36 got released (#6816)
  Feature/enable lucene query parsing (#6799)
  New release cycle
  Bump WyriHaximus/github-action-wait-for-status from v1.1.2 to v1.2 (#6814)
  Bump mockito-core from 3.5.5 to 3.5.7 (#6813)
  Bump classgraph from 4.8.87 to 4.8.89 (#6812)
  Bump me.champeau.gradle.jmh from 0.5.0 to 0.5.1 (#6811)
  Bump checkstyle from 8.35 to 8.36 (#6810)
  Improve Changelog
  Refactor edit action (#6808)
  Fixed typo in BuildInfo (#6807)
  disable checkstyle for generated
  fix checkstyle
  Simplify check-links.yaml (markdown-link-check) (#6720)
  Rename /gen to /generate (#6800)
  Disable CSL refresh on push (#6803)
  New Crowdin updates (#6804)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
@koppor koppor mentioned this pull request Dec 28, 2020
Closed
@DominikVoigt DominikVoigt deleted the feature/enable-lucene-query-parsing branch January 1, 2021 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@koppor koppor koppor requested changes

@Siedlerchr Siedlerchr Siedlerchr approved these changes

@tobiasdiez tobiasdiez tobiasdiez approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v5.2

Development

Successfully merging this pull request may close these issues.

4 participants

@DominikVoigt @Siedlerchr @koppor @tobiasdiez