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

Metafacture core 415 add skos lookup #276

Closed
wants to merge 22 commits into from

Conversation

dr0i
Copy link
Member

@dr0i dr0i commented Dec 13, 2022

This PR builds on #229 with the master rebased and some more improvements following https://github.com/metafacture/metafacture-fix/pull/229/files#r977759388 .

See metafacture-core#415 ..

dr0i and others added 21 commits December 13, 2022 11:24
Works like fix function 'lookup', also using a Map. The Map is build dynamically
querying an RDF model.
Co-authored-by: Jens Wille <[email protected]>
- add tests
- add to README
This was overriding every defaultValue, but maps should have the possibility
to have different default values.
Fixes the "Failed to load class org.slf4j.impl.StaticLoggerBinder" message
when building.
Implementation against further tests from
metafacture/metafacture-core#415 (comment).

- adapt some falsely Fix
- reuse test file "hcrt.ttl"
- one test tagged as "todo" because it needs introduction of new parameter
- reformat hcrt.ttl
- enable integration test
- add test

See metafacture/metafacture-core#415.
@dr0i dr0i requested a review from blackwinter December 13, 2022 17:00
@dr0i dr0i added the Enhancement New feature or request label Dec 13, 2022
@dr0i dr0i removed the request for review from blackwinter December 13, 2022 19:29
@dr0i
Copy link
Member Author

dr0i commented Dec 13, 2022

Uh, sorry, this is not ready for review.

@blackwinter
Copy link
Member

I find it a little unfortunate that the (extensive) discussion gets bifurcated here. Is there a specific reason not to force-push into the original branch?

- update README
- integrate lookup_rdf() into lookup()
- rename target_language to select_language (complements b49445d)
- remove comments in integrations test.fix for these are accounted to
@dr0i dr0i force-pushed the metafacture-core-415-addSkosLookup branch from df63ff0 to c81ae7d Compare December 15, 2022 09:48
@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

Is there a specific reason not to force-push into the original branch?

I am not sure, but would this not change the the commits, the code and hence make the discussion/comments disrupted? If this is not so I would indeed like to force-push into the original branch as you suggest.

@blackwinter
Copy link
Member

blackwinter commented Dec 15, 2022

I am not sure, but would this not change the the commits, the code and hence make the discussion/comments disrupted?

Yes, it would. But the commits and comments are still reachable and the original context is still shown. And you already did force-push into that branch multiple times ;)

I, for one, don't think that's more disruptive than starting a whole new pull request.

@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

Ok, I am gonna do this - thx for the explanation.

@dr0i dr0i closed this Dec 15, 2022
@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

Hm, but now indeed one of your very valuable review-inline-code-comment seems to be gone in https://github.com/metafacture/metafacture-fix/pull/229/files ... or I can just not find it?

@blackwinter
Copy link
Member

blackwinter commented Dec 15, 2022

The comments are in the "conversation" tab. Which one are you talking about?

@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

If I try to open one of the outdated conversations I get "We went looking everywhere, but couldn’t find those commits." . It was a longer comment where you were musing i.a. about incorporating lookup_rdf into lookup.

@blackwinter
Copy link
Member

If I try to open one of the outdated conversations I get "We went looking everywhere, but couldn’t find those commits." .

That does indeed sound bad. Which one was it?

It was a longer comment where you were musing i.a. about incorporating lookup_rdf into lookup.

Are you possibly talking about this one?

@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

Are you possibly talking about #229 (comment)?

Wasn't exactly this one, but yes, that the core idea. Also #229 (comment) . If I am not mistaken those PR comments were also in the "inline-code", a bit different, but that's better than nothing.

@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

Lessons learned:

  • don't force push (don't rebase master - merge instead), as noted in the CONTRIBUTING.md

@dr0i dr0i deleted the metafacture-core-415-addSkosLookup branch December 15, 2022 13:07
@blackwinter
Copy link
Member

How is that the lesson learned? I don't get it...

@dr0i
Copy link
Member Author

dr0i commented Dec 15, 2022

I rebased to get the master into #229 . If I would not have rebased, but git pull --no-ff origin there would be no forece-pushing. That's my "lesson learned", or better "reminder".

@blackwinter
Copy link
Member

Yeah, well, I've always been in favour of rebase instead of merge and that's why I argued for it. But if you think that merge works better for you then stick to it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants