Skip to content

Commit

Permalink
#13 Introduced language tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sebastiano-G
Sebastiano-G committed Mar 20, 2024
1 parent 606e246 commit 36fe181
Show file tree
Hide file tree
Showing 5 changed files with 434 additions and 31 deletions.
1 change: 1 addition & 0 deletions conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
pagination = "10"
github_backup = "False"
myEndpoint = "http://127.0.0.1:3000/blazegraph/sparql"
mainLang = "en"
26 changes: 20 additions & 6 deletions forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,18 @@ def get_form(json_form, from_dict=False, subtemplate=False):
dropdown_values = [(k,v) for k,v in field['values'].items()] if 'values' in field else None

# Text box
if field['type'] in ['Textbox','Vocab', 'WebsitePreview']:
if field['type'] == 'Textbox' and field['value'] == 'Literal':
if "disambiguate" in field and field["disambiguate"] == 'True':
vpass = form.regexp(r".{0,200}$", 'must be between 1 and 200 characters') # TODO: check the regex (either set it to {0, 200} or remove it in case of Subtemplates' primary keys)
params = params + (form.Textbox(myid, vpass,
#vpass = form.regexp(r".{0,200}$", 'must be between 1 and 200 characters') # TODO: check the regex (either set it to {0, 200} or remove it in case of Subtemplates' primary keys)
params = params + (form.Textbox(myid, #vpass,
description = description,
id=myid,
placeholder=placeholder,
pre = prepend,
class_= classes,
value=default,
mandatory = mandatory) , )
mandatory = mandatory,
lang=conf.mainLang) , )
else:
params = params + (form.Textbox(myid,
description = description,
Expand All @@ -104,8 +105,20 @@ def get_form(json_form, from_dict=False, subtemplate=False):
pre = prepend,
class_= classes,
value=default,
mandatory = mandatory), )
mandatory = mandatory,
lang=conf.mainLang), )

# Entities, SKOS thesauri, links
if field['type'] in ['Vocab', 'WebsitePreview'] or (field['type'] == 'Textbox' and field['value'] in ['URL', 'URI']):
params = params + (form.Textbox(myid,
description = description,
id=myid,
placeholder=placeholder,
pre = prepend,
class_= classes,
value=default,
mandatory = mandatory), )

# Multimedia Link
if field['type'] == 'Multimedia':
params = params + (form.Textbox(myid,
Expand All @@ -126,7 +139,8 @@ def get_form(json_form, from_dict=False, subtemplate=False):
pre = prepend,
class_= classes,
value=default,
mandatory = mandatory), )
mandatory = mandatory,
lang=conf.mainLang), )

if field['type'] == 'Date':
if field['calendar'] == 'Month':
Expand Down
51 changes: 37 additions & 14 deletions mapping.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
def getValuesFromFields(fieldPrefix, recordData, fields=None, field_type=None):
""" request form fields by field prefix, check if multiple values are available,
returns a set of tuples including ID (for the URI) and label of values """
result_dict = {'type':'URI'}
results = set()
for key, value in recordData.items():
if key.startswith(fieldPrefix+'-'): # multiple values from text box (wikidata) + URL
Expand All @@ -54,8 +55,20 @@ def getValuesFromFields(fieldPrefix, recordData, fields=None, field_type=None):
values = value.split(',')
for val in values:
results.add(( val.strip(), val.strip() ))
return results
result_dict['results'] = results
return result_dict

def getValuesFromTextualFields(fieldPrefix, recordData):
""" request form fields by field prefix, check if multiple languages are available,
returns a set of tuples including textual values and their language """
result_dict = {'type':'Literal'}
results = set()
for key, value in recordData.items():
if key.startswith(fieldPrefix+'_'):
lang = key.rsplit('_')[1]
results.add((value,lang))
result_dict['results'] = results
return result_dict

