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

Termit #1

Closed
wants to merge 81 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
fa5390d
Service refactoring, bump Spring to v2.4.4
psiotwo Jul 23, 2021
84bbc74
Libraries update, Java to 11.
psiotwo Jul 23, 2021
1cf0067
Test refactoring
psiotwo Jul 23, 2021
4d65e32
Useless dependency removal
psiotwo Jul 23, 2021
122f736
Fix java version in pom
psiotwo Jul 23, 2021
d70d9a3
Dockerization + Lombok + Spring boot configuration/YAML
psiotwo Jul 23, 2021
01ab633
Extract morphodita configuration
psiotwo Jul 25, 2021
9b76ce7
Splitting into modules; Maven -> Gradle
psiotwo Jul 25, 2021
4aa1586
refacting multimodule build setup
psiotwo Jul 25, 2021
c7671b7
Remove XMLAnnotationParser
psiotwo Jul 27, 2021
6fd892b
Setup github action
psiotwo Jul 27, 2021
91adc5b
Encoding with utf-8 charset.
psiotwo Jul 27, 2021
8c60a42
Encoding with utf-8 charset fix.
psiotwo Jul 27, 2021
a89cafa
removing termit-irrelevant services, modularization of the lemmatizer…
psiotwo Jul 27, 2021
fb6f135
refactoring mocks
psiotwo Jul 29, 2021
4b8be02
refactor project, upgrade gradle to 7, spring to 5,
psiotwo Jul 30, 2021
e87b1d3
[upd] Update the SPARQL query with language filter
Jun 14, 2019
76cee2f
[upd] Check for negation in a separate method
Jun 14, 2019
98076c4
[upd] Allow processing for a specific language (English model support)
Jun 18, 2019
55e7c45
[add] Add English language model file
Jun 18, 2019
2d223e7
[add] Add English stop-word list
Jul 2, 2019
f31ce1d
[upd] Check for stopwords in annotations with minor refactoring
Jul 4, 2019
d56a45b
[upd] Update the SPARQL query with language filter
Jun 14, 2019
449dc21
[upd] Allow processing for a specific language (English model support)
Jun 18, 2019
bb385ed
[upd] Check for negation in a separate method
Jun 14, 2019
cbaa003
[add] add stopwords for English language analysis
Jul 4, 2019
14974fe
[add] create test for stopwords
Jul 4, 2019
64b8b43
[Upd] Improve code quality and efficiency a little bit. Update .gitig…
ledsoft Nov 27, 2019
1de7fd6
[Fix] Ensure MorphoDita analyzes ontology labels correctly.
Nov 29, 2019
b24d2ae
[Fix] Fix system default URI encoding issue.
Feb 5, 2020
88483fc
[#1218] Adjust the query to use PrefLabel instead of label to stay al…
May 4, 2020
4d47cb6
[#1226] Ensure creating unique ids for nodes with multiple analysis.
May 7, 2020
9d50a47
[Fix] Fix issues caused by update term namespace in the data.
May 31, 2020
9f0510a
[#Fix] Fix the IRI of terms also in the annotate method.
Jun 1, 2020
3da29a5
[#1249] Fix spacing problems in the annotator.
Jul 10, 2020
7046992
[add] XML transformation of Annotace output
May 21, 2019
e31d121
[#Fix] Save output to a new file instead of loading one.
Jul 17, 2020
f75b5d3
[fix] Specify input language for morphological analysis.
Jul 17, 2020
5b39a30
[fix] Expect various lengths of tags for different input languages / …
Jul 17, 2020
e88f6f4
[fix] Reflect the recent changes in data and retrieve only terms with…
Jul 24, 2020
e11152e
[upd] Use the correct tokenizer corresponding to the input language.
Saeedla Sep 2, 2020
382eb05
[#1336] Allow to retrieve all the labels in the vocabulary with their…
Saeedla Sep 7, 2020
a618379
[#1336] Allow to retrieve all the labels in the vocabulary with their…
Saeedla Sep 7, 2020
27915c4
[#1336] Implement a new scoring strategy to sort the term candidates.
Saeedla Sep 7, 2020
0579d5c
[#1336] Prioritize prefLabel to ensure its retrieval when exact match.
Saeedla Sep 9, 2020
610849f
[#upd] Improve the English stop-words list.
Saeedla Sep 9, 2020
c1a511e
[#1352] Configure keyword extractor to be called on demand.
Saeedla Sep 15, 2020
e0faecf
[#926] Support authenticated access to the repository.
Oct 27, 2020
dada6d9
[Upd] Compare on token level as well as lemmas.
Nov 20, 2020
5fcf25b
[Fix] Split string on / separator.
Nov 20, 2020
86d05db
[Upd] Update English stop-word list.
Nov 20, 2020
2a4f180
merging KBSS master, making SparkLemmatizer working
psiotwo Aug 1, 2021
07e23d0
preloading Spark lemmatizers.
psiotwo Aug 1, 2021
e11922c
making english lemmatizer working
psiotwo Aug 3, 2021
10fdbb4
Code cleanup, fix Spark configuration
psiotwo Aug 6, 2021
edf5f41
Setup docker build of annotace with spark lemmatizer
psiotwo Aug 31, 2021
03cbcd9
Fix stopwords resolution in JAR files.
psiotwo Aug 31, 2021
d600c7d
[R-#1613] backquotes recognition during tokenization in Spark.
psiotwo Oct 18, 2021
08920bd
[R-#1613] support backquotes in Spark lemmatizer
psiotwo Oct 18, 2021
db38548
[R-#1613] dependencies update
psiotwo Oct 18, 2021
60f0b4a
Connecting to the ontology repo with/without the credentials.
psiotwo Oct 22, 2021
0ed5f00
Fix reading model.
psiotwo Oct 22, 2021
301aa59
Fix reading model.
psiotwo Oct 22, 2021
c5a252e
[#3] idempotent annotate method
psiotwo Oct 26, 2021
4124464
Merge pull request #4 from kbss-cvut/3-idempotent
psiotwo Oct 26, 2021
475d8bd
[#3] adding one more test
psiotwo Oct 26, 2021
643c4d6
Merge pull request #5 from kbss-cvut/3-idempotent
psiotwo Oct 26, 2021
b9bc7d3
[#7] Instructions to run annotace.
psiotwo Jun 10, 2022
1171872
[Bug #6] Update dependencies, including Apache Spark.
ledsoft Apr 12, 2023
185c0e5
[Fix] Fix build issues (tests).
ledsoft Apr 12, 2023
76bef03
[Fix] Fix deprecated Gradle feature warning.
ledsoft Apr 12, 2023
1ede3cb
[Ref] Unify single and double quote usage in build.gradle files.
ledsoft Apr 13, 2023
aed5014
[Upd] Bump Gradle version to 8.1 and use a version catalog to manage …
ledsoft Apr 13, 2023
93ebb42
[Upd] Update Docker images to use Gradle 8.0.2 and Eclipse Temurin al…
ledsoft Apr 13, 2023
bb0ec58
[Doc #7] Improve info on running annotace in readme.
ledsoft Apr 13, 2023
561b01d
Merge pull request #10 from kbss-cvut/fix/spark-scala-version
ledsoft Apr 13, 2023
7dfe72b
Minor code improvements, remove test resources from core main resources.
ledsoft Mar 11, 2024
61ef363
More code cleanup.
ledsoft Mar 11, 2024
58878be
Allow running Annotace either with Spark or MorphoDiTa lemmatizer.
ledsoft Mar 11, 2024
e14e815
[Fix] Fix Docker compose configuration for running Annotace with Morp…
ledsoft Mar 12, 2024
67f213e
Provide readme with instructions on how to run Annotace.
ledsoft Mar 12, 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
[upd] Update the SPARQL query with language filter
(cherry picked from commit 2dbb8a16a6e4c67735003bb93ff84eb143c3056e)
  • Loading branch information
Lama Saeeda authored and psiotwo committed Jul 30, 2021
commit e87b1d32a76200665766a8718a50b6d0b2e78285
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
@Slf4j
public class OntologyService {

public String lang = "cs";

private LemmatizerApi lemmatizerServiceApi;

@Autowired
Expand Down Expand Up @@ -78,7 +80,8 @@ public List<QueryResult> analyzeModel(Model model) {
+ "PREFIX skos: <http://www.w3.org/2004/02/skos/core#>"
+ "SELECT ?s ?o WHERE {"
+ "?s rdfs:label ?o ."
+ "?s a skos:Concept . "
+ "?s a <http://onto.fel.cvut.cz/ontologies/slovnik/agendovy/popis-dat/pojem/term> . "
+ "FILTER (lang(?o) = '" + lang + "') ."
+ "}";

QueryExecution queryExecution = QueryExecutionFactory.create(query, model);
Expand Down