CSPACE-12, CSPACE-13: Added all of the fields in the Hello, World example to the...

Changed the 'displayed' entity field attribute to a Boolean datatype, from an enumerated 'choice'.

diff --git a/sandbox/aron/schema/CollectionObject.xml b/sandbox/aron/schema/CollectionObject.xml
index 9ad68b88badd4239f4dc59762cac5218c5a69b65..974b96da2434e58acd7a47c8c2c48936b9d9c9d4 100644 (file)
--- a/sandbox/aron/schema/CollectionObject.xml
+++ b/sandbox/aron/schema/CollectionObject.xml
@@ -19,8 +19,10 @@
                        <!-- Optional notes about the usage and meaning of this entity go here. -->
                </usageNotes>
                
+               <!-- Inspired by http://pahma.berkeley.edu/delphi/object/170594 -->
+
                <coreFields>
-                       <id></id>
+                       <id>170594</id>
                        <created></created>
                        <createdBy></createdBy>
                        <lastModified></lastModified>
@@ -30,22 +32,73 @@
                <fields>
                        <field
                                systemName="objectNumber"
-                               displayName="ID"
+                               displayName="object Number"
                                usageNotes="In-depth notes about usage go here"
                                usageHint="Tooltip-type hints go here, such as 'Primary museum ID for this item'"
                                displayed="true"
-                               lengthHint="20">
+                               lengthHint="20em">
+                               <!-- Field contents go here -->
+                               2-68479
+                       </field>
+                       <field
+                               systemName="otherNumber"
+                               displayName="Other number"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="false">
+                               <!-- Field contents go here -->
+                       </field>
+                       <field
+                               systemName="briefDescription"
+                               displayName="Brief description"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="true">
+                               <!-- Field contents go here -->
+                               Conical shape, made of willow warp and weft.
+                       </field>
+                       <field
+                               systemName="comments"
+                               displayName="Comments"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="true">
+                               <!-- Field contents go here -->
+                               In very poor condition, flattened and broken.
+                       </field>
+                       <field
+                               systemName="distinguishingFeatures"
+                               displayName="Distinguishing features"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="true">
+                               <!-- Field contents go here -->
+                               Diagonal twining.
+                       </field>
+                       <field
+                               systemName="objectName"
+                               displayName="Object name"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="true">
+                               <!-- Field contents go here -->
+                               Basket
+                       </field>
+                       <field
+                               systemName="responsibleDepartment"
+                               displayName="Responsible department"
+                               usageNotes=""
+                               usageHint=""
+                               displayed="true">
                                <!-- Field contents go here -->
-                               pahma-collectionname-2007-06-09-00055
                        </field>
                        <field
                                systemName="title"
                                displayName="Title"
-                               usageNotes="In-depth notes about usage go here"
-                               usageHint="Tooltip-type hints go here"
+                               usageNotes=""
+                               usageHint=""
                                displayed="true">
                                <!-- Field contents go here -->
-                               Paiute Basket
                        </field>
                </fields>
                

diff --git a/sandbox/aron/schema/CollectionObject2.xml b/sandbox/aron/schema/CollectionObject2.xml
index 7c3d2e23628849ad0da6f368432f5e068d10c956..803afa6b897d6ef3eabe65339c8373346d2160a3 100644 (file)
--- a/sandbox/aron/schema/CollectionObject2.xml
+++ b/sandbox/aron/schema/CollectionObject2.xml
@@ -10,7 +10,7 @@
        (This instance uses InfoBlocks, that help group related fields into sub-sections
        of the object schema.)
        
-       This is created for the CollectionSpace system, http://www.collectionspace.org/
+       This document was created for the CollectionSpace system, http://www.collectionspace.org/
 
 -->
 
@@ -22,8 +22,10 @@
                        <!-- Optional notes about the usage and meaning of this entity go here. -->
                </usageNotes>
                
+               <!-- Inspired by http://pahma.berkeley.edu/delphi/object/170594 -->
+
                <coreFields>
-                       <id></id>
+                       <id>170594</id>
                        <created></created>
                        <createdBy></createdBy>
                        <lastModified></lastModified>
@@ -33,25 +35,77 @@
                <infoBlocks>
                
                        <infoBlock blockName="basic">
+                       
                                <fields>
                                        <field
                                                systemName="objectNumber"
-                                               displayName="ID"
+                                               displayName="object Number"
                                                usageNotes="In-depth notes about usage go here"
                                                usageHint="Tooltip-type hints go here, such as 'Primary museum ID for this item'"
                                                displayed="true"
-                                               lengthHint="20">
+                                               lengthHint="20em">
+                                               <!-- Field contents go here -->
+                                               2-68479
+                                       </field>
+                                       <field
+                                               systemName="otherNumber"
+                                               displayName="Other number"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="false">
+                                               <!-- Field contents go here -->
+                                       </field>
+                                       <field
+                                               systemName="briefDescription"
+                                               displayName="Brief description"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="true">
+                                               <!-- Field contents go here -->
+                                               Conical shape, made of willow warp and weft.
+                                       </field>
+                                       <field
+                                               systemName="comments"
+                                               displayName="Comments"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="true">
+                                               <!-- Field contents go here -->
+                                               In very poor condition, flattened and broken.
+                                       </field>
+                                       <field
+                                               systemName="distinguishingFeatures"
+                                               displayName="Distinguishing features"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="true">
+                                               <!-- Field contents go here -->
+                                               Diagonal twining.
+                                       </field>
+                                       <field
+                                               systemName="objectName"
+                                               displayName="Object name"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="true">
+                                               <!-- Field contents go here -->
+                                               Basket
+                                       </field>
+                                       <field
+                                               systemName="responsibleDepartment"
+                                               displayName="Responsible department"
+                                               usageNotes=""
+                                               usageHint=""
+                                               displayed="true">
                                                <!-- Field contents go here -->
-                                               pahma-collectionname-2007-06-09-00055
                                        </field>
                                        <field
                                                systemName="title"
                                                displayName="Title"
-                                               usageNotes="In-depth notes about usage go here"
-                                               usageHint="Tooltip-type hints go here"
+                                               usageNotes=""
+                                               usageHint=""
                                                displayed="true">
                                                <!-- Field contents go here -->
-                                               Paiute Basket
                                        </field>
                                </fields>
                        </infoBlock>

diff --git a/sandbox/aron/schema/entityFieldAttributes.rng b/sandbox/aron/schema/entityFieldAttributes.rng
index 98e298a23e82797e793bddd91a23012965aa2abd..e4fcb2666e6b563e8433801199a87d8e1fc4ad9e 100644 (file)
--- a/sandbox/aron/schema/entityFieldAttributes.rng
+++ b/sandbox/aron/schema/entityFieldAttributes.rng
@@ -74,10 +74,7 @@
        <attribute
                name="displayed"
                a:defaultValue="true">
-               <choice>
-                       <value>true</value>
-                       <value>false</value>
-               </choice>
+               <data type="boolean"/>
        </attribute>
        
        <!--