Commit 7b536383 authored by marceteau's avatar marceteau
Browse files
parents 5f56683b b521e659
......@@ -233,15 +233,22 @@
<username>${unix.user}</username>
<groupname>${unix.group}</groupname>
</mapping>
<mapping>
<directory>/etc/${unix.name}</directory>
<username>${unix.user}</username>
<groupname>${unix.group}</groupname>
</mapping>
<mapping>
<directory>/usr/bin</directory>
<username>${unix.user}</username>
<groupname>${unix.group}</groupname>
<sources>
<source>
<location>${project.build.outputDirectory}/archive-converter</location>
</source>
</sources>
<filemode>755</filemode>
<directoryIncluded>false</directoryIncluded>
<sources>
<source>
<location>${project.build.outputDirectory}/${unix.name}</location>
</source>
</sources>
</mapping>
<mapping>
<directory>/usr/share/java/${unix.name}</directory>
......
......@@ -209,6 +209,7 @@ public class ArchiveConverterMain {
}
archiveConverter = new DCToSeda21Converter(commandLine.getOptionValue("c"), planClassementPath);
archiveConverter.setOnlyManifest(true);
((AbstractArchiveConverter)archiveConverter).setSipType(formalism);
}else if(formalism.equals("seda1")) {
archiveConverter = new Seda1ToSeda21Converter();
archiveConverter.setOnlyManifest(true);
......
......@@ -1856,7 +1856,7 @@ public class DCToSeda21Converter extends AbstractArchiveConverter {
//noteFichier
String noteFichier = properties.getProperty(NOTE_FICHIER);
if ("true".equalsIgnoreCase(noteFichier.trim()) && fichMeta.getNoteFichier() != null) {
if (noteFichier != null && "true".equalsIgnoreCase(noteFichier.trim()) && fichMeta.getNoteFichier() != null) {
content.setSource(fichMeta.getNoteFichier().getValue());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment