concordia
/
LiDa_Search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitea-s2i2s.isti.cnr.it/concordia/LiDa_Search.git

This commit is contained in:
Luca Trupiano 2022-10-20 16:41:12 +02:00
parent 55fb4b76ef fb52a18f76
commit f67f38399b
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
index_work_Nik.html
View File

@ -83,8 +83,8 @@
<blockquote class="ph0 mh0 measure f4 lh-copy center mt0">
<cite class="ph0 mh0 measure i f4 lh-copy center">potrai
cercare, e non troverai ombra</cite><br /> <cite
class="ph0 mh0 measure f4 lh-copy center">(Inf., canto 32,
cercare, e non troverai ombra</cite><br> <cite
class="ph0 mh0 measure f5 lh-copy center text-secondary font-weight-lighter">(Inf., canto 32,
verso 59)</cite>
</blockquote>
</div>
@ -98,14 +98,14 @@
<!-- <div class="cf ph2-ns"> -->
<div class="row padding-right-xl padding-left-xl">
<!-- <div class="fl w-100 w-20-ns pa4"> -->
<div class="col-md-2 pa4 ml4">
<div class="col-md-2 pl4 pt0 pr4 pb0 ml4">
<img src="./images/altriFiltri.png"
style="width: 42px; height: 41px;">
<div class="flex flex-column">
<div class="w-45 pa1 mr1">
<a class="f6 link dim br1 bn pa1 mb1 dib dark-green add-record"
href="#0" value="Categoria grammaticale" data-added="0"><img
src="./images/settings.png"></a><br>
src="./images/settings.png"></a>
<span>Grammaticale</span>
</div>
@ -113,21 +113,21 @@
<a
class="f6 link dim br1 bn pa1 mb1 dib dark-green add-record-sint"
href="#0" value="Tipo sintattico" data-added="0"><img
src="./images/settingsSintattico.png"></a><br>
src="./images/settingsSintattico.png"></a>
<span>Tipo Sintattico</span>
</div>
<div class="w-45 pa1 mr1">
<a
class="f6 link dim br1 bn pa1 mb1 dib dark-green add-record-metafora"
href="#0" value="Metafora" data-added="0"><img
src="./images/settingsMetafora.png"></a><br>
src="./images/settingsMetafora.png"></a>
<span>Metafore</span>
</div>
<div class="w-45 pa1 mr1">
<a
class="f6 link dim br1 bn pa1 mb1 dib dark-green add-record-dialogo"
href="#0" value="Dialogo" data-added="0"><img
src="./images/settingsDialoghi.png"></a><br>
src="./images/settingsDialoghi.png"></a>
<span>Dialoghi</span>
</div>
<div class="w-45 pa1 mr1">
@ -135,7 +135,7 @@
class="f6 link dim br1 bn pa1 mb1 dib dark-green add-record-struttura"
href="#0" value="Struttura" data-added="0"><img
src="./images/settingsStruttura.png"></a>
<br>
<span>Struttura Testo</span>
</div>
@ -1596,7 +1596,7 @@ main.redefine("querytxt", writesearchValue(mform));
</body>
<div class="modal-busy" id="loader" style="display: none">
<div class="center-busy" id="test-git">
<img alt="" src="lida-loader.gif" />
<img alt="" src="./images/lida-loader.gif" />
</div>
</div>
</html>

17
js/utils.js
View File

@ -113,7 +113,7 @@ WHERE {
FILTER regex(?Rappresentazione,"^farò$","i") .
#FILTER regex(?lm,"^fare$","i") .
FILTER langMatches(lang(?Rappresentazione),"it")
}
} ORDER BY ?Cantica ?Canto ?NumVerso
LIMIT 50`
//ORDER BY ?Cantica ?Canto ?NumVerso
//Togliere LIMIT in prod
@ -191,7 +191,7 @@ var unionop = '{"union": {"type": "union", "patterns":[]}, "bgp": {"type": "bgp"
function parseJsonClause(op, tokens, nowhere) {
alert(op)
//alert(op)
if (op.trim() == 'OR') {
//multipleCondSpQuery.where.push(JSON.parse(unionop)['union']);
nowhere.push(JSON.parse(unionop)['union']);
@ -322,9 +322,16 @@ function buildSQ(stquery) {
}
//Nick
function buildClauseNick(clause, parsedquery) {
clause = clause['filtro-1'];//da modificare
function buildClauseNick(nickclause, parsedquery) {
//clause = clause['filtro-1'];//da modificare
sctk = Object.keys(nickclause)
clause={}
for (ck in sctk){
if (sctk[ck].includes("filtro-")){
clause = nickclause [sctk[ck]]
break
}
}
if (clause['query'] != null && clause['query'].trim() != "") {
if (clause['query'].trim().slice(-1) !== '*')
strval = "^" + clause['query'].trim() + "$";