def getRightURIbase(value):
return WD+value if value.startswith('Q') else GEO+value if value.isdecimal() else VIAF+value[4:] if value.startswith("viaf") else ''+value if value.startswith("http") else base+value.lstrip().rstrip()
Expand Down Expand Up @@ -102,7 +115,7 @@ def inputToRDF(recordData, userID, stage, knowledge_extraction, graphToClear=Non

# retrieve hidden triples (to be saved) and re-introduce them in the named graph
to_be_saved = queries.saveHiddenTriples(graphToClear, tpl_form)
if to_be_saved:
if to_be_saved['results']['bindings'] != [{}]:
for binding in to_be_saved['results']['bindings']:
subject = URIRef(binding['subject']['value'])
for predicate_obj, inner_dict in binding.items():
Expand Down Expand Up @@ -133,13 +146,17 @@ def inputToRDF(recordData, userID, stage, knowledge_extraction, graphToClear=Non
for field in fields:
if field['type'] not in ['KnowledgeExtractor', 'Subtemplate']:
# URI, Textarea (only text at this stage), Literals
value = getValuesFromFields(field['id'], recordData, fields) \
if 'value' in field and field['value'] in ['URI','Place'] else getValuesFromFields(field['id'], recordData, field_type=field['type']) if 'value' in field and field['value'] == 'URL' else recordData[field['id']]
value = getValuesFromFields(field['id'], recordData, fields) if 'value' in field and field['value'] in ['URI','Place'] \
else getValuesFromFields(field['id'], recordData, field_type=field['type']) if 'value' in field and field['value'] == 'URL' \
else getValuesFromTextualFields(field['id'], recordData) if 'value' in field and field['value'] == 'Literal' else recordData[field['id']]
# TODO disambiguate as URI, value
if field["disambiguate"] == 'True': # use the key 'disambiguate' as title of the graph
wd.add(( URIRef(base+graph_name+'/'), URIRef(field['property']), Literal(value) ))
wd.add(( URIRef(base+graph_name), RDFS.label, Literal(value) ))
wd.add(( URIRef(base+graph_name+'/'), RDFS.label, Literal(value) ))
main_value = [label for label in value['results'] if label[1] == conf.mainLang][0]
main_label = main_value[0]
main_lang = main_value[1]
wd.add(( URIRef(base+graph_name+'/'), URIRef(field['property']), Literal(main_label, lang=main_lang) ))
wd.add(( URIRef(base+graph_name), RDFS.label, Literal(main_label) ))
wd.add(( URIRef(base+graph_name+'/'), RDFS.label, Literal(main_label) ))

# the main entity has the same URI of the graph but the final /

Expand All @@ -166,16 +183,22 @@ def inputToRDF(recordData, userID, stage, knowledge_extraction, graphToClear=Non
if not to_add.startswith("http"):
to_add = "http://" + to_add
wd.add(( URIRef(base+graph_name), URIRef(field['property']), URIRef(to_add) ))
else: # object properties
for entity in value:
entityURI = getRightURIbase(entity[0]) # Wikidata or new entity
wd.add(( URIRef(base+graph_name), URIRef(field['property']), URIRef(entityURI) ))
wd.add(( URIRef( entityURI ), RDFS.label, Literal(entity[1].lstrip().rstrip(), datatype="http://www.w3.org/2001/XMLSchema#string") ))

elif isinstance(value,dict):
if value['type'] == 'URI': #object properties
for entity in value['results']:
entityURI = getRightURIbase(entity[0]) # Wikidata or new entity
wd.add(( URIRef(base+graph_name), URIRef(field['property']), URIRef(entityURI) ))
wd.add(( URIRef( entityURI ), RDFS.label, Literal(entity[1].lstrip().rstrip(), datatype="http://www.w3.org/2001/XMLSchema#string") ))
elif value['type'] == 'Literal':
for literal in value['results']:
val, lang = literal
val = val.replace('\n','').replace('\r','')
wd.add(( URIRef(base+graph_name), URIRef(field['property']), Literal(val, lang=lang)))
# now get also the entities associated to textareas (record creation)
if field['type'] == 'Textarea':
value = getValuesFromFields(field['id'], recordData, fields, 'Textarea')
for entity in value:
print('HERE', value)
for entity in value['results']:
entityURI = getRightURIbase(entity[0])+entity[0]
wd.add(( URIRef(base+graph_name), SCHEMA.keywords, URIRef(entityURI) ))
wd.add(( URIRef( entityURI ), RDFS.label, Literal(entity[1].lstrip().rstrip(), datatype="http://www.w3.org/2001/XMLSchema#string") ))
Expand Down
156 changes: 146 additions & 10 deletions static/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@ nav {

}

#navbarSupportedContent * {
/*margin: 10px;*/
}

nav a {
margin-right: 2em;
color: rgba(100, 23, 180, 1) !important;
Expand Down Expand Up @@ -360,8 +356,6 @@ article:nth-child(even),
background-color: #F5F6FA;
}

.change_background {}

article p {
font-size: 1em;
line-height: 1.7em;
Expand Down Expand Up @@ -1475,8 +1469,6 @@ select-selected.select-arrow-active:after {
}

/* template page */
.set_template_field {}

.block_field {
padding: 1em;
border: solid 1px black;
Expand Down Expand Up @@ -1728,7 +1720,10 @@ button#showTemplates {
padding-top: 0px;
}


.suggested-vocabs-div {
margin-left: -2px;
margin-top: 0px !important;
}



Expand Down Expand Up @@ -1876,6 +1871,10 @@ button#showTemplates {
padding-left: 5% !important;

}
.suggested-vocabs-div {
margin-left: -5px;
margin-top: 0px !important;
}

}

Expand Down Expand Up @@ -1956,6 +1955,10 @@ button#showTemplates {
text-decoration: none;
margin:8px 20px 10px 0px;
}
.suggested-vocabs-div {
margin-bottom: 15px;
margin-top: -25px;
}

