Author: kmorin Date: 2009-12-23 16:32:17 +0100 (Wed, 23 Dec 2009) New Revision: 341 Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java Log: - correction in the export (transform < and & into <s; and &) Modified: wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-11 15:46:53 UTC (rev 340) +++ wikengo_core-wikitty/wikengo_core-wikitty-api/src/main/java/org/sharengo/wikitty/AbstractWikittyService.java 2009-12-23 15:32:17 UTC (rev 341) @@ -613,10 +613,11 @@ extensionList += "," + id; if (!extDone.contains(id)) { extDone.add(id); - result.write(" <extension name='" + ext.getName() + "' version='" + ext.getVersion() + "' requires='" + ext.getRequires() + "'>\n"); + result.write(" <extension name='" + ext.getName() + "' version='" + ext.getVersion() + "'" + + (ext.getRequires() != null ? " requires='" + ext.getRequires() + "'" : "") + ">\n"); for (String fieldName : ext.getFieldNames()) { String def = ext.getFieldType(fieldName).toDefinition(fieldName); - result.write(" <field>" + def + "</field>\n"); + result.write(" <field>" + def.replace("&", "&").replace("<", "<") + "</field>\n"); } result.write(" </extension>\n"); } @@ -629,11 +630,11 @@ for (String fieldName : w.fieldNames()) { FieldType type = w.getFieldType(fieldName); if (type.isCollection()) { - for (Object o : (List) w.getFqField(fieldName)) { - result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, o) + "</" + fieldName + ">\n"); + for (Object o : (Set) w.getFqField(fieldName)) { + result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, o).replace("&", "&").replace("<", "<") + "</" + fieldName + ">\n"); } } else { - result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, w.getFqField(fieldName)) + "</" + fieldName + ">\n"); + result.write(" <" + fieldName + ">" + WikittyUtil.toString(type, w.getFqField(fieldName)).replace("&", "&").replace("<", "<") + "</" + fieldName + ">\n"); } } result.write(" </object>\n");