-
+
Score:
-
+
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index cf7afb845..c0ad354ba 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -207,6 +207,13 @@ export class DocumentListComponent implements OnInit, OnDestroy {
})
}
+ clickMoreLike(documentID: number) {
+ this.list.selectNone()
+ setTimeout(() => {
+ //this.filterEditor.moreLikeThis(doc)
+ })
+ }
+
trackByDocumentId(index, item: PaperlessDocument) {
return item.id
}
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 7290354eb..490eed95d 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -1,7 +1,6 @@
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 43387c08f..3b645ec97 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -8,13 +8,17 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
import { TagService } from 'src/app/services/rest/tag.service';
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
+import { DocumentService } from 'src/app/services/rest/document.service';
+import { PaperlessDocument } from 'src/app/data/paperless-document';
const TEXT_FILTER_TARGET_TITLE = "title"
const TEXT_FILTER_TARGET_TITLE_CONTENT = "title-content"
const TEXT_FILTER_TARGET_ASN = "asn"
+const TEXT_FILTER_TARGET_FULLTEXT_QUERY = "fulltext-query"
+const TEXT_FILTER_TARGET_FULLTEXT_MORELIKE = "fulltext-morelike"
@Component({
selector: 'app-filter-editor',
@@ -64,7 +68,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
constructor(
private documentTypeService: DocumentTypeService,
private tagService: TagService,
- private correspondentService: CorrespondentService
+ private correspondentService: CorrespondentService,
+ private documentService: DocumentService
) { }
tags: PaperlessTag[] = []
@@ -72,12 +77,21 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
documentTypes: PaperlessDocumentType[] = []
_textFilter = ""
+ _moreLikeId: number
+ _moreLikeDoc: PaperlessDocument
- textFilterTargets = [
- {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
- {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
- {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`}
- ]
+ get textFilterTargets() {
+ let targets = [
+ {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
+ {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
+ {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`},
+ {id: TEXT_FILTER_TARGET_FULLTEXT_QUERY, name: $localize`Fulltext search`}
+ ]
+ if (this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+ targets.push({id: TEXT_FILTER_TARGET_FULLTEXT_MORELIKE, name: $localize`More like`})
+ }
+ return targets
+ }
textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
@@ -101,6 +115,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.tagSelectionModel.clear(false)
this.correspondentSelectionModel.clear(false)
this._textFilter = null
+ this._moreLikeId = null
this.dateAddedBefore = null
this.dateAddedAfter = null
this.dateCreatedBefore = null
@@ -120,6 +135,17 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this._textFilter = rule.value
this.textFilterTarget = TEXT_FILTER_TARGET_ASN
break
+ case FILTER_FULLTEXT_QUERY:
+ this._textFilter = rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY
+ break
+ case FILTER_FULLTEXT_MORELIKE:
+ this._moreLikeId = +rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_MORELIKE
+ this.documentService.get(this._moreLikeId).subscribe(result => {
+ this._moreLikeDoc = result
+ })
+ break
case FILTER_CREATED_AFTER:
this.dateCreatedAfter = rule.value
break
@@ -159,6 +185,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) {
filterRules.push({rule_type: FILTER_ASN, value: this._textFilter})
}
+ if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_QUERY) {
+ filterRules.push({rule_type: FILTER_FULLTEXT_QUERY, value: this._textFilter})
+ }
+ if (this._moreLikeId && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+ filterRules.push({rule_type: FILTER_FULLTEXT_MORELIKE, value: this._moreLikeId?.toString()})
+ }
if (this.tagSelectionModel.isNoneSelected()) {
filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
} else {
@@ -232,6 +264,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
}
resetSelected() {
+ this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
this.reset.next()
}
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html b/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
deleted file mode 100644
index 5dc5baa94..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-...
- {{token.text}} ...
-
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss b/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
deleted file mode 100644
index e04dd13b2..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.match {
- color: black;
- background-color: rgb(255, 211, 66);
-}
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts b/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts
deleted file mode 100644
index 8e00a9d0b..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResultHighlightComponent } from './result-highlight.component';
-
-describe('ResultHighlightComponent', () => {
- let component: ResultHighlightComponent;
- let fixture: ComponentFixture
;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ ResultHighlightComponent ]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(ResultHighlightComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts b/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts
deleted file mode 100644
index d9a1a50b1..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { SearchHitHighlight } from 'src/app/data/search-result';
-
-@Component({
- selector: 'app-result-highlight',
- templateUrl: './result-highlight.component.html',
- styleUrls: ['./result-highlight.component.scss']
-})
-export class ResultHighlightComponent implements OnInit {
-
- constructor() { }
-
- @Input()
- highlights: SearchHitHighlight[][]
-
- ngOnInit(): void {
- }
-
-}
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
deleted file mode 100644
index f794a0feb..000000000
--- a/src-ui/src/app/components/search/search.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-Invalid search query: {{errorMessage}}
-
-Showing documents similar to {{more_like_doc?.original_file_name}}
-
-
- Search query: {{query}}
-
- - Did you mean "{{correctedQuery}}"?
-
-
-
-
-
{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}
-
-
-
-
-
-
-
+
+ Error while loading documents: {{list.error}}
+
-
+
-
+
+
+
+
+
+
+
+
diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts
index 91c2c870a..b542358c7 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -1,9 +1,7 @@
-import { Route } from '@angular/compiler/src/core';
import { Injectable } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs';
import { cloneFilterRules, FilterRule } from '../data/filter-rule';
-import { FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY } from '../data/filter-rule-type';
import { PaperlessDocument } from '../data/paperless-document';
import { PaperlessSavedView } from '../data/paperless-saved-view';
import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys';
@@ -40,6 +38,7 @@ interface ListViewState {
export class DocumentListViewService {
isReloading: boolean = false
+ error: string = null
rangeSelectionAnchorIndex: number
lastRangeSelectionToIndex: number
@@ -103,6 +102,7 @@ export class DocumentListViewService {
reload(onFinish?) {
this.isReloading = true
+ this.error = null
let activeListViewState = this.activeListViewState
this.documentService.listFiltered(
@@ -126,6 +126,8 @@ export class DocumentListViewService {
// this happens when applying a filter: the current page might not be available anymore due to the reduced result set.
activeListViewState.currentPage = 1
this.reload()
+ } else {
+ this.error = error.error
}
})
}
From 1ed9c245f5fa3e1a9effd0df73d496d7d7dc318e Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:07:36 +0200
Subject: [PATCH 06/18] fixed more like this
---
.../app/components/document-list/document-list.component.ts | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index c0ad354ba..aa534e23e 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from
import { ActivatedRoute, Router } from '@angular/router';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { Subscription } from 'rxjs';
+import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type';
import { PaperlessDocument } from 'src/app/data/paperless-document';
import { PaperlessSavedView } from 'src/app/data/paperless-saved-view';
import { SortableDirective, SortEvent } from 'src/app/directives/sortable.directive';
@@ -208,10 +209,7 @@ export class DocumentListComponent implements OnInit, OnDestroy {
}
clickMoreLike(documentID: number) {
- this.list.selectNone()
- setTimeout(() => {
- //this.filterEditor.moreLikeThis(doc)
- })
+ this.list.quickFilter([{rule_type: FILTER_FULLTEXT_MORELIKE, value: documentID.toString()}])
}
trackByDocumentId(index, item: PaperlessDocument) {
From b7063b199a4d0483d872fe5c1e6001385f063392 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:49:31 +0200
Subject: [PATCH 07/18] disable sorting for now
---
src/documents/index.py | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/documents/index.py b/src/documents/index.py
index ec8057403..e17c82daa 100644
--- a/src/documents/index.py
+++ b/src/documents/index.py
@@ -193,20 +193,21 @@ class DelayedQuery:
@property
def _query_sortedby(self):
- if not 'ordering' in self.query_params:
- return None, False
+ # if not 'ordering' in self.query_params:
+ return None, False
- o: str = self.query_params['ordering']
- if o.startswith('-'):
- return o[1:], True
- else:
- return o, False
+ # o: str = self.query_params['ordering']
+ # if o.startswith('-'):
+ # return o[1:], True
+ # else:
+ # return o, False
def __init__(self, searcher: Searcher, query_params, page_size):
self.searcher = searcher
self.query_params = query_params
self.page_size = page_size
self.saved_results = dict()
+ self.first_score = None
def __len__(self):
page = self[0:1]
@@ -219,7 +220,6 @@ class DelayedQuery:
q, mask = self._query
sortedby, reverse = self._query_sortedby
- print("OY", self.page_size)
page: ResultsPage = self.searcher.search_page(
q,
mask=mask,
@@ -233,6 +233,15 @@ class DelayedQuery:
surround=50)
page.results.formatter = HtmlFormatter(tagname="span", between=" ... ")
+ if not self.first_score and len(page.results) > 0:
+ self.first_score = page.results[0].score
+
+ if self.first_score:
+ page.results.top_n = list(map(
+ lambda hit: (hit[0] / self.first_score, hit[1]),
+ page.results.top_n
+ ))
+
self.saved_results[item.start] = page
return page
From be87caf7f65cdf315d11316ac40c647174e8ac11 Mon Sep 17 00:00:00 2001
From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:50:05 +0200
Subject: [PATCH 08/18] fix search scores
---
.../document-card-large.component.html | 8 ++++----
.../document-card-large.component.ts | 17 ++++++++---------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
index f3037b4fc..3a552eb4e 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html
@@ -62,10 +62,6 @@