Changeset 2564 for molgenis_distro


Ignore:
Timestamp:
01/22/10 08:16:08 (2 years ago)
Author:
mswertz
Message:

simplified example model, added example data (which also is visible in the tab delimited format documentation)

Location:
molgenis_distro/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • molgenis_distro/3.3/molgenis.properties

    r2420 r2564  
    1313# xml file with user screen descriptions in terms of 'form', 'menu',.. 
    1414model_userinterface = molgenis_ui.xml 
     15 
     16example_data_dir = data 
    1517 
    1618############################################################### 
  • molgenis_distro/3.3/molgenis_db.xml

    r2449 r2564  
    1 <?xml version="1.0" encoding="UTF-8"?>  
    2 <!--DOCTYPE molgenis PUBLIC "MOLGENIS 1.0" "http://molgenis.sourceforge.net/dtd/molgenis_v_1_0.dtd"--> 
     1<?xml version="1.0" encoding="UTF-8"?> 
     2        <!-- 
     3                DOCTYPE molgenis PUBLIC "MOLGENIS 1.0" 
     4                "http://molgenis.sourceforge.net/dtd/molgenis_v_1_0.dtd" 
     5        --> 
    36<molgenis name="example" label="My MOLGENIS"> 
    4         <description>This is an minimal example database to show how 
    5                 MOLGENIS works. The purpose of this example database is to 
    6                 administrate experiment, samples, traits and measurements. The 
    7                 name='example' will result in a Java package 'example' being 
    8                 generated.</description> 
     7        <description>This is an minimal example database to show how MOLGENIS works. 
     8                The purpose of this example database is to administrate experiment, samples, 
     9                traits and measurements. The name='example' will result in a Java package 
     10                'example' being generated.</description> 
    911        <!-- abstract data types --> 
    1012        <entity name="Identifiable" abstract="true"> 
    11                 <description>For modeling purposes only (denoted by 
    12                         abstract='true', this entity defines fields id and name centrally. 
    13                 </description> 
     13                <description>For modeling purposes only (denoted by abstract='true', this 
     14                        entity defines fields id and name centrally.</description> 
    1415                <field name="Id" type="autoid" description="autogenerated id number (autoid)" /> 
    1516                <field name="Name" unique="true" readonly="true" 
     
    2627        <!-- sample description structure --> 
    2728        <entity name="Sample" implements="Identifiable"> 
    28                 <description>Samples that are part of an experiment. 
    29                 </description> 
    30                 <field name="Species" default="Arabidopsis thaliana" 
    31                         description="Species, default to Arabidopsis" /> 
     29                <description>Samples that are part of an experiment.</description> 
     30                <field name="Experiment" type="xref" xref_field="Experiment.Id" 
     31                        xref_label="Name" 
     32                        description="Samples are part-of one experiment (by cross reference to Experiment.id)" /> 
     33                <field name="Species" default="Arabidopsis thaliana" description="Species, default to Arabidopsis" /> 
    3234                <field name="Tissue" nillable="true" description="Optional specification of tissue" /> 
    3335                <field name="Sex" type="enum" enum_options="[male,female,unknown]" 
    3436                        description="Fixed choice on Sex" /> 
    35                 <field name="Experiment" type="xref" xref_field="Experiment.Id" xref_label="Name" 
    36                         description="Samples are part-of one experiment (by cross reference to Experiment.id)" /> 
    37                 <field name="SampleTime" type="datetime"/> 
     37                <field name="SampleTime" type="datetime" /> 
    3838        </entity> 
    3939        <entity name="SpecialSample" extends="Sample"> 
     
    4242        <!-- trait description structure --> 
    4343        <entity name="Trait" implements="Identifiable"> 
    44                 <description>Traits that are studied in this experiment. 
    45                 </description> 
    46                 <field name="Molcular" type="bool" 
     44                <description>Traits that are studied in this experiment.</description> 
     45                <field name="Molecular" type="bool" 
    4746                        description="Indication whether this is a molecular trait" /> 
    4847                <field name="Experiment" type="xref" xref_field="Experiment.Id" 
     
    5150        </entity> 
    5251        <!-- trait description structure --> 
    53         <entity name="Measurement" implements="Identifiable"> 
    54                 <description>Measurements (i.e. set of trait observations 
    55                         per sample) that are part of an experiment.</description> 
     52        <entity name="Data"> 
     53                <description>Data values (observations) of a measurement. Note: Data doesn't 
     54                        inherit from Identifiable because it has no unique name.</description> 
     55                <field name="Id" type="autoid" description="autogenerated id number" /> 
    5656                <field name="Experiment" type="xref" xref_field="Experiment.Id" 
    5757                        xref_label="Name" description="Measurements are part-of one experiment" /> 
    58                 <field name="DataFile" type="file" 
    59                         description="A file attachment that summarizes the results" /> 
    60         </entity> 
    61         <entity name="Data"> 
    62                 <description>Data values (observations) of a measurement. Note: 
    63                         Data doesn't inherit from Identifiable because it has no unique name. 
    64                 </description> 
    65                 <field name="Id" type="autoid" description="autogenerated id number" /> 
    66                 <field name="Measurement" type="xref" xref_field="Measurement.id" 
    67                         xref_label="Name" description="Data values are part-of one Measurement" /> 
    68                 <field name="Sample" type="xref" xref_field="Sample.Id" 
    69                         xref_label="Name" description="The sample this measurement is on" /> 
    70                 <field name="Trait" type="xref" xref_field="Trait.Id" 
    71                         xref_label="Name" description="The trait this measurement is on" /> 
     58                <field name="Sample" type="xref" xref_field="Sample.Id" xref_label="Name" 
     59                        description="The sample this measurement is on" /> 
     60                <field name="Trait" type="xref" xref_field="Trait.Id" xref_label="Name" 
     61                        description="The trait this measurement is on" /> 
    7262                <field name="Value" description="The value measured/calculated" /> 
    73                 <unique fields="Measurement,Sample,Trait" description="There can be only one value per Sample X Trait" /> 
     63                <unique fields="Experiment,Sample,Trait" description="There can be only one value per Sample X Trait" /> 
    7464        </entity> 
    7565</molgenis> 
  • molgenis_distro/3.3/molgenis_ui.xml

    r2558 r2564  
    1111                                <form name="Samples" entity="Sample" view="list" /> 
    1212                                <form name="Traits" entity="Trait" view="list" /> 
    13                                 <form name="Measurements" entity="Measurement"> 
    14                                         <form name="Data" entity="Data" /> 
    15                                 </form> 
     13                                <form name="Data" entity="Data" /> 
    1614                        </menu> 
    1715                </form> 
Note: See TracChangeset for help on using the changeset viewer.