diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java index f95d3cf948c3d2b29a53cc8ea410bea0dbd19756..b9feb82f30f76690d584049e53beb0630f1b09e9 100644 --- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java +++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java @@ -409,7 +409,7 @@ public class AServProtocolManager { public Message store( Message mess ){ String id = mess.getContent(); Alignment al=null; - System.err.println("Id from Store in AServProtocol=" + id ); + try { try{ al = alignmentCache.getAlignment( id ); diff --git a/src/fr/inrialpes/exmo/align/service/CacheImpl.java b/src/fr/inrialpes/exmo/align/service/CacheImpl.java index 9825c19daba72ec82fa16441f3bb3116363b66d0..0ebc5213a26cca0cc7afc9575d221c8299381006 100644 --- a/src/fr/inrialpes/exmo/align/service/CacheImpl.java +++ b/src/fr/inrialpes/exmo/align/service/CacheImpl.java @@ -370,12 +370,7 @@ public class CacheImpl { * retrieve full alignment from id (and cache it) */ public Alignment getAlignment( String id ) throws AlignmentException, SQLException { - Set<String> keys = (Set<String>)alignmentTable.keySet(); - for( String aId : keys ) { - System.err.println("Id=" + aId); - } - System.err.println("End of list."); - + Alignment result = null; try{ result = alignmentTable.get( id ); diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java index 9578fea0ade1adce9ff9be0993f41df714d351db..102c0628c873601799017b235652e43a1a4da8db 100644 --- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java +++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java @@ -341,8 +341,6 @@ public class HTMLAServProfile implements AlignmentServiceProfile { //return r; } - System.err.println("Id from HTMLAServ =" + params.getParameter("id") ); - if ( oper.equals( "aserv" ) ){ if ( wsmanager != null ) { return new Response( HTTP_OK, MIME_HTML, wsmanager.protocolAnswer( uri, uri.substring(start), header, params ) ); @@ -355,10 +353,6 @@ public class HTMLAServProfile implements AlignmentServiceProfile { } else if ( oper.equals( "html" ) ){ return htmlAnswer( uri, uri.substring(start), header, params ); } else if ( oper.equals( "rest" ) ){ - - //System.err.println("Return format=" + params.getParameter("return") ); - //System.err.println("onto1=" + params.getParameter("onto1") ); - //System.err.println("Id from HTMLAServ =" + params.getParameter("id") ); params.setParameter( "restful", "true" ); diff --git a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java index a2fa01376caeada1c25befc7ccc277a05f18048d..b754e5fe1b83e13beea23a5e9ae2c77fdb82605a 100644 --- a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java +++ b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java @@ -260,14 +260,14 @@ public class WSAServProfile implements AlignmentServiceProfile { Message answer = null; msg += " <storeResponse>\n"; Parameters params = param; + if( restful == null ) { params = getParameters( domMessage ); - } - - if ( params.getParameter( "alid" ) == null ) { + if ( params.getParameter( "alid" ) == null ) { answer = new NonConformParameters(0,(Message)null,myId,"",message,(Parameters)null); - } else { + } else { params.setParameter( "id", params.getParameter( "alid" ) ); + } } if ( answer == null ) @@ -478,6 +478,7 @@ public class WSAServProfile implements AlignmentServiceProfile { Message answer = null; msg += " <metadataResponse>\n"; Parameters params = param; + if( restful == null ) { params = getParameters( domMessage ); if ( params.getParameter( "alid" ) == null ) {