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

Resolving issue #240 #487

Merged
merged 4 commits into from
Dec 10, 2024

Conversation

hizclick
Copy link
Contributor

@hizclick hizclick commented Dec 2, 2024

Description, Context and related Issue

This pull request resolves #240

Refs #

How Has This Been Tested?

Tested on Klarinettenquintet

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Overview

  • I have updated the inline documentation accordingly.
  • I have performed a self-review of my code, according to the style guide
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes at testing
  • All new and existing tests passed.

@hizclick hizclick linked an issue Dec 2, 2024 that may be closed by this pull request
@hizclick hizclick requested review from bwbohl, peterstadler and daniel-jettka and removed request for bwbohl December 2, 2024 11:27
daniel-jettka
daniel-jettka previously approved these changes Dec 2, 2024
Copy link
Contributor

@daniel-jettka daniel-jettka left a comment

Choose a reason for hiding this comment

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

In the GUI I do not see any difference, and I understand that is what was intended because it cannot be tested in another way at the moment. Annotations are shown in Klarinettenquintett.

image

Copy link
Member

@peterstadler peterstadler left a comment

Choose a reason for hiding this comment

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

The changes to bootstrap.js do not belong here, or am I missing something?

add/data/xql/getAnnotationsInText.xql Outdated Show resolved Hide resolved
add/data/xql/getAnnotationsInText.xql Outdated Show resolved Hide resolved
@peterstadler
Copy link
Member

btw, how is this supposed to fix #83 ?!? I do not see anything related to that ticket here?

@peterstadler peterstadler mentioned this pull request Dec 3, 2024
@krHERO krHERO added this to the 1.0.0 milestone Dec 3, 2024
@hizclick
Copy link
Contributor Author

hizclick commented Dec 5, 2024

btw, how is this supposed to fix #83 ?!? I do not see anything related to that ticket here?

btw, how is this supposed to fix #83 ?!? I do not see anything related to that ticket here.

Instead of looking at the annotation in the whole database with '/db/contents/', we search for the specific edition inside the function findAnnotations(); however, this fix does not look for specific MEI files.
A few things has to be clearer.

For example, do we have a defined mechanism to specify which exact MEI file (eg. The first MEI file .... ) ?

@hizclick hizclick changed the title Resolving issue #83 and 240 Resolving issue #240 Dec 6, 2024
Copy link
Member

@peterstadler peterstadler left a comment

Choose a reason for hiding this comment

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

Looks good to me now, thank you!

@hizclick hizclick merged commit 48e9e2f into develop Dec 10, 2024
5 checks passed
@hizclick hizclick deleted the 83-getannotationsonpagexql-could-return-wrong-data branch December 10, 2024 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

getAnnotationsInText.xql should search edition collection
4 participants