eliminate linkgrp

florenceclavaud · Jun 13, 2012 · 38c490e · 38c490e
1 parent e1b1031
commit 38c490e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/ead_revised.rng b/ead_revised.rng
@@ -104,6 +104,7 @@ Other changes:
 * remove ptr and extref
 * add @containerid to <container>
 * create element <formsavailable> in <did>, with children <container> and <dao> (which are now only available in <formsavailable>)
+* eliminate linkgrp
 
 -->
 <!--
@@ -1006,7 +1007,8 @@ Other changes:
 		<choice>
 			<ref name="ref"/>
 			<!-- <ref name="extref"/> -->
-			<element name="linkgrp">
+			<!--TC; 2012-06-13: eliminate linkgrp -->
+			<!--<element name="linkgrp">
 				<ref name="a.common"/>
 				<ref name="extendedLink"/>
 				<oneOrMore>
@@ -1015,6 +1017,7 @@ Other changes:
 					</choice>
 				</oneOrMore>
 			</element>
+			-->
 			<ref name="bibref"/>
 			<ref name="title"/>
 			<ref name="archref"/>

diff --git a/ead_revised_test_instance.xml b/ead_revised_test_instance.xml
@@ -33,11 +33,15 @@
 
     <archdesc level="collection">
         <did>
+            <abstract></abstract>
             <unittitle>Records of Stuff</unittitle>
             <unitdate>1896-1927</unitdate>
         </did>
 
-        <scopecontent><p>Blah blah blah</p></scopecontent>
+
+        <scopecontent>
+            <p>Blah blah blah</p>
+        </scopecontent>
         <legalstatus>Blah blah blah</legalstatus>
         <relations>
             <cpfRelation>
@@ -52,12 +56,12 @@
             <did>
                 <unittitle>Series 1: Old stuff</unittitle>
                 <formsavailable>
-                    <container></container>
-                    <dao xmlns:ns1="http://www.w3.org/1999/xlink" ns1:type="simple"></dao>
+                    <container containerid="xxxxxxxxx" type="Box">1</container>
+                    <container containerid="yyyyyyyyy" type="Folder">1</container>
+                    <dao xmlns:ns1="http://www.w3.org/1999/xlink" ns1:type="simple"/>
                 </formsavailable>
-
             </did>
-            <relations/>
+            <relations></relations>
             <c>
                 <did>
                     <unittitle>Stuff</unittitle>
@@ -68,7 +72,7 @@
             <did>
                 <unittitle>Series 2: New stuff</unittitle>
             </did>
-            <dao xmlns:ns1="http://www.w3.org/1999/xlink" ns1:type="simple"></dao>
+            <dao xmlns:ns1="http://www.w3.org/1999/xlink" ns1:type="simple"/>
         </c>
     </archdesc>
 </ead>