zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prepare for version 0.5.1-beta

Browse source
This commit is contained in:
anhefti 2019-11-21 16:13:47 +01:00
parent c1eb395679
commit 3772ad754d
4 changed files with 11 additions and 9 deletions
pom.xml
src/main
java/ch/ethz/seb/sebserver/webservice/servicelayer
dao/impl
ConfigurationDAOBatchService.java
sebconfig/impl
ExamConfigXMLParser.java
resources/config
application.properties

2
pom.xml
View file

@ -18,7 +18,7 @@
<packaging>jar</packaging>
<properties>
<sebserver-version>0.5.0-beta</sebserver-version>
<sebserver-version>0.5.1-beta</sebserver-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationDAOBatchService.java
View file

@ -716,7 +716,7 @@ class ConfigurationDAOBatchService {
});
// override with template values if available
if (configNode.templateId == null || configNode.templateId == ConfigurationNode.DEFAULT_TEMPLATE_ID) {
if (configNode.templateId == null || configNode.templateId.equals(ConfigurationNode.DEFAULT_TEMPLATE_ID)) {
initAdditionalDefaultValues(configNode, config);
} else {
writeTemplateValues(configNode, config);

14
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigXMLParser.java
View file

@ -312,19 +312,22 @@ public class ExamConfigXMLParser extends DefaultHandler {
"Failed to get InlineTable values. value/name array length mismatch");
}
String val = "";
final StringBuilder valueBuilder = new StringBuilder();
for (int i = 0; i < names.length; i++) {
if (i != 0) {
if (i % numColumns == 0) {
val = val + Constants.LIST_SEPARATOR;
valueBuilder.append(Constants.LIST_SEPARATOR);
} else {
val = val + Constants.EMBEDDED_LIST_SEPARATOR;
valueBuilder.append(Constants.EMBEDDED_LIST_SEPARATOR);
}
}
val = val + names[i] + Constants.FORM_URL_ENCODED_NAME_VALUE_SEPARATOR + values[i];
valueBuilder
.append(names[i])
.append(Constants.FORM_URL_ENCODED_NAME_VALUE_SEPARATOR)
.append(values[i]);
}
saveValue(attrName, attribute, top.listIndex, val);
saveValue(attrName, attribute, top.listIndex, valueBuilder.toString());
}
@Override
@ -460,7 +463,6 @@ public class ExamConfigXMLParser extends DefaultHandler {
int listIndex = 0;
String valueName;
String value;
boolean saveNullValueAsBlank = false;
protected PListNode(final Type type) {
this.type = type;

2
src/main/resources/config/application.properties
View file

@ -5,6 +5,6 @@ spring.mandatory-file-encoding=UTF-8
spring.http.encoding.charset=UTF-8
spring.http.encoding.enabled=true
sebserver.version=0.5.0 beta
sebserver.version=0.5.1 beta
sebserver.supported.languages=en,de