Skip to content

Commit

Permalink
#117 fixed problem with odml xml templates, added section template lo…
Browse files Browse the repository at this point in the history 
…cation into properties.
  • Loading branch information
rinkesj committed Jul 2, 2015
1 parent 64a6696 commit 7b82fb5
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 86 deletions.
9 changes: 0 additions & 9 deletions src/main/resources/odML/odMLSections/lif.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,6 @@
<definition>The time ocnstant with which the threshold returns back to baseline.</definition>
</property>

<property>
<name>Threshold</name>
<value>
<type>float</type>
<unit>V</unit>
</value>
<definition>The firing threshold.</definition>
</property>

<property>
<name>ThresholdEquation</name>
<value>
Expand Down
152 changes: 76 additions & 76 deletions src/main/resources/odML/odMLSections/software.xml
View file
Original file line number Diff line number Diff line change
@@ -1,106 +1,106 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="Form.xsl" xmlns:odml="http://www.g-node.org/odml"?>
<!-- ********************************** -->
<!-- Software -->
<!-- Software -->
<!-- ********************************** -->
<odML version="1">
<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
<version>1.0</version>
<date>2014-03-02</date>
<section>
<type>software</type>
<name>Software</name>
<definition>This is a software section .</definition>
<property>
<name>Name</name>
<value>
<type>string</type>
</value>
<repository>http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml</repository>
<version>1.0</version>
<date>2014-03-02</date>

<section>
<type>software</type>
<name>Software</name>
<definition>This is a software section .</definition>

<property>
<name>Software name</name>
<value>
<type>string</type>
</value>
<definition>The software's name.</definition>
<required>yes</required>
</property>
<property>
<name>Owner</name>
<value>
<type>string</type>
</value>
<required>yes</required>
</property>

<property>
<name>Owner</name>
<value>
<type>string</type>
</value>
<definition>The owner of the software.</definition>
</property>
<property>
</property>

<property>
<name>Developer</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>The developer or the developers firm.</definition>
</property>
<property>
</property>

<property>
<name>Version</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>Version of the software.</definition>
<required>yes</required>
</property>
<property>
<required>yes</required>
</property>

<property>
<name>Licence</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>License type</definition>
</property>
<property>
</property>

<property>
<name>LicenceStart</name>
<value>
<type>date</type>
</value>
<value>
<type>date</type>
</value>
<definition>The start date of time limited licence.</definition>
</property>
<property>
</property>

<property>
<name>LicenceExpiration</name>
<value>
<type>date</type>
</value>
<value>
<type>date</type>
</value>
<definition>The end date of time limited licence.</definition>
</property>
</property>

<property>
<name>LicenceDuration</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>Duration of the licece for the software.</definition>
</property>
</property>

<property>
<name>LicenceCount</name>
<value>
<type>int</type>
</value>
<value>
<type>int</type>
</value>
<definition>Number of the software's licence.</definition>
</property>
</property>

<property>
<name>Distribution</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>Distribution type</definition>
</property>
</property>

<property>
<name>Decsription</name>
<value>
<type>string</type>
</value>
<value>
<type>string</type>
</value>
<definition>The descrisption of the software.</definition>
</property>
</section>
</property>
</section>
</odML>
4 changes: 3 additions & 1 deletion src/main/webapp/WEB-INF/applicationContext.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@
<bean name="templateService" class="cz.zcu.kiv.eegdatabase.wui.core.experiments.metadata.TemplateServiceImpl" autowire="byType">
<property name="templateDao" ref="templateDao" />
</bean>
<bean name="templateFacade" class="cz.zcu.kiv.eegdatabase.wui.core.experiments.metadata.TemplateFacadeImpl" autowire="byType" />
<bean name="templateFacade" class="cz.zcu.kiv.eegdatabase.wui.core.experiments.metadata.TemplateFacadeImpl" autowire="byType" >
<property name="odmlSectionsPath" value="${odml.sections}"/>
</bean>


<!-- MEMBERSHIP PLANS, LICENCE HISTORY -->
Expand Down
3 changes: 3 additions & 0 deletions src/main/webapp/WEB-INF/project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ data.zip=Data
#On change public license file : put license file in src/main/resource and change filename in the property
public.license=CreativeCommonsCCBY-NC-SA4.pdf

#location basic odml section xml template
odml.sections=odML/odMLSections

# RUN APPLICATION IN DEVELOPMENT OR NOT (true/false) = show or hide exception for users.
development=true

Expand Down

0 comments on commit 7b82fb5

Please sign in to comment.