From 6b856ca055604c7e0885fb663fdd6819b7c42057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Mon, 12 May 2014 09:26:34 +0000
Subject: [PATCH] - tw bugs/improvements on ontology network management in the
server
---
src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java | 7 ++++++-
src/fr/inrialpes/exmo/align/service/SQLCache.java | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
index 39942ce7..a3e7ac74 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
@@ -284,7 +284,12 @@ public class BasicOntologyNetwork implements OntologyNetwork {
while ( stmtIt.hasNext() ) {
RDFNode al = stmtIt.nextStatement().getObject();
if ( al.isURIResource() ) {
- on.addAlignment( aparser.parse( al.asResource().getURI() ) );
+ String aluri = al.asResource().getURI();
+ Alignment alobject = aparser.parse( aluri );
+ if ( alobject.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID ) == null ) {
+ alobject.setExtension( Namespace.ALIGNMENT.uri, Annotations.ID, aluri );
+ }
+ on.addAlignment( alobject );
} else {
logger.debug( "IGNORED Exception : Alignments must be identified by URIs" );
}
diff --git a/src/fr/inrialpes/exmo/align/service/SQLCache.java b/src/fr/inrialpes/exmo/align/service/SQLCache.java
index a60bb991..e70a881b 100644
--- a/src/fr/inrialpes/exmo/align/service/SQLCache.java
+++ b/src/fr/inrialpes/exmo/align/service/SQLCache.java
@@ -349,14 +349,14 @@ public class SQLCache extends VolatilCache implements Cache {
//ResultSet rs = st.executeQuery( "SELECT * FROM network WHERE id = '" + id +"'" );
//while( rs.next() ) {}
ResultSet rs = st.executeQuery( "SELECT * FROM networkontology WHERE network = '" + id +"'" );
- if ( rs.next() ) {
+ while ( rs.next() ) {
// TODO: Create the ontology if non existant [NO: Todo when storing!]
network.addOntology( new URI( rs.getString( "onto" ) ) );
}
rs = st.executeQuery( "SELECT * FROM networkalignment WHERE network = '" + id +"'" );
- if ( rs.next() ) {
+ while ( rs.next() ) {
// get the alignment with that URI and set it
- network.addAlignment( getAlignment( rs.getString("align") ) );
+ network.addAlignment( getAlignment( recoverAlignmentUri( rs.getString("align") ) ) );
}
// Get extension metadata (including URI)
--
GitLab