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.

Sign up for GitHub

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

Ak chrono tweaks #57

Merged
merged 10 commits into from
Feb 9, 2024
Merged

Ak chrono tweaks #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
34ab34f
fix(chrono): unskip
duncdrum Feb 5, 2024
43973fd
fix(yaml): function boost
duncdrum Feb 5, 2024
7939677
🐞 fix(yaml): AllFields chrono
duncdrum Feb 5, 2024
959ff61
Removed Title-Boosts
annekauf Feb 6, 2024
e5cca16
Update searchspecs.yaml
annekauf Feb 8, 2024
fccecc9
moved Saledeer-test to reiew
annekauf Feb 9, 2024
c9b95a9
adapted verbal assertions
annekauf Feb 9, 2024
3ef740c
Update chronology.cy.js
annekauf Feb 9, 2024
80a83ae
Update chronology.cy.js
annekauf Feb 9, 2024
f253e0d
Update reviews.cy.js
annekauf Feb 9, 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
115 changes: 46 additions & 69 deletions cypress/e2e/chronology.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('Chronology', () => {
// DP: sometimes the date in resultlist-data conflicts with the exact date in details view
// which can impact the percieved sorting
// see #35
it.skip('Top 1 should be published after 2020', () => {
it.skip('Top 1 should be published in or after 2020', () => {
cy.get('.resultlist-data')
.first()
.contains(/202\d/)
Expand Down Expand Up @@ -107,6 +107,7 @@ describe('Chronology', () => {
})

// see #36
// definition of relevance?
describe('emanzipation juden', () => {
beforeEach(() => {
cy.visit({
Expand All @@ -117,8 +118,9 @@ describe('Chronology', () => {
}
})
})

it.skip('should ...', () => {


it.skip('should show relevant literature according to chronology', () => {
cy.get('.resultlist')
})
})
Expand All @@ -127,8 +129,9 @@ describe('Chronology', () => {
// 608 hits total but many do not contain the search terms in the title
// or are about later periods all together
// why is 130141674 shown ?
// definition of relevance?
// see #39
describe.skip('Kulturgeschichte deutsches Kaiserreich', () => {
describe('Kulturgeschichte deutsches Kaiserreich', () => {
beforeEach(() => {
cy.visit({
url: '/Results',
Expand All @@ -139,7 +142,7 @@ describe('Chronology', () => {
})
})

it('should ...', () => {
it.skip('should show relevant literature according to chronology', () => {
cy.get('.resultlist')
})
})
Expand Down Expand Up @@ -177,20 +180,53 @@ describe('Chronology', () => {
url: '/Results',
qs: {
lookfor: 'jugendliteratur mittelalter roman',
type: 'allFields'
type: 'allFields',
limit: '65'
}
})
})

// see #40
it('should contain both primary and secondary literature', () => {
// 1st hit published 1985, 2nd 2002, 3rd 2011
// definition of relevance?
it('should show these items', () => {
cy.get('[href*="272952737"]')
.should('exist')
cy.get('[href*="1507865600"]')
.should('exist')
cy.get('[href*="1016493053"]')
.should('exist')

})

it.skip('Later editions should be ranked higher', () => {
cy.get('[href*="1016493053"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num1) => {
const num1 = parseInt($num1)

cy.get('[href*="1507865600"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num2) => {
const num2 = parseInt($num2)

cy.get('[href*="272952737"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num3) => {
const num3 = parseInt($num3)

expect(num2).to.be.lessThan(num3)
})

expect(num1).to.be.lessThan(num2)
})
})
})
})

Expand All @@ -207,35 +243,14 @@ describe('Chronology', () => {

// 1756833699
// not sure if this should or should not exist
// definition of relevance?
// see #35
// see #22
it.skip('should show relevant titles in translation', () => {
it.skip('should show relevant titles according to chronology', () => {
cy.get('[href*="1756833699"]')
.should('exist')
})

// PPN 389602841 2005
// PPN 430480865 1969
// see #35
it.skip('should show relevant titles in translation', () => {
cy.get('[href*="389602841"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num1) => {
const num1 = parseInt($num1)

cy.get('[href*="430480865"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num2) => {
const num2 = parseInt($num2)

expect(num1).to.be.lessThan(num2)
})
})
})

})

describe('koptische Stoffe', () => {
Expand Down Expand Up @@ -296,42 +311,4 @@ describe('Chronology', () => {
})
})
})

describe('Sadeleer, Environmental principles. From political slogans to legal rules', () => {
beforeEach(() => {
cy.visit({
url: '/Results',
qs: {
lookfor: 'Sadeleer, Environmental principles. From political slogans to legal rules',
type: 'allFields'
}
})
})

// mix of reviews and different media types
// see #23
// old behaviour no longer reproducible,
// TOP1 is book (newest) followed by ebook 9same date) and earlier article with identical title
// 2020 book PPN 1740404548
// 2004 article PPN OLC1736991698
it('newer book shuold be before older article', () => {
cy.get('[href*="1740404548"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num1) => {
const num1 = parseInt($num1)

cy.get('[href*="OLC1736991698"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num2) => {
const num2 = parseInt($num2)
expect(num1).to.be.lessThan(num2)
})
})
})
})

})
37 changes: 37 additions & 0 deletions cypress/e2e/reviews.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,41 @@ describe('Review after reviewed', () => {
})
})


describe('Sadeleer, Environmental principles. From political slogans to legal rules', () => {
beforeEach(() => {
cy.visit({
url: '/Results',
qs: {
lookfor: 'Sadeleer, Environmental principles. From political slogans to legal rules',
type: 'allFields'
}
})
})

// mix of reviews and different media types monograph
// see #23
// old behaviour no longer reproducible,
// 2020 book PPN 1740404548
// 2004 review PPN OLC1736991698
it('primary book should be before reviews', () => {
cy.get('[href*="1740404548"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num1) => {
const num1 = parseInt($num1)

cy.get('[href*="OLC1736991698"]')
.parents('[id^="result"]')
.find('.record-number')
.invoke('text')
.then(($num2) => {
const num2 = parseInt($num2)
expect(num1).to.be.lessThan(num2)
})
})
})
})

})
46 changes: 26 additions & 20 deletions vufind/searchspecs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,12 @@ Series:

AllFields:
DismaxFields:
- title_short^750
- title_full_unstemmed^600
- title_full^400
- title^500
- title_alt^200
- title_new^100
- title_short
- title_full_unstemmed
- title_full
- title
- title_alt
- title_new
- series^50
- series^100
# - series2^30
Expand All @@ -450,6 +450,7 @@ AllFields:
- journal^500
- is_hierarchy_title^500
- hierarchy_top_title^500
# DismaxHandler: edismax
DismaxParams:
- [bq, format:eJournal^237]
- [bq, format:Journal^284]
Expand All @@ -462,24 +463,29 @@ AllFields:
- [bq, genre_facet:"Rezension"^0.1]
- [bq, genre_facet:"book-review"^0.1]
# Alternative zum abgestufen Boosting des Erscheinungsjahres, eWW
# - [bf=ord(publishDate)^500]
- [bq, publishDateSort:2023^280]
- [bq, publishDateSort:2022^260]
- [bq, publishDateSort:2021^240]
- [bq, publishDateSort:2020^220]
- [bq, publishDateSort:2019^200]
- [bq, publishDateSort:2018^180]
- [bq, publishDateSort:2017^160]
- [bq, publishDateSort:2016^150]
- [bq, publishDateSort:2015^140]
- [bq, publishDateSort:2014^130]
- [bq, publishDateSort:2013^120]
- [bq, publishDateSort:202*^500]
# - [bf=ord(publishDateSort)^500]
# Hebis inspired
# - [boost, sum(product(max(0,sum(product(abs(ms(NOW/YEAR,publishDateSort)),-5.285e-13),1)),6.5),500)]
# Docs inspired
- [bf=recip(ms(NOW/Year,ord(publishDateSort)),1,1000,1000)]
# Old Approach
# - [bq, publishDateSort:2023^280]
# - [bq, publishDateSort:2022^260]
# - [bq, publishDateSort:2021^240]
# - [bq, publishDateSort:2020^220]
# - [bq, publishDateSort:2019^200]
# - [bq, publishDateSort:2018^180]
# - [bq, publishDateSort:2017^160]
# - [bq, publishDateSort:2016^150]
# - [bq, publishDateSort:2015^140]
# - [bq, publishDateSort:2014^130]
# - [bq, publishDateSort:2013^120]
# - [bq, publishDateSort:202*^220]


# - [bq, collection_details:"GBV_ILN_11"^300]
# - [tie, 0.1]
DismaxHandler: edismax
# DismaxHandler: edismax



Expand Down