/* knowledge extraction */
.pagination input.btn.extractor_2 {
Expand Down Expand Up @@ -2036,7 +2039,140 @@ input[subtemplate]+.fa-plus-circle {
color: rgba(100,23,180,1); cursor: pointer;
}

<<<<<<< Updated upstream
=======
/* Subrecords visualisation */

.subtemplateValue {
background-color: #ececec !important;
display: block;
margin-bottom: 0px !important;
}

.subtemplateValue > a {
background-color: white;
border: black 1px solid;
box-shadow: 3px 5px;
color: black !important;
display: inline-block;
font-weight: 400;
padding: 2px 50px 2px 15px !important;
text-decoration: none !important;
width: 100%;
}

.subtemplateValue:last-of-type {
margin-bottom: 1rem;
}

.subtemplateValue section:last-of-type {
margin-bottom: 0px !important;
padding-bottom: 1rem;
}

.subtemplateValue > span {
display: inline-block;
position: absolute;
right: 2em;
}

.subtemplateValue .subtemplateValue {
border: rgb(152, 128, 177) 1px solid !important;
}

.fa-chevron-down {
color: #343a406e;
padding-top: 8px;
}

.fa-chevron-down:hover {
color: rgba(100, 23, 180, 1);
cursor: pointer;
}

.hidden-subrecord {
display: none;
}

.subtemplateValue > div > section > p {
font-size: 1em !important;
}

.subtemplateValue > div .articleSubtitle {
font-size: 0.8em !important;
}
.subtemplateValueOpen > a,
.subtemplateValue > a:hover {
border-color: rgba(100, 23, 180, 1) !important;
color: rgba(100, 23, 180, 1) !important;
}

/* multiple lang */
.language-options {
display: block;
max-height: 255px;
overflow-y: scroll;
border-radius: 5px;
border: 1px solid #ced4da;
}
.language-options a {
display: block;
background-color: #fff;
text-decoration: none !important;
color: #495057 !important;
line-height: 1.5;
padding: .375rem 1.75rem .375rem .75rem;
}

.lang-item:first-of-type {
padding-left: 0.8em !important;
}
.lang-item {
padding-left: 0.4em;
color: rgb(182, 160, 206) !important;
text-decoration: none !important;
cursor: pointer;
}

.lang-item.selected-lang, .lang-item:hover {
text-decoration: underline !important;
color: rgb(100, 23, 180) !important;
}

#lang-form {
display: block;
position: absolute;
background: #eae2f6;
width: 400px;
padding: 20px;
border: solid 1px black;
border-radius: 5px;
}

#lang-form:after {
content: " ";
position: absolute;
left: 12px;
top: -10px;
border-top: none;
border-right: 10px solid transparent;
border-left: 10px solid transparent;
border-bottom: 10px solid rgba(100, 23, 180, 1);
}

#lang-form section:first-child div {
z-index: 1001;
position: relative;
}

#lang-form section:nth-child(2) div {
z-index: 1000;
position: relative;
}


>>>>>>> Stashed changes
/* extra */
.fa-plus-circle, .fa-eye, .fa-trash{color: rgba(100,23,180,1); cursor: pointer;}
.fa-globe, .fa-plus-circle, .fa-eye, .fa-trash{color: rgba(100,23,180,1); cursor: pointer;}
.link_btn, .btn {white-space: nowrap;}
.add_fields .link_btn {display: inline-block; margin-bottom: 8px}
Loading

0 comments on commit 36fe181

Please sign in to comment.