diff --git a/html/relnotes.html b/html/relnotes.html index 50f99d85a336b0cb1e4d57b64782ec7908d49790..d21dfede033d4f178fbd1296bb21704976ca8759 100644 --- a/html/relnotes.html +++ b/html/relnotes.html @@ -73,6 +73,8 @@ with a warning: <li>Added <tt>BasicAlignment.deleteAllCells()</tt> (impl)</li> <li>Suppressed the guard for applying the Hungarian algorithm to equisimilarity situations (impl)</li> +<li>Slightly modified the parser so that it accepts Alignment URI with + or without # (parser)</li> <li>Fixed a bug on <tt>DistanceAlignment</tt> 1:1 extraction when the second ontology is larger than the first one (impl)</li> </ul></p> diff --git a/src/fr/inrialpes/exmo/align/parser/XMLParser.java b/src/fr/inrialpes/exmo/align/parser/XMLParser.java index bdb111713e71d4f2f00a5b06a5f25aeb5a3ad8a9..459f0bb1a2f87f0ad900d90eef85e90dc1a9628c 100644 --- a/src/fr/inrialpes/exmo/align/parser/XMLParser.java +++ b/src/fr/inrialpes/exmo/align/parser/XMLParser.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA, 2003-2005, 2007-2010 + * Copyright (C) INRIA, 2003-2005, 2007-2011 * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -496,6 +496,7 @@ public class XMLParser extends DefaultHandler { parseLevel = alignLevel; // restore level�< alignLevel = -1; } else { + if ( namespaceURI.equals( Namespace.ALIGNMENT.uri+"#" ) ) namespaceURI = Namespace.ALIGNMENT.uri; if ( parseLevel == 3 ){ alignment.setExtension( namespaceURI, pName, content ); } else if ( parseLevel == 5 ) { diff --git a/test/src/READMETest.java b/test/src/READMETest.java index bb82d03601e9dd20afd19a399ab29e07ca68791b..1873e7b73a53259367acda7e8086134b8042655f 100644 --- a/test/src/READMETest.java +++ b/test/src/READMETest.java @@ -120,7 +120,7 @@ $ java -cp lib/procalign.jar fr.inrialpes.exmo.align.util.ParserPrinter examples result.render( renderer ); writer.flush(); writer.close(); - assertTrue( ( 2009 <= stream.toString().length() ) && ( stream.toString().length() <= 2011 ), "Rendered differently: expected "+2010+" but was "+stream.toString().length() ); + assertTrue( ( 1973 <= stream.toString().length() ) && ( stream.toString().length() <= 1974 ), "Rendered differently: expected "+1974+" but was "+stream.toString().length() ); } @Test(groups = { "full", "impl", "raw" }, dependsOnMethods = {"routineTest3"}) diff --git a/test/src/RendererTest.java b/test/src/RendererTest.java index ce0b271f545847c3455af70bc9d9ec0bbf493089..44e1388f909ba5c0f7b8a6d76ba345b92703b121 100644 --- a/test/src/RendererTest.java +++ b/test/src/RendererTest.java @@ -86,7 +86,7 @@ public class RendererTest { writer.flush(); writer.close(); //System.err.println( stream.toString() ); - assertTrue( valueSimilarTo( stream.toString().length(), 10429 ), "Rendered differently: expected "+10429+" but was "+stream.toString().length() ); + assertTrue( valueSimilarTo( stream.toString().length(), 10417 ), "Rendered differently: expected "+10417+" but was "+stream.toString().length() ); Properties params = new Properties(); params.setProperty( "embedded", "1"); } @@ -137,7 +137,8 @@ public class RendererTest { oalignment.render( renderer ); // test error with alignment writer.flush(); writer.close(); - assertTrue( valueSimilarTo( stream.toString().length(), 5927 ), "Rendered differently: expected "+5927+" but was "+stream.toString().length() ); + //System.err.println( stream.toString() ); + assertTrue( valueSimilarTo( stream.toString().length(), 5830 ), "Rendered differently: expected "+5830+" but was "+stream.toString().length() ); } @Test(groups = { "full", "impl", "raw" }) @@ -164,7 +165,7 @@ public class RendererTest { oalignment.render( renderer ); // test error with alignment writer.flush(); writer.close(); - assertTrue( valueSimilarTo( stream.toString().length(), 16283 ), "Rendered differently: expected "+16283+" but was "+stream.toString().length() ); + assertTrue( valueSimilarTo( stream.toString().length(), 16141 ), "Rendered differently: expected "+16141+" but was "+stream.toString().length() ); } @Test(groups = { "full", "impl", "raw" }) @@ -190,7 +191,8 @@ public class RendererTest { oalignment.render( renderer ); // test error with alignment writer.flush(); writer.close(); - assertTrue( valueSimilarTo( stream.toString().length(), 11589 ), "Rendered differently: expected "+11589+" but was "+stream.toString().length() ); + //System.err.println( stream.toString() ); + assertTrue( valueSimilarTo( stream.toString().length(), 11492 ), "Rendered differently: expected "+11492+" but was "+stream.toString().length() ); } @Test(groups = { "full", "impl", "raw" }) @@ -204,7 +206,7 @@ public class RendererTest { writer.flush(); writer.close(); //System.err.println( stream.toString() ); - assertTrue( valueSimilarTo( stream.toString().length(), 13668 ), "Rendered differently: expected "+13668+" but was "+stream.toString().length() ); + assertTrue( valueSimilarTo( stream.toString().length(), 13589 ), "Rendered differently: expected "+13589+" but was "+stream.toString().length() ); } @Test(groups = { "full", "impl", "raw" }) @@ -217,7 +219,7 @@ public class RendererTest { alignment.render( renderer ); writer.flush(); writer.close(); - assertTrue( valueSimilarTo( stream.toString().length(), 860 ), "Rendered differently: expected "+860+" but was "+stream.toString().length() ); + assertTrue( valueSimilarTo( stream.toString().length(), 770 ), "Rendered differently: expected "+770+" but was "+stream.toString().length() ); }