Work on ODK manifest support.

[gpl/argeo-suite.git] / org.argeo.entity.api / src / org / argeo / entity / entity.cnd

diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index 78fb8ccb1c0f6fc7d1b530ce82be1ec839c39347..12d1ba69a2fa25b70bc347f7f3212dc30d1fe7f8 100644 (file)
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -4,7 +4,7 @@
 // see https://www.w3.org/2003/01/geo/
 //<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
 
-<ldap = "http://www.argeo.org/ns/ldap">
+<ldif = "http://www.argeo.org/ns/ldif">
 <entity = 'http://www.argeo.org/ns/entity'>
 
 [entity:entity] > mix:created, mix:referenceable
@@ -36,11 +36,13 @@ orderable
 
 [entity:term]
 orderable
-+ * (entity:term) = entity:term *
+- name (NAME) m
+- * (*)
++ term (entity:term) = entity:term *
 
 [entity:terms] > mix:referenceable
 orderable
-+ * (entity:term) = entity:term *
++ term (entity:term) = entity:term *
 
 //
 // FORM
@@ -48,12 +50,15 @@ orderable
 [entity:form]
 mixin
 
-[entity:formSet]
+[entity:formSubmission]
+mixin
+
+[entity:formSet] > mix:title
 mixin
 
 // LDAP-LIKE ENTITIES
 // A real person
 [entity:person] > entity:entity
 mixin
-- ldap:sn (String)
-- ldap:givenName (String)
+- ldif:sn (String)
+- ldif:givenName (String)