diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java index 03e093e48946dd665bfb7f1b1cf05071665044dd..9336063926a29a47fd7b5e60b70b03731f62c113 100644 --- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java +++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java @@ -314,7 +314,7 @@ public class AServProtocolManager { String prettys = ""; for ( Alignment al : alignments ) { msg += al.getExtension( Annotations.ALIGNNS, Annotations.ID )+" "; - prettys += al.getExtension( Annotations.ALIGNNS, Annotations.PRETTY ); + prettys += al.getExtension( Annotations.ALIGNNS, Annotations.PRETTY )+ ":"; } return new AlignmentIds(newId(),mess,myId,mess.getSender(),msg,(Parameters)null,prettys); } diff --git a/src/fr/inrialpes/exmo/align/service/AlignmentIds.java b/src/fr/inrialpes/exmo/align/service/AlignmentIds.java index a6eed356e329bae975c2d3e0bac9b5318dc5e26d..f3303483d8d648c0117d403b1ffc33916a15235e 100644 --- a/src/fr/inrialpes/exmo/align/service/AlignmentIds.java +++ b/src/fr/inrialpes/exmo/align/service/AlignmentIds.java @@ -40,10 +40,24 @@ public class AlignmentIds extends Success { public String HTMLString(){ String result = "Alignment Ids: <ul>"; String id[] = content.split(" "); - String pid[] = pretty.split("???"); + String pid[] = pretty.split(":"); + for ( int i = id.length-1; i >= 0; i-- ){ + //System.err.println("id["+i+"]"+id[i]); result += "<li><a href=\"../html/retrieve?method=fr.inrialpes.exmo.align.impl.renderer.HTMLRendererVisitor&id="+id[i]+"\">"; - if ( pid != null && !pid[i].equals("") ) result += " ("+pid[i]+")"; + result += id[i]; + String pp = null; + if ( pid != null ) { + try { + pp = pid[i]; + if (pp != null && !pp.equals("") && !pp.equals("null")) { + result += " ("+pp+")"; + } + //System.err.println("pid["+i+"]="+pp); + } catch(Exception ex) { + } + } + result += "</a></li>"; } return result += "</ul>"; diff --git a/src/fr/inrialpes/exmo/align/service/CacheImpl.java b/src/fr/inrialpes/exmo/align/service/CacheImpl.java index 54a78af5a67350fa62f3f326ea5bd0d183be1aa8..a5278faef33b64586e8f3d2a2076900cdcfdbca4 100644 --- a/src/fr/inrialpes/exmo/align/service/CacheImpl.java +++ b/src/fr/inrialpes/exmo/align/service/CacheImpl.java @@ -409,15 +409,35 @@ public class CacheImpl { public Set<Alignment> getAlignments( URI uri1, URI uri2 ) { // Create the set and compare Set<Alignment> result = new HashSet<Alignment>(); + String uri2String = uri2.toString(); + String uri1String = uri1.toString(); + Set<String> potentials = alignmentTable.keySet(); + for( String it : potentials ) { + Alignment al = (Alignment)alignmentTable.get( it ); + //System.err.println("get2="+al.getExtension(SVCNS, OURI2)); + //System.err.println("get1="+al.getExtension(SVCNS, OURI1)); + if ( al.getExtension(SVCNS, OURI1).equals( uri1String ) && al.getExtension(SVCNS, OURI2).equals( uri2String ) ) { + result.add( al ); + } + } + /* Set<Alignment> potentials = ontologyTable.get( uri1 ); if ( potentials != null ) { String uri2String = uri2.toString(); + String uri1String = uri1.toString(); for( Iterator it = potentials.iterator(); it.hasNext(); ) { Alignment al = (Alignment)it.next(); // This is not the best because URI are not resolved here... - if ( al.getExtension(SVCNS, OURI2).equals( uri2String ) ) result.add( al ); + System.out.println("get2="+al.getExtension(SVCNS, OURI2)); + System.out.println("get1="+al.getExtension(SVCNS, OURI1)); + System.out.println("uri2String="+uri2String); + System.out.println("uri1String="+uri1String); + if ( al.getExtension(SVCNS, OURI2).equals( uri2String ) ) { + result.add( al ); + } } } + */ return result; } diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java index 465ffbb922796e4d0052957823b9da19effadaa2..fc5ec836b3ae326f76f702a0fddd8cddc9e41a6e 100644 --- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java +++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java @@ -351,6 +351,9 @@ public class HTMLAServProfile implements AlignmentServiceProfile { } else if ( oper.equals( "admin" ) ){ return adminAnswer( uri, uri.substring(start), header, params ); } else if ( oper.equals( "html" ) ){ + //System.err.println( "perf =" + uri.substring(start)); + //System.err.println( "onto1 =" +params.getParameter("onto1")); + //System.err.println( "onto2 =" +params.getParameter("onto2")); return htmlAnswer( uri, uri.substring(start), header, params ); } else if ( oper.equals( "rest" ) ){