Skip to content

Commit f3ae20e

Browse files
authored
Merge pull request #274 from RobokopU24/bugfix/omnicorp-edges
Restore missing Omnicorp edges
2 parents a725635 + da5978d commit f3ae20e

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

src/pages/answer/useAnswerStore.js

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -120,30 +120,33 @@ export default function useAnswerStore() {
120120
const edges = {};
121121
const edgesJSON = {};
122122
row.analyses.forEach((analysis) => {
123-
Object.values(analysis.edge_bindings).forEach((edgeBindings) => {
124-
edgeBindings.forEach((binding) => {
125-
const kgEdge = message.knowledge_graph.edges[binding.id];
126-
edgesJSON[binding.id] = kgEdge || 'Unknown';
127-
if (kgEdge) {
128-
const graphEdge = {
129-
id: binding.id,
130-
source: kgEdge.subject,
131-
target: kgEdge.object,
132-
predicate: kgEdge.predicate,
133-
};
134-
edges[binding.id] = graphEdge;
135-
if (kgEdge.subject in nodes) {
136-
nodes[kgEdge.subject].score += 1;
137-
}
138-
if (kgEdge.object in nodes) {
139-
nodes[kgEdge.object].score += 1;
140-
}
141-
const subjectNode = message.knowledge_graph.nodes[kgEdge.subject];
142-
const objectNode = message.knowledge_graph.nodes[kgEdge.object];
143-
const edgeKey = `${subjectNode.name || kgEdge.subject} ${stringUtils.displayPredicate(kgEdge.predicate)} ${objectNode.name || kgEdge.object}`;
144-
publications[edgeKey] = resultsUtils.getPublications(kgEdge);
123+
const edge_bindings = Object.values(analysis.edge_bindings)[0] || [];
124+
const support_graph_edge_bindings = analysis.support_graphs.reduce((acc, support_graph_id) => (
125+
[...acc, ...message.auxiliary_graphs[support_graph_id].edges.map((e) => ({ id: e }))]
126+
), []);
127+
128+
[...edge_bindings, ...support_graph_edge_bindings].forEach((binding) => {
129+
const kgEdge = message.knowledge_graph.edges[binding.id];
130+
edgesJSON[binding.id] = kgEdge || 'Unknown';
131+
if (kgEdge) {
132+
const graphEdge = {
133+
id: binding.id,
134+
source: kgEdge.subject,
135+
target: kgEdge.object,
136+
predicate: kgEdge.predicate,
137+
};
138+
edges[binding.id] = graphEdge;
139+
if (kgEdge.subject in nodes) {
140+
nodes[kgEdge.subject].score += 1;
141+
}
142+
if (kgEdge.object in nodes) {
143+
nodes[kgEdge.object].score += 1;
145144
}
146-
});
145+
const subjectNode = message.knowledge_graph.nodes[kgEdge.subject];
146+
const objectNode = message.knowledge_graph.nodes[kgEdge.object];
147+
const edgeKey = `${subjectNode.name || kgEdge.subject} ${stringUtils.displayPredicate(kgEdge.predicate)} ${objectNode.name || kgEdge.object}`;
148+
publications[edgeKey] = resultsUtils.getPublications(kgEdge);
149+
}
147150
});
148151
});
149152

0 commit comments

Comments
 (0)