[go: nahoru, domu]

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.

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

Update lucene branch #11326

Draft
wants to merge 161 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
972bac7
Cleanup index when opening a library
btut Jul 9, 2022
dd81c9e
Changelog
btut Jul 9, 2022
f0c7039
Remove debug output
btut Jul 9, 2022
4e49146
Refractor to prepare for full lucene-search-backend
btut Jul 9, 2022
4c40de6
Fix infinite recursion
btut Jul 9, 2022
59047f1
Implement lucene search backend
btut Jul 9, 2022
be31a62
Consider fulltext-index-preference
btut Jul 9, 2022
e88d5d0
Better status-reporting for re-indexing on preference change
btut Jul 9, 2022
ccad245
Fix tests
btut Jul 9, 2022
6ad3c2a
Prioritize BibEntry field changes
btut Jul 9, 2022
21927c1
Prepare CHANGELOG.md
koppor Jul 10, 2022
b78d3fe
Trigger lucene-search in gui and display scoring
btut Jul 10, 2022
780f1a4
Merge branch 'version6' into luceneSearchBackend
btut Jul 10, 2022
d59d528
Don't prefix fields that users should be able to search in
btut Jul 10, 2022
006b828
Matches in bib-fields should score higher than fulltext-matches
btut Jul 12, 2022
b19be22
Refactoring
btut Aug 15, 2022
b89714a
Change file-icon if search yielded a fulltext-result
btut Aug 15, 2022
3cf15d1
Merge branch 'main' into version6
btut Aug 15, 2022
6711b40
Merge branch 'version6' into luceneSearchBackend
btut Aug 15, 2022
a9f0e75
Update index even if fulltext-index is disabled
btut Aug 15, 2022
750346f
Adapt global search
btut Aug 15, 2022
00a7110
Improved keyword indexing
btut Aug 15, 2022
60c9ed3
Remove debug output
btut Aug 15, 2022
c71b749
Improve global search
btut Aug 15, 2022
9e7a41b
Checkstyle
btut Aug 15, 2022
6ead73b
Don't listen for query-update for group-filtering
btut Aug 15, 2022
5e4a780
Switch SearchGroups to Lucene
btut Aug 15, 2022
1c69125
Implement regex-string-wrapper
btut Aug 15, 2022
fe26dd1
Remove case-sensitive search preference
btut Aug 15, 2022
d759c24
Remove case-sensitive button from group dialog
btut Aug 15, 2022
35e9715
Update tooltip
btut Aug 15, 2022
e54b4e8
Move lucene-logic out of pdf package
btut Aug 15, 2022
af4d7f4
Add floating mode
btut Aug 16, 2022
9fdcfd7
Make sorting by score optional
btut Aug 16, 2022
f308f87
Only show two decimal places of the search score
btut Aug 16, 2022
25341a1
Remove unused icon from theme
btut Aug 16, 2022
87a00c7
Gray-out non-hits
btut Aug 16, 2022
518b997
Merge remote-tracking branch 'origin/main' into version6
koppor Aug 16, 2022
4da86d8
Better floating mode
btut Aug 17, 2022
9e8d549
Fix force-score-ordering bug
btut Aug 17, 2022
a4ccaf0
Remove SearchDisplayMode
btut Aug 17, 2022
1d4bef3
Always pre- and append wildcards for simple queries
btut Sep 3, 2022
44aae6e
Rename floating search to filtering search
btut Sep 3, 2022
79e1b9d
Index groups individually
btut Sep 3, 2022
61973a3
Localize score column header
btut Sep 3, 2022
356d942
Remove score from sort-order when disabling force sort by score
btut Sep 3, 2022
41d93fb
Fix search filter
btut Sep 3, 2022
c19b530
Make groupviewmode an enumset
btut Sep 3, 2022
79a753b
Checkstyle
btut Sep 3, 2022
c63a261
Floating groups
btut Sep 4, 2022
0ac4090
Invert-mode for groups
btut Sep 4, 2022
6405d4e
Merge branch 'main' into version6
btut Sep 4, 2022
dff397e
Merge branch 'version6' into luceneSearchBackend
btut Sep 4, 2022
00cefc2
Fix indexing
btut Sep 4, 2022
b0cf627
Merge branch 'main' into version6
btut Sep 4, 2022
6c65d63
Merge branch 'version6' into luceneSearchBackend
btut Sep 4, 2022
85445bd
Merge remote-tracking branch 'upstream/main' into luceneSearchBackend
Siedlerchr Sep 4, 2022
7c6b16d
Merge remote-tracking branch 'upstream/main' into version6
Siedlerchr Sep 4, 2022
1a5ded9
Merge branch 'luceneSearchBackend' of github.com:JabRef/jabref into l…
Siedlerchr Sep 4, 2022
3a4e665
Prepare CHANGELOG.md
Siedlerchr Sep 4, 2022
42d8726
Merge branch 'version6' of github.com:JabRef/jabref into version6
Siedlerchr Sep 4, 2022
7f15dce
Merge remote-tracking branch 'upstream/version6' into luceneSearchBac…
Siedlerchr Sep 4, 2022
e9efb46
Merge branch 'main' into version6
btut Sep 10, 2022
a711f02
Merge branch 'version6' into luceneSearchBackend
btut Sep 10, 2022
bc6710e
Checkstyle
btut Sep 10, 2022
3280d23
Temporary fix for linking to bibentries by hash
btut Sep 11, 2022
4412f6e
Improve DocumentReader
btut Sep 11, 2022
b7e39b3
Always make all fields searchable
btut Sep 11, 2022
5ade8ef
Make index-path output a debug message
btut Sep 11, 2022
dfd3c95
Fix deletition of old entries
btut Sep 11, 2022
4b17f10
Fix re-indexing on database loading
btut Sep 11, 2022
ce57fdb
Merge branch 'main' into version6
btut Sep 16, 2022
ec532e9
Merge branch 'version6' into luceneSearchBackend
btut Sep 16, 2022
7e098d6
Fixed empty databases in open database list
btut Sep 16, 2022
e455248
Make databasecontext in LibraryTab a property
btut Sep 17, 2022
79479fd
Merge branch 'main' into version6
btut Oct 15, 2022
ebe895a
Merge branch 'version6' into luceneSearchBackend
btut Oct 15, 2022
0adcad8
Cleanup (remove search rules)
btut Oct 16, 2022
3d042a8
Store search-results per context
btut Nov 5, 2022
c3eb8bf
Fixes and performance improvements
btut Nov 6, 2022
60de8b8
Update search when adding entries
btut Nov 6, 2022
0f32e91
Use pattern matching for cast
btut Nov 6, 2022
231f200
Fix pattern matching
btut Nov 7, 2022
202f514
Merge branch 'main' into version6
btut Nov 7, 2022
f602207
Merge branch 'version6' into luceneSearchBackend
btut Nov 7, 2022
675d75c
Fix merge
btut Nov 7, 2022
49eeb1d
Speed up switches between sorting/filtering modes
btut Nov 7, 2022
a25fa00
Merge remote-tracking branch 'upstream/main' into luceneSearchBackend
calixtus Dec 27, 2022
08aca25
Fixed merge errors
calixtus Dec 27, 2022
15b2152
Fixed small issues
calixtus Jan 1, 2023
f8b643b
Removed obsolete tests, fixed some tests
calixtus Jan 3, 2023
229fed7
Merge branch 'main' into luceneSearchBackend
koppor Jan 3, 2023
536ecfa
Fixed merge error in CHANGELOG.md
calixtus Jan 4, 2023
1117e17
Fixed checkstyle
calixtus Jan 4, 2023
ff4ad1c
Fixed more tests
calixtus Jan 4, 2023
7bdccf0
Removed obsolete tests
calixtus Jan 4, 2023
40de951
Fixes "Fixed merge error in CHANGELOG.md" by removing duplicate entries
koppor Jan 4, 2023
cbb5461
Merge remote-tracking branch 'upstream/luceneSearchBackend' into luce…
calixtus Jan 4, 2023
9e8863d
Merge branch 'main' into luceneSearchBackend
calixtus Jan 10, 2023
1f38a68
WiP on tests
calixtus Jan 23, 2023
5467095
Merge remote-tracking branch 'upstream/main' into luceneSearchBackend
calixtus Sep 12, 2023
00cecf8
Checkstyle
calixtus Sep 12, 2023
ad85c77
Checkstyle
calixtus Sep 12, 2023
3c1c08e
Merge remote-tracking branch 'upstream/main' into luceneSearchBackend
calixtus Sep 25, 2023
8981cdd
Merge remote-tracking branch 'upstream/main' into luceneSearchBackend
calixtus Sep 25, 2023
986bf3f
Merge remote-tracking branch 'upstream/luceneSearchBackend' into luce…
calixtus Sep 25, 2023
ed5cebf
Update Java version
calixtus Sep 25, 2023
afc4d67
Refine logging
koppor Sep 25, 2023
2f3203f
Fix compile error
koppor Sep 25, 2023
c771458
Add LuceneTest
koppor Sep 25, 2023
b795fa6
Update CHANGELOG.md
koppor Jan 11, 2024
29759bb
Move search classes to pdf package
LoayGhreeb May 23, 2024
b084538
Merge branch 'main' into update-lucene-branch
LoayGhreeb May 23, 2024
0dc1c2d
Move search classes to search package
LoayGhreeb May 24, 2024
d5c87df
rewriteRun
LoayGhreeb May 24, 2024
a0c3a71
Merge branch 'main' into update-lucene-branch
LoayGhreeb May 29, 2024
bfc33c8
Remove bibEntry from DocumentReader
LoayGhreeb May 31, 2024
17fd483
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 3, 2024
c0098c9
Rewrite LuceneIndexer
LoayGhreeb Jun 3, 2024
cebaa1c
Remove IndexingTaskManager
LoayGhreeb Jun 3, 2024
81a0988
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 3, 2024
14a612d
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 12, 2024
f3c5cfa
Separate Bib fields index and LinkedFiles index
LoayGhreeb Jun 17, 2024
50299b2
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 17, 2024
a12653d
Fix null LuceneManager in ExternalFilesEntryLinker
LoayGhreeb Jun 17, 2024
007898a
Save as action
LoayGhreeb Jun 17, 2024
c4e02d6
Clear linkedFiles indexer when fullText indexing is disabled in prefe…
LoayGhreeb Jun 17, 2024
c6faa35
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 17, 2024
0c0d6ba
remove comments
LoayGhreeb Jun 17, 2024
6b5e66a
get indexed files on update
LoayGhreeb Jun 17, 2024
4c23c4e
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 17, 2024
50a6db4
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 18, 2024
3c1c0ef
Add LUCENE_MANAGERS map for accessing managers by databaseContext.getUid
LoayGhreeb Jun 19, 2024
c2181ec
Move LuceneManager from search.indexing package to search
LoayGhreeb Jun 19, 2024
00ec1de
Fix wrong order for import
LoayGhreeb Jun 19, 2024
ad95628
Move SearchQuery to model package
LoayGhreeb Jun 19, 2024
4732d25
Fix issue with opening multiple unsaved libraries
LoayGhreeb Jun 19, 2024
9887362
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 23, 2024
c692b30
Pass LuceneManager down to the entry editor
LoayGhreeb Jun 23, 2024
27fdde1
Improve searching performance
LoayGhreeb Jun 24, 2024
9708b29
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 24, 2024
ab5388f
Change SearchFieldConstants to enum
LoayGhreeb Jun 25, 2024
9242516
More performance improvements for searching
LoayGhreeb Jun 25, 2024
2cc4f39
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 25, 2024
d8bc078
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jun 26, 2024
9219eec
Update FulltextSearchResultsTab.java
LoayGhreeb Jun 26, 2024
99938d9
Fix group union, intersection
LoayGhreeb Jun 26, 2024
d70342f
Fix backgroundtask
calixtus Jun 27, 2024
f9731d1
Merge remote-tracking branch 'LoayGhreeb/update-lucene-branch' into f…
calixtus Jun 27, 2024
bbf8d19
Fix subscriptions
calixtus Jun 27, 2024
8d6e06c
Remove lastSearchQueryLogic
calixtus Jun 27, 2024
fb3c097
Fix possible NPE
calixtus Jun 27, 2024
b8c6e9a
Fix searchTask check
calixtus Jun 27, 2024
7e75341
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jul 3, 2024
136225d
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jul 3, 2024
b13d81e
Remove sort by score flag
LoayGhreeb Jul 5, 2024
4f679de
Fix score column sorting
LoayGhreeb Jul 5, 2024
12c9869
Fix modifier buttons listener
LoayGhreeb Jul 5, 2024
d94a1b1
Add search rank column
LoayGhreeb Jul 8, 2024
3671fdf
Merge branch 'main' into update-lucene-branch
LoayGhreeb Jul 8, 2024
cf271d5
hide search rank column from preferences
LoayGhreeb Jul 8, 2024
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
Prev Previous commit
Next Next commit
Better status-reporting for re-indexing on preference change
  • Loading branch information
btut committed Jul 9, 2022
commit e88d5d0570898498cf3ceda40a3ae628918cf83e
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ public void createIndex(LuceneIndexer indexer) {
public void manageFulltextIndexAccordingToPrefs(LuceneIndexer indexer) {
indexer.getFilePreferences().fulltextIndexLinkedFilesProperty().addListener((observable, oldValue, newValue) -> {
if (newValue.booleanValue()) {
enqueueTask(() -> indexer.updateIndex());
for (BibEntry bibEntry : indexer.getDatabaseContext().getEntries()) {
enqueueTask(() -> indexer.updateIndex(bibEntry, List.of()));
}
} else {
enqueueTask(() -> indexer.deleteLinkedFilesIndex());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,6 @@ private void writeFileToIndex(BibEntry entry, LinkedFile linkedFile) {
}
}

public void updateIndex() {
for (BibEntry bibEntry : databaseContext.getEntries()) {
updateIndex(bibEntry, List.of());
}
}

public void updateIndex(BibEntry entry, List<LinkedFile> removedFiles) {
int oldHash = entry.getLastIndexHash();
int newHash = entry.updateAndGetIndexHash();
Expand Down