Skip to content

Commit bc4bade

Browse files
jgrewejgrewe
authored
Merge pull request #282 from mpsonntag/verConvTest
lgtmt
2 parents 9280d6e + dfa04f5 commit bc4bade

9 files changed

+991
-17
lines changed

‎odml/tools/version_converter.py‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ def _parse_dict_document(cls, parsed_doc):
9191
curr_element.text = parsed_doc[elem]
9292
root.append(curr_element)
9393

94-
print(ET.tounicode(root, pretty_print=True))
9594
return ET.ElementTree(root)
9695

9796
@classmethod
@@ -357,10 +356,22 @@ def _handle_value(self, value, log_id):
357356
elif val_elem.tag in format.Property.arguments_keys:
358357
new_elem = ET.Element(val_elem.tag)
359358
new_elem.text = val_elem.text
359+
360+
if val_elem.tag in ["type", "dtype"] and val_elem.text == "binary":
361+
new_elem.text = "text"
362+
self._log("[Warning] Replacing unsupported value type "
363+
"'binary' with 'text' (%s)" % log_id)
364+
360365
parent.append(new_elem)
361366
elif val_elem.tag in self._version_map:
362367
new_elem = ET.Element(self._version_map[val_elem.tag])
363368
new_elem.text = val_elem.text
369+
370+
if val_elem.tag in ["type", "dtype"] and val_elem.text == "binary":
371+
new_elem.text = "text"
372+
self._log("[Warning] Replacing unsupported value type "
373+
"'binary' with 'text' (%s)" % log_id)
374+
364375
parent.append(new_elem)
365376
else:
366377
self._log("[Info] Omitted non-Value attribute '%s: %s/%s'"

‎test/resources/version_conversion.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Document": {
3+
"version": "v1.13",
4+
"date": "2018-07-07",
5+
"author": "author",
6+
"sections": [
7+
{
8+
"name": "sec_one",
9+
"type" : "mainsec",
10+
"properties": [
11+
{
12+
"name": "prop_one",
13+
"values": [
14+
{
15+
"value": "['one', 'two']",
16+
"dtype": "string"
17+
},
18+
{
19+
"value": "1",
20+
"dtype": "int"
21+
}
22+
]
23+
}
24+
],
25+
"sections": [
26+
{
27+
"name": "subsec_one",
28+
"sections": [],
29+
"type": "subsec"
30+
}
31+
]
32+
}
33+
]
34+
},
35+
"odml-version": "1"
36+
}

‎test/resources/version_conversion.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<odML version="1">
2+
<date>2008-07-07</date>
3+
<section>
4+
<name>sec_one</name>
5+
<type>mainsec</type>
6+
<section>
7+
<name>subsec_one</name>
8+
<type>subsec</type>
9+
</section>
10+
<property>
11+
<name>prop_name</name>
12+
<value>
13+
['one', 'two']
14+
<type>string</type>
15+
</value>
16+
<value>
17+
1
18+
<type>int</type>
19+
</value>
20+
</property>
21+
</section>
22+
<author>author</author>
23+
</odML>

‎test/resources/version_conversion.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Document:
2+
version: v1.13
3+
author: author
4+
date: '2008-07-07'
5+
sections:
6+
- name: sec_one
7+
type: mainsec
8+
sections:
9+
- name: subsec_one
10+
type: subsec
11+
properties:
12+
- name: prop_name
13+
values:
14+
- dtype: !!python/object/apply:odml.dtypes.DType
15+
- string
16+
value: '[''one'', ''two'']'
17+
- dtype: !!python/object/apply:odml.dtypes.DType
18+
- int
19+
value: '1'
20+
odml-version: '1'

‎test/resources/version_conversion_int.json‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
{
2+
"Document": {
3+
"repository": "http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml",
4+
"version": "v1.13",
5+
"date": "2018-02-02",
6+
"sections": [
7+
{
8+
"definition": "def s1",
9+
"name": "sec_one",
10+
"include": "url s1",
11+
"properties": [
12+
{
13+
"definition": "def prop1",
14+
"values": [
15+
{
16+
"dtype": "string"
17+
},
18+
{
19+
"uncertainty": 11,
20+
"unit": "arbitrary",
21+
"definition": "def val 1",
22+
"value": "'1'",
23+
"reference": "ref val 1",
24+
"dtype": "string",
25+
"filename": "filename val 1"
26+
},
27+
{
28+
"uncertainty": 12,
29+
"unit": "arbitrary 2",
30+
"definition": "def val 1",
31+
"value": "2",
32+
"reference": "ref val 1",
33+
"dtype": "int",
34+
"filename": "filename val 1"
35+
},
36+
{
37+
"uncertainty": 13,
38+
"unit": "arbitrary 3",
39+
"definition": "def val 3",
40+
"value": "'3'",
41+
"reference": "ref val 3",
42+
"dtype": "string",
43+
"filename": "filename val 3"
44+
}
45+
],
46+
"name": "prop_one",
47+
"dependency_value": "dep val p1",
48+
"dependency": "dep p1"
49+
},
50+
{
51+
"definition": "def prop2",
52+
"values": [
53+
{
54+
"dtype": "string"
55+
},
56+
{
57+
"uncertainty": 12,
58+
"unit": "arbitrary",
59+
"definition": "def val 1",
60+
"value": "1",
61+
"reference": "ref val 1",
62+
"dtype": "int",
63+
"filename": "filename val 1"
64+
},
65+
{
66+
"uncertainty": 12,
67+
"unit": "arbitrary",
68+
"definition": "def val 1",
69+
"value": "2",
70+
"reference": "ref val 1",
71+
"dtype": "int",
72+
"filename": "filename val 1"
73+
},
74+
{
75+
"uncertainty": 12,
76+
"unit": "arbitrary",
77+
"definition": "def val 1",
78+
"value": "3",
79+
"reference": "ref val 1",
80+
"dtype": "int",
81+
"filename": "filename val 1"
82+
},
83+
{
84+
"uncertainty": 12,
85+
"unit": "arbitrary",
86+
"definition": "def val 1",
87+
"value": "4",
88+
"reference": "ref val 1",
89+
"dtype": "int",
90+
"filename": "filename val 1"
91+
},
92+
{
93+
"uncertainty": 12,
94+
"unit": "arbitrary",
95+
"definition": "def val 1",
96+
"value": "4",
97+
"reference": "ref val 1",
98+
"dtype": "int",
99+
"filename": "filename val 1"
100+
},
101+
{
102+
"uncertainty": 12,
103+
"unit": "arbitrary",
104+
"definition": "def val 1",
105+
"value": "4",
106+
"reference": "ref val 1",
107+
"dtype": "int",
108+
"filename": "filename val 1"
109+
},
110+
{
111+
"uncertainty": 12,
112+
"unit": "arbitrary",
113+
"definition": "def val 1",
114+
"value": "4",
115+
"reference": "ref val 1",
116+
"dtype": "int",
117+
"filename": "filename val 1"
118+
},
119+
{
120+
"uncertainty": 12,
121+
"unit": "arbitrary",
122+
"definition": "def val 1",
123+
"value": "4",
124+
"reference": "ref val 1",
125+
"dtype": "int",
126+
"filename": "filename val 1"
127+
}
128+
],
129+
"name": "prop_two",
130+
"dependency_value": "dep val p2",
131+
"dependency": "dep p2"
132+
},
133+
{
134+
"definition": "def prop3",
135+
"values": [
136+
{
137+
"dtype": "string"
138+
}
139+
],
140+
"name": "prop_three",
141+
"dependency_value": "dep val p3",
142+
"dependency": "dep p3"
143+
}
144+
],
145+
"sections": [
146+
{
147+
"definition": "def subs1",
148+
"name": "subsection one",
149+
"include": "url subs1",
150+
"properties": [
151+
{
152+
"definition": "def prop1",
153+
"values": [
154+
{
155+
"dtype": "string"
156+
}
157+
],
158+
"name": "prop one",
159+
"dependency_value": "dep val p1",
160+
"dependency": "dep p1"
161+
},
162+
{
163+
"definition": "def prop3",
164+
"values": [
165+
{
166+
"dtype": "string"
167+
},
168+
{
169+
"uncertainty": 12,
170+
"unit": "arbitrary",
171+
"definition": "def val 1",
172+
"value": "4",
173+
"reference": "ref val 1",
174+
"dtype": "int",
175+
"filename": "filename val 1"
176+
},
177+
{
178+
"uncertainty": 12,
179+
"unit": "arbitrary",
180+
"definition": "def val 1",
181+
"value": "4",
182+
"reference": "ref val 1",
183+
"dtype": "int",
184+
"filename": "filename val 1"
185+
},
186+
{
187+
"uncertainty": 12,
188+
"unit": "arbitrary",
189+
"definition": "def val 1",
190+
"value": "4",
191+
"reference": "ref val 1",
192+
"dtype": "int",
193+
"filename": "filename val 1"
194+
},
195+
{
196+
"uncertainty": 12,
197+
"unit": "arbitrary",
198+
"definition": "def val 1",
199+
"value": "2",
200+
"reference": "ref val 1",
201+
"dtype": "int",
202+
"filename": "filename val 1"
203+
}
204+
],
205+
"name": "prop three",
206+
"dependency_value": "dep val p3",
207+
"dependency": "dep p3"
208+
},
209+
{
210+
"definition": "def prop2",
211+
"values": [
212+
{
213+
"dtype": "string"
214+
}
215+
],
216+
"name": "prop two",
217+
"dependency_value": "dep val p2",
218+
"dependency": "dep p2"
219+
}
220+
],
221+
"sections": [],
222+
"type": "subsec",
223+
"reference": "ref subs1"
224+
}
225+
],
226+
"type": "mainsec",
227+
"reference": "ref s1"
228+
},
229+
{
230+
"definition": "def s2",
231+
"name": "section two",
232+
"properties": [],
233+
"sections": [],
234+
"type": "mainsec",
235+
"link": "somewhere s2",
236+
"reference": "ref s2"
237+
},
238+
{
239+
"definition": "def s3",
240+
"name": "section three",
241+
"include": "http://portal.g-node.org/odml/terminologies/v1.0/terminologies.xml",
242+
"properties": [],
243+
"sections": [],
244+
"type": "mainsec",
245+
"reference": "ref s3"
246+
}
247+
],
248+
"author": "author"
249+
},
250+
"odml-version": "1"
251+
}

0 commit comments

Comments
 (0)