Update of /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core In directory james.mmbase.org:/tmp/cvs-serv17337
Modified Files: educations.xml people.xml Log Message: more cleaning See also: http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/config/builders/didactor_core Index: educations.xml =================================================================== RCS file: /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core/educations.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- educations.xml 18 Oct 2007 14:40:04 -0000 1.2 +++ educations.xml 28 Jan 2008 14:35:12 -0000 1.3 @@ -6,7 +6,7 @@ name="educations" maintainer="didactor.nl" version="3" extends="object"> <class>nl.didactor.builders.DidactorBuilder</class> - <searchage>-1</searchage> + <searchage>100000</searchage> <names> <singular xml:lang="nl">Opleiding</singular> @@ -21,7 +21,6 @@ </descriptions> <properties> - <property name="max-nodes-from-query">99999</property> <property name="smartpathfield">path,name</property> </properties> @@ -41,25 +40,24 @@ <list>1</list> </positions> </editor> - <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes" /> - <db> - <type state="persistent" size="255" notnull="true" key="false">STRING</type> - </db> + <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes"> + <required value="true" /> + <maxLength value="255" /> + </datatype> </field> <field name="intro"> <descriptions> - <description xml:lang="nl">Introtekst</description> + <description xml:lang="nl">Introtekst, te gebruiken als 'description'</description> <description xml:lang="en">Introductionary text</description> </descriptions> <gui> <guiname xml:lang="nl">Intro</guiname> <guiname xml:lang="en">Intro</guiname> </gui> - <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes" /> - <db> - <type state="persistent" size="65535" notnull="false" key="false">STRING</type> - </db> + <datatype base="field" xmlns="http://www.mmbase.org/xmlns/datatypes"> + <maxLength value="65535" /> + </datatype> </field> <field name="path"> @@ -76,10 +74,10 @@ <list>3</list> </positions> </editor> - <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes" /> - <db> - <type state="persistent" size="255" notnull="true" key="false">STRING</type> - </db> + <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes"> + <required value="true" /> + <maxLength value="255" /> + </datatype> </field> <field name="showtitle"> @@ -96,7 +94,9 @@ <list>2</list> </positions> </editor> - <datatype base="boolean" xmlns="http://www.mmbase.org/xmlns/datatypes" /> + <datatype base="boolean" xmlns="http://www.mmbase.org/xmlns/datatypes"> + <default value="true" /> + </datatype> </field> <field name="layout"> @@ -113,9 +113,7 @@ <list>2</list> </positions> </editor> - <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"> - <!-- probably a enumeration --> - </datatype> + <datatype base="didactor_layout" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> <field name="imagelayout"> @@ -127,11 +125,10 @@ <guiname xml:lang="nl">Layout afbeeldingen</guiname> <guiname xml:lang="en">Images layout</guiname> </gui> - <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"> - <!-- probably a enumeration --> - </datatype> + <datatype base="didactor_imagelayout" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> + </fieldlist> <functionlist> Index: people.xml =================================================================== RCS file: /var/cvs/contributions/didactor2/src/core/config/builders/didactor_core/people.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- people.xml 10 Jan 2008 15:57:45 -0000 1.11 +++ people.xml 28 Jan 2008 14:35:12 -0000 1.12 @@ -106,11 +106,7 @@ <list>3</list> </positions> </editor> - <datatype base="line" xmlns="http://www.mmbase.org/xmlns/datatypes"> - <class name="nl.didactor.datatypes.UserName" /> - <required value="true" /> - <maxLength value="255" /> - </datatype> + <datatype base="didactor_people_lastname" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> <field name="address"> @@ -179,14 +175,7 @@ <guiname xml:lang="bg">??????????????</guiname> <guiname xml:lang="eo">Lando</guiname> </gui> - <datatype base="eline" xmlns="http://www.mmbase.org/xmlns/datatypes" > - <required value="false" /> - <pattern value="NL|BE|AW|AN|SR|BG|FR|CH|RO" /> - <enumeration enforce="oncreate"> - <entry sorterclass="org.mmbase.util.SortedBundle$ValueWrapper" - basename="org.mmbase.datatypes.resources.iso3166" /> - </enumeration> - </datatype> + <datatype base="didactor_people_country" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> @@ -236,10 +225,7 @@ <guiname xml:lang="hi">???-?????????</guiname> <guiname xml:lang="eo">Retadreso</guiname> </gui> - <datatype base="internetaddress" xmlns="http://www.mmbase.org/xmlns/datatypes"> - <required value="false" /> - <maxLength value="1024" /> - </datatype> + <datatype base="didactor_people_email" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> <field name="verify_email"> @@ -288,19 +274,7 @@ <guiname xml:lang="en">Age</guiname> <guiname xml:lang="nl">Leeftijd</guiname> </gui> - <datatype base="integer" xmlns="http://www.mmbase.org/xmlns/datatypes"> - <minInclusive value="0" /> - <setprocessor> - <class name="org.mmbase.datatypes.processors.Age$Setter"> - <param name="birthdateField">dayofbirth</param> - </class> - </setprocessor> - <getprocessor> - <class name="org.mmbase.datatypes.processors.Age$Getter"> - <param name="birthdateField">dayofbirth</param> - </class> - </getprocessor> - </datatype> + <datatype base="didactor_people_age" xmlns="http://www.mmbase.org/xmlns/datatypes" /> </field> <field name="gender"> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs