浏览代码

Update OML generator with latest vocabulary version.

Joeri Exelmans 2 年之前
父节点
当前提交
c745dc42eb
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 1 1
      src/xopp2oml/README.md
  2. 3 2
      src/xopp2oml/template.oml

+ 1 - 1
src/xopp2oml/README.md

@@ -2,4 +2,4 @@
 
 This exporter generates OML descriptions that use the following vocabulary:
 
-https://msdl.uantwerpen.be/git/lucasalbertins/DTDesign/src/d070f9e9e932ad9910eaab92eabc368e7ee96058/examples/oml/CDF/src/oml/flandersmake.be/cdf/vocabulary/xopp.oml
+https://msdl.uantwerpen.be/git/lucasalbertins/DTDesign/src/15c791c78589f9c064fc402feec5228b5a80f549/examples/oml/CDF/src/oml/flandersmake.be/cdf/vocabulary/xopp.oml

+ 3 - 2
src/xopp2oml/template.oml

@@ -1,8 +1,8 @@
 {%- macro attributes(pageindex, page, layerindex, layer, elementindex, element) -%}
 {%- for key,value in element.attributes.items() %}
   ci p{{pageindex}}l{{layerindex}}e{{elementindex}}a{{loop.index}} : xopp:XMLAttribute [
-    xopp:hasKey "{{key}}"
-    xopp:hasValue "{{value}}"
+    dict:hasKey "{{key}}"
+    dict:hasValue "{{value}}"
     xopp:ofLayerElement p{{pageindex}}l{{layerindex}}e{{elementindex}}
     object_diagram:inModel model
   ]
@@ -51,6 +51,7 @@ description <http://flandersmake.be/cdf/description/{{namespace}}#> as {{namespa
 
   uses <http://flandersmake.be/cdf/vocabulary/xopp#> as xopp
   uses <http://flandersmake.be/cdf/vocabulary/object_diagram#> as object_diagram
+  uses <http://flandersmake.be/cdf/vocabulary/dict#> as dict
 
   ci model : xopp:Model []