Index: main/plugin-odf-export/src/org/ametys/odf/export/ExportManager.java =================================================================== --- main/plugin-odf-export/src/org/ametys/odf/export/ExportManager.java (revision 36871) +++ main/plugin-odf-export/src/org/ametys/odf/export/ExportManager.java (working copy) @@ -1079,7 +1079,7 @@ Counter fillIndex = new Counter(2); CompositeMetadata metadata = content.getMetadataHolder(); - fillCompositeMetadata(fillIndex, content, cType, metadata, tableName, id, stmt); + fillCompositeMetadata(fillIndex, content, cType, metadata, tableName, id, "", stmt); nbContentFilled++; _contentTypeInfos.get(contentTypeId).put("nbFilled", nbContentFilled); @@ -1118,7 +1118,7 @@ CompositeMetadata metadataRepeater = metadata.getCompositeMetadata(name); - fillCompositeMetadata(fillIndex, null, metadataDef, metadataRepeater, tableName, idRepeater, stmt); + fillCompositeMetadata(fillIndex, null, metadataDef, metadataRepeater, tableName, idRepeater, "", stmt); getLogger().debug(stmt.toString()); stmt.addBatch(); @@ -1139,7 +1139,7 @@ * @param stmt * @throws SQLException */ - protected void fillCompositeMetadata(Counter fillIndex, Content content, MetadataDefinitionHolder metadataDef, CompositeMetadata metadata, String tableName, String id, PreparedStatement stmt) throws SQLException + protected void fillCompositeMetadata(Counter fillIndex, Content content, MetadataDefinitionHolder metadataDef, CompositeMetadata metadata, String tableName, String id, String prefix, PreparedStatement stmt) throws SQLException { for (String metadataNameDef : metadataDef.getMetadataNames()) { @@ -1151,7 +1151,7 @@ { if (metadata.hasMetadata(metadataName)) { - fillTableForMultipleMetadata(metadataDefComposite, metadata, metadataName, tableName + "_meta_" + metadataNameDef, id); + fillTableForMultipleMetadata(metadataDefComposite, metadata, metadataName, tableName + "_meta_" + prefix + metadataNameDef, id); } } else @@ -1286,7 +1286,7 @@ } else { - fillCompositeMetadata(fillIndex, null, metadataDef, compositeMetadata, tableName, id, stmt); + fillCompositeMetadata(fillIndex, null, metadataDef, compositeMetadata, tableName, id, metadataName + "_", stmt); } break; default: Index: main/plugin-odf-export/src/org/ametys/odf/export/ODFExportManager.java =================================================================== --- main/plugin-odf-export/src/org/ametys/odf/export/ODFExportManager.java (revision 36871) +++ main/plugin-odf-export/src/org/ametys/odf/export/ODFExportManager.java (working copy) @@ -443,9 +443,9 @@ /////////////////////////////////////////////////////////////////////////////////////////////////////////////// @Override - protected void fillCompositeMetadata(Counter fillIndex, Content content, MetadataDefinitionHolder metadataDef, CompositeMetadata metadata, String tableName, String id, PreparedStatement stmt) throws SQLException + protected void fillCompositeMetadata(Counter fillIndex, Content content, MetadataDefinitionHolder metadataDef, CompositeMetadata metadata, String tableName, String id, String prefix, PreparedStatement stmt) throws SQLException { - super.fillCompositeMetadata(fillIndex, content, metadataDef, metadata, tableName, id, stmt); + super.fillCompositeMetadata(fillIndex, content, metadataDef, metadata, tableName, id, prefix, stmt); if (content != null) { @@ -563,7 +563,7 @@ CompositeMetadata metadata = subProgram.getMetadataHolder(); ContentType cType = _contentTypeExtensionPoint.getExtension(ODF_SUBPROGRAM_CONTENTTYPE_ID); - fillCompositeMetadata(fillIndex, subProgram, cType, metadata, subProgramTableName, id, stmt); + fillCompositeMetadata(fillIndex, subProgram, cType, metadata, subProgramTableName, id, "", stmt); if (parentType.equals("program")) { @@ -601,7 +601,7 @@ CompositeMetadata metadata = container.getMetadataHolder(); ContentType cType = _contentTypeExtensionPoint.getExtension(ODF_CONTAINER_CONTENTTYPE_ID); - fillCompositeMetadata(fillIndex, container, cType, metadata, containerTableName, id, stmt); + fillCompositeMetadata(fillIndex, container, cType, metadata, containerTableName, id, "", stmt); if (parentType.equals("program")) {