ryanmwangi/Compware
1
0
Fork 0
Code Issues Pull requests Releases Activity

dev #6

Merged
ryanmwangi merged 10 commits from dev into main 2025-04-01 13:19:03 +00:00
Conversation 0 Commits 10 Files changed 3 +22 -22
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 303b713d59 - Show all commits

44
src/components/items_list.rs
View file

@ -398,12 +398,16 @@ pub fn ItemsList(
let sparql_query = format!( let sparql_query = format!(
r#" r#"
SELECT ?propLabel ?value ?valueLabel WHERE {{ SELECT ?prop ?propLabel ?value ?valueLabel WHERE {{
wd:{} ?prop ?statement. wd:{} ?prop ?statement.
?statement ?ps ?value. ?statement ?ps ?value.
?property wikibase:claim ?prop. ?property wikibase:claim ?prop.
?property wikibase:statementProperty ?ps. ?property wikibase:statementProperty ?ps.
SERVICE wikibase:label {{ bd:serviceParam wikibase:language "en". }} SERVICE wikibase:label {{
bd:serviceParam wikibase:language "en".
?prop rdfs:label ?propLabel.
?value rdfs:label ?valueLabel.
}}
}} }}
"#, "#,
wikidata_id wikidata_id
@ -454,28 +458,24 @@ pub fn ItemsList(
// Second pass: build results // Second pass: build results
if let Some(bindings) = data["results"]["bindings"].as_array() { if let Some(bindings) = data["results"]["bindings"].as_array() {
for binding in bindings { for binding in bindings {
if let (Some(prop_uri), Some(value_label)) = ( let prop_label = binding["propLabel"]["value"].as_str().unwrap_or_default();
binding["prop"]["value"].as_str(), let value = binding["valueLabel"]["value"]
binding["valueLabel"]["value"].as_str() .as_str()
) { .or_else(|| binding["value"]["value"].as_str())
// Extract property ID from URI (e.g., "http://www.wikidata.org/prop/P123") .unwrap_or_default();
if let Some(prop_uri) = binding["prop"]["value"].as_str() {
let prop_id = prop_uri.split('/').last().unwrap_or_default().to_string(); let prop_id = prop_uri.split('/').last().unwrap_or_default().to_string();
result.insert(
prop_id.clone(),
value.to_string()
);
// Get the label from property_labels signal // Update labels if missing
if let Some(label) = property_labels.get().get(&prop_id).cloned() { set_property_labels.update(|labels| {
result.insert( labels.entry(prop_id.clone())
prop_id.clone(), .or_insert(prop_label.to_string());
format!("{}: {}", });
property_labels.get().get(&prop_id).cloned().unwrap_or(prop_id.clone()),
value_label
)
);
// Ensure the label is stored in property_labels
set_property_labels.update(|labels| {
labels.entry(prop_id.clone()).or_insert_with(|| label.clone());
});
}
} }
} }
} }