Only in dspace-1.4-source: CHANGES
Only in dspace-1.4-source: KNOWN_BUGS
Only in dspace-1.4-source: LICENSE
Only in dspace-1.4-source: README
Only in dspace-1.4-source: bin
Only in dspace-1.4-source: build.xml
Only in dspace-1.4-source/config: controlled-vocabularies
Only in dspace-1.4-source/config: crosswalks
Only in dspace-1.4-source/config: dc2mods.cfg
Only in dspace-1.4-source/config: default.license
Only in dspace-1.4-source/config: dspace.cfg
Only in dspace-1.4-source/config: dstat.cfg
Only in dspace-1.4-source/config: dstat.map
Only in dspace-1.4-source/config: emails
diff -aur dspacepatch/config/input-forms.xml dspace-1.4-source/config/input-forms.xml
--- dspacepatch/config/input-forms.xml	2006-09-04 16:23:03.000000000 +0200
+++ dspace-1.4-source/config/input-forms.xml	2006-02-08 15:35:40.000000000 +0100
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE input-forms >
 
+
 <input-forms>
 
- <!-- No CVS-variables in this document, pls!!                             -->
  <!-- The form-map maps collection handles to forms. DSpace does not       -->
  <!-- require that a collection's name be unique, even within a community .-->
  <!-- DSpace does however insure that each collection's handle is unique.  -->
@@ -14,7 +14,7 @@
  <!-- the mapping for handle "default".                                    -->
 
  <form-map>
-   <name-map collection-handle="default" form-name="stadtteilarchiv" />
+   <name-map collection-handle="default" form-name="traditional" />
  </form-map>
 
 
@@ -36,226 +36,13 @@
 
  <form-definitions>
 
-	<form name="stadtteilarchiv">
-		<page number="1">
-			<field>
-				<dc-element>type</dc-element>
-         		<dc-qualifier></dc-qualifier>
-         		<repeatable>true</repeatable>
-         		<label>Medium</label>
-         		<input-type value-pairs-name="common_types">dropdown</input-type>
-         		<hint>W&#x00E4;hlen Sie bitte einen oder mehrere Inhalts-Typen aus. Um mehrere auszuw&#x00E4;hlen, m&#x00FC;ssen Sie m&#x00F6;glicherweise SHIFT oder CTRL gedr&#x00FC;ckt halten.</hint>
-         		<required>>Die Auswahl eines Inhaltstypen ist erforderlich.</required>
-			</field>
-
-            <field>
-                <dc-element>relation</dc-element>
-                <dc-qualifier>ispartof</dc-qualifier>
-                <label>Konvolut</label>
-                <input-type>onebox</input-type>
-                <hint>&#x00DC;bergeordnetes Dokument</hint>
-            </field>
-            			
-			<field>
-				<dc-element>identifier</dc-element>
-				<dc-qualifier>other</dc-qualifier>
-				<repeatable>false</repeatable>
-				<label>Signatur</label>
-				<input-type>onebox</input-type>
-				<hint>Eine innerhalb der Sammlung eindeutige Signatur</hint>
-			</field>
-			
-			<field>
-			    <dc-element>location</dc-element>
-			    <dc-qualifier></dc-qualifier>
-			    <repeatable>false</repeatable>
-			    <label>Physikalischer Standort</label>
-			    <input-type>onebox</input-type>
-			    <hint>Geben Sie den derzeitigen physikalischen Standort an.</hint>
-		    </field>
-
-			<field>
-				<dc-element>format</dc-element>
-				<dc-qualifier>medium</dc-qualifier>
-				<label>Physikalische Beschaffenheit</label>
-				<input-type>onebox</input-type>
-				<repeatable>true</repeatable>
-				<hint>Tragen Sie bitte ein oder mehrere Materialien ein.</hint>
-			</field>			
-
-			<field>
-				<dc-element>format</dc-element>
-				<dc-qualifier>extent</dc-qualifier>
-				<label>Gr&#x00F6;&#x00DF;e bzw. Dauer</label>
-				<input-type>onebox</input-type>
-				<hint>Seitenanzahl, Ma&#x00DF;e eines Bildes oder Dauer einer Tonaufzeichnung</hint>
-			</field>
-			
-    		<field>
-				<dc-element>description</dc-element>
-				<dc-qualifier>provenance</dc-qualifier>
-				<label>Herkunft</label>
-				<input-type>onebox</input-type>
-				<hint>Verwahrungsgeschichte des Objekts seit seiner Entstehung,<br/>einschlie&#x00DF;lich im Laufe der Zeit vorgenommene &#x00C4;nderungen</hint>
-			</field>
-			
-			<field>
-				<dc-element>description</dc-element>
-				<dc-qualifier>sponsorship</dc-qualifier>
-				<label>Erwerbung</label>
-				<input-type>onebox</input-type>
-				<hint>Informationen &#x00FC;ber den Geber und vertragliche Abmachungen</hint>
-			</field>
-
-			<field>
-				<dc-element>rights</dc-element>
-				<dc-qualifier></dc-qualifier>
-				<label>Rechte</label>
-				<input-type>textarea</input-type>
-				<hint>Bedingungen, die Benutzung und Vervielf&#x00E4;ltigung regeln</hint>
-			</field>
-						
-		</page>
-
-		<page number="2">
-			<field>
-         		<dc-element>contributor</dc-element>
-         		<dc-qualifier>author</dc-qualifier>
-         		<repeatable>true</repeatable>
-         		<label>Autoren</label>
-                <input-type>name</input-type>
-         		<hint>Geben Sie hier die Namen der Autoren an.</hint>
-	       </field>
-	
-			<field>
-         		<dc-element>date</dc-element>
-         		<dc-qualifier>created</dc-qualifier>
-         		<label>Entstehungsdatum</label>
-                <input-type>date</input-type>
-         		<hint>Datum der Entstehung bzw. Herstellung, wenn verschieden vom Datum der Ver&#x00F6;ffentlichung</hint>
-	       </field>
-	       
-           <field>
-                <dc-element>language</dc-element>
-                <dc-qualifier>iso</dc-qualifier>
-                <repeatable>false</repeatable>
-                <label>Sprache</label>
-                <input-type value-pairs-name="common_iso_languages">dropdown</input-type>
-                <hint>W&#x00E4;hlen Sie bitte die Sprache des Hauptinhaltes dieses Objekts aus. Falls die Sprache in der Liste nicht vorhanden ist, w&#x00E4;hlen Sie andere. F&#x00FC;r ein Bild oder &#x00E4;hnliches ohne Sprache w&#x00E4;hlen Sie N/A.</hint>
-                <required></required>
-           </field>
-
-	       <field>
-	           <dc-element>contributor</dc-element>
-	           <dc-qualifier>editor</dc-qualifier>
-	           <repeatable>true</repeatable>
-	           <label>Herausgeber</label>
-	           <input-type>name</input-type>
-	           <hint>Namen der Herausgeber, falls vorhanden</hint>
-	       </field>
-	           
-	       <field>
-	       		<dc-element>publisher</dc-element>
-	       		<dc-qualifier></dc-qualifier>
-	       		<label>Verlag</label>
-	       		<input-type>onebox</input-type>
-	       		<hint>Name des Verlags, falls vorhanden</hint>
-	       </field>
-	       
-	       <field>
-	       		<dc-element>date</dc-element>
-	       		<dc-qualifier>issued</dc-qualifier>
-	       		<label>Erscheinungsdatum</label>
-	       		<input-type>date</input-type>
-	       		<hint>Datum der erstmaligen Ver&#x00F6;ffentlichung</hint>
-			</field>
-			
-       		<field>
-         		<dc-element>title</dc-element>
-         		<dc-qualifier></dc-qualifier>
-         		<repeatable>false</repeatable>
-         		<label>Titel</label>
-         		<input-type>onebox</input-type>
-         		<hint>Haupttitel dieses Objekts(erforderlich)</hint>
-         		<required>Die Angabe eines Titels ist erforderlich.</required>
-       		</field>
-       		
-       		<field>
-       		   <dc-element>title</dc-element>
-       		   <dc-qualifier>alternative</dc-qualifier>
-       		   <repeatable>true</repeatable>
-       		   <label>Sonstige Titel</label>
-       		   <input-type>twobox</input-type>
-       		   <hint>Weitere Titel, zum Beispiel den originalsprachlichen Titel oder einen Zusatz zum Titel</hint>
-       		</field>
-       			
-			<field>
-				<dc-element>coverage</dc-element>
-				<dc-qualifier>temporal</dc-qualifier>
-				<label>Zeitlicher Zusammenhang</label>
-				<input-type>onebox</input-type>
-				<hint>Die zeitlichen Eigenschaften des Dokuments</hint>
-			</field>
-		
-			<field>
-				<dc-element>coverage</dc-element>
-				<dc-qualifier>spatial</dc-qualifier>
-				<label>R&#x00E4;umlicher Zusammenhang</label>
-				<input-type>onebox</input-type>
-				<hint>Die r&#x00E4;umlichen Eigenschaften des Dokuments</hint>
-			</field>		
-
-			<field>
-    	    	<dc-element>description</dc-element>
-        	 	<dc-qualifier></dc-qualifier>
-         		<repeatable>false</repeatable>
-         		<label>Beschreibung</label>
-         		<input-type>textarea</input-type>
-         		<hint>Abstrakte und konkrete Beschreibung des Dokumenteninhalts</hint>
-         	</field>
-         			
-			<field>
-				<dc-element>subject</dc-element>
-				<dc-qualifier>shic</dc-qualifier>
-				<label>SHIC</label>
-				<input-type>twobox</input-type>
-                <repeatable>true</repeatable>
-                <link-url>image/shic.html</link-url>
-                <link-text>SHIC</link-text>
-				<hint>SHIC-Dezimalklassifikation</hint>
-			</field>
-			
-			<field>
-			     <dc-element>subject</dc-element>
-			     <dc-qualifier>swd</dc-qualifier>
-			     <repeatable>true</repeatable>
-			     <label>OSWD</label>
-			     <input-type>twobox</input-type>
-			     <hint>Schlagworte nach OSWD-Standard</hint>
-			     <link-url>http://www.bsz-bw.de/cgi-bin/oswd-suche.pl</link-url>
-			     <link-text>OSWD</link-text>
-			</field>
-				
-	  	    <field>
-    		   	<dc-element>subject</dc-element>
-         		<dc-qualifier>other</dc-qualifier>
-         		<!-- An input-type of twobox MUST be marked as repeatable -->
-         		<repeatable>true</repeatable>
-         		<label>Schlagw&#x00F6;rter</label>
-         		<input-type>twobox</input-type>
-         		<hint>Lokale oder freie Schlagw&#x00F6;rter</hint>
-			</field>
-			
-    	</page>
-	</form>
-
-
    <form name="traditional">
      <page number="1">
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>contributor</dc-element>
          <dc-qualifier>author</dc-qualifier>
-          <repeatable>true</repeatable>
+         <repeatable>true</repeatable>
          <label>Authors</label>
                  <input-type>name</input-type>
          <hint>Enter the names of the authors of this item below.</hint>
@@ -263,6 +50,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>title</dc-element>
          <dc-qualifier></dc-qualifier>
          <repeatable>false</repeatable>
@@ -273,6 +61,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>title</dc-element>
          <dc-qualifier>alternative</dc-qualifier>
          <repeatable>true</repeatable>
@@ -283,6 +72,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>date</dc-element>
          <dc-qualifier>issued</dc-qualifier>
          <repeatable>false</repeatable>
@@ -295,6 +85,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>publisher</dc-element>
          <dc-qualifier></dc-qualifier>
          <repeatable>false</repeatable>
@@ -305,6 +96,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>identifier</dc-element>
          <dc-qualifier>citation</dc-qualifier>
          <repeatable>false</repeatable>
@@ -315,6 +107,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>relation</dc-element>
          <dc-qualifier>ispartofseries</dc-qualifier>
          <repeatable>true</repeatable>
@@ -325,6 +118,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>identifier</dc-element>
          <dc-qualifier></dc-qualifier>
          <!-- An input-type of qualdrop_value MUST be marked as repeatable -->
@@ -337,6 +131,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>type</dc-element>
          <dc-qualifier></dc-qualifier>
          <repeatable>true</repeatable>
@@ -347,6 +142,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>language</dc-element>
          <dc-qualifier>iso</dc-qualifier>
          <repeatable>false</repeatable>
@@ -359,6 +155,7 @@
 
      <page number="2">
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>subject</dc-element>
          <dc-qualifier></dc-qualifier>
          <!-- An input-type of twobox MUST be marked as repeatable -->
@@ -367,9 +164,11 @@
          <input-type>twobox</input-type>
          <hint> Enter appropriate subject keywords or phrases below. </hint>
          <required></required>
+         <vocabulary>srsc</vocabulary>
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>description</dc-element>
          <dc-qualifier>abstract</dc-qualifier>
          <repeatable>false</repeatable>
@@ -380,6 +179,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>description</dc-element>
          <dc-qualifier>sponsorship</dc-qualifier>
          <repeatable>false</repeatable>
@@ -390,6 +190,7 @@
        </field>
 
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>description</dc-element>
          <dc-qualifier></dc-qualifier>
          <repeatable>false</repeatable>
@@ -404,6 +205,7 @@
    <form name="one">
      <page number="1">
        <field>
+		 <dc-schema>dc</dc-schema>
          <dc-element>contributor</dc-element>
          <dc-qualifier>author</dc-qualifier>
          <repeatable>true</repeatable>
@@ -431,22 +233,6 @@
  <!-- stores the associated stored-values in the database.                  -->
 
  <form-value-pairs>
-   <value-pairs value-pairs-name="common_materials" dc-term="format.medium">
-     <pair>
-        <displayed-value>Glasplattennegativ</displayed-value>
-        <stored-value>glasplattennegativ</stored-value>
-     </pair>
-     <pair>
-        <displayed-value>Barytpapier</displayed-value>
-        <stored-value>barytpapier</stored-value>
-     </pair>
-     <pair>
-        <displayed-value>PE-Papier</displayed-value>
-        <stored-value>pepapier</stored-value>
-     </pair>
-   
-   </value-pairs>
-   
    <value-pairs value-pairs-name="common_identifiers" dc-term="identifier">
      <pair>
        <displayed-value>ISSN</displayed-value>
@@ -476,44 +262,92 @@
 
    <value-pairs value-pairs-name="common_types" dc-term="type">
      <pair>
-       <displayed-value>Artikel</displayed-value>
-       <stored-value>Artikel</stored-value><!-- Article -->
+       <displayed-value>Animation</displayed-value>
+       <stored-value>Animation</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Article</displayed-value>
+       <stored-value>Article</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Book</displayed-value>
+       <stored-value>Book</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Book chapter</displayed-value>
+       <stored-value>Book chapter</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Dataset</displayed-value>
+       <stored-value>Dataset</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Learning Object</displayed-value>
+       <stored-value>Learning Object</stored-value>
      </pair>
      <pair>
-        <displayed-value>Aufsatz</displayed-value>
-        <stored-value>Aufsatz</stored-value><!-- Thesis -->
+       <displayed-value>Image</displayed-value>
+       <stored-value>Image</stored-value>
      </pair>
      <pair>
-       <displayed-value>Buch</displayed-value>
-       <stored-value>Buch</stored-value>
+       <displayed-value>Image, 3-D</displayed-value>
+       <stored-value>Image, 3-D</stored-value>
      </pair>
      <pair>
-       <displayed-value>Fotografie</displayed-value>
-       <stored-value>Fotografie</stored-value>
+       <displayed-value>Map</displayed-value>
+       <stored-value>Map</stored-value>
      </pair>
      <pair>
-        <displayed-value>Gem&#x00E4;lde</displayed-value>
-        <stored-value>Gem\u00E4lde</stored-value>
+       <displayed-value>Musical Score</displayed-value>
+       <stored-value>Musical Score</stored-value>
      </pair>
      <pair>
-       <displayed-value>Karte</displayed-value>
-       <stored-value>Karte</stored-value>
+       <displayed-value>Plan or blueprint</displayed-value>
+       <stored-value>Plan or blueprint</stored-value>
      </pair>
      <pair>
-       <displayed-value>Plan oder Blaupause</displayed-value>
-       <stored-value>Plan oder Blaupause</stored-value>
+       <displayed-value>Preprint</displayed-value>
+       <stored-value>Preprint</stored-value>
      </pair>
      <pair>
-        <displayed-value>Postkarte</displayed-value>
-        <stored-value>Postkarte</stored-value>
+       <displayed-value>Presentation</displayed-value>
+       <stored-value>Presentation</stored-value>
      </pair>
      <pair>
-       <displayed-value>Tonaufzeichnung, m&#x00FC;ndlich</displayed-value>
-       <stored-value>Tonaufzeichnung, m\u00FCndlich</stored-value>
+       <displayed-value>Recording, acoustical</displayed-value>
+       <stored-value>Recording, acoustical</stored-value>
      </pair>
      <pair>
-       <displayed-value>Sonstiges</displayed-value>
-       <stored-value>Sonstiges</stored-value>
+       <displayed-value>Recording, musical</displayed-value>
+       <stored-value>Recording, musical</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Recording, oral</displayed-value>
+       <stored-value>Recording, oral</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Software</displayed-value>
+       <stored-value>Software</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Technical Report</displayed-value>
+       <stored-value>Technical Report</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Thesis</displayed-value>
+       <stored-value>Thesis</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Video</displayed-value>
+       <stored-value>Video</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Working Paper</displayed-value>
+       <stored-value>Working Paper</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>Other</displayed-value>
+       <stored-value>Other</stored-value>
      </pair>
    </value-pairs>
 
@@ -526,39 +360,39 @@
        <stored-value></stored-value>
      </pair>
      <pair>
-       <displayed-value>Deutsch</displayed-value>
-       <stored-value>de</stored-value>
-     </pair>
-     <pair>
-       <displayed-value>Amerikanisches English</displayed-value>
+       <displayed-value>English (United States)</displayed-value>
        <stored-value>en_US</stored-value>
       </pair>
      <pair>
-       <displayed-value>Englisch</displayed-value>
+       <displayed-value>English</displayed-value>
        <stored-value>en</stored-value>
      </pair>
      <pair>
-       <displayed-value>Spanisch</displayed-value>
+       <displayed-value>Spanish</displayed-value>
        <stored-value>es</stored-value>
      </pair>
      <pair>
-       <displayed-value>Franz&#x00F6;sisch</displayed-value>
+       <displayed-value>German</displayed-value>
+       <stored-value>de</stored-value>
+     </pair>
+     <pair>
+       <displayed-value>French</displayed-value>
        <stored-value>fr</stored-value>
      </pair>
      <pair>
-       <displayed-value>Italienisch</displayed-value>
+       <displayed-value>Italian</displayed-value>
        <stored-value>it</stored-value>
      </pair>
      <pair>
-       <displayed-value>Japanisch</displayed-value>
+       <displayed-value>Japanese</displayed-value>
        <stored-value>ja</stored-value>
      </pair>
      <pair>
-       <displayed-value>Chinesisch</displayed-value>
+       <displayed-value>Chinese</displayed-value>
        <stored-value>zh</stored-value>
      </pair>
      <pair>
-       <displayed-value>Andere</displayed-value>
+       <displayed-value>(Other)</displayed-value>
        <stored-value>other</stored-value>
      </pair>
    </value-pairs>
Only in dspace-1.4-source/config: language-packs
Only in dspace-1.4-source/config: news-side.html
Only in dspace-1.4-source/config: news-top.html
Only in dspace-1.4-source/config: registries
Only in dspace-1.4-source/config: templates
Only in dspace-1.4-source/docs: application.html
Only in dspace-1.4-source/docs: architecture.html
Only in dspace-1.4-source/docs: business.html
Only in dspace-1.4-source/docs: configure.html
Only in dspace-1.4-source/docs: controlledvocabulary.xsd
Only in dspace-1.4-source/docs: directories.html
Only in dspace-1.4-source/docs: functional.html
Only in dspace-1.4-source/docs: history.html
Only in dspace-1.4-source/docs: image
Only in dspace-1.4-source/docs: index.html
Only in dspace-1.4-source/docs: install.html
Only in dspace-1.4-source/docs: introduction.html
Only in dspace-1.4-source/docs: originals
Only in dspace-1.4-source/docs: postgres-upgrade-notes.txt
Only in dspace-1.4-source/docs: storage.html
Only in dspace-1.4-source/docs: style.css
diff -aur dspacepatch/docs/submission.html dspace-1.4-source/docs/submission.html
--- dspacepatch/docs/submission.html	2006-09-04 16:15:13.000000000 +0200
+++ dspace-1.4-source/docs/submission.html	2006-07-10 20:56:05.000000000 +0200
@@ -117,6 +117,10 @@
   <P>Each <CODE>field</CODE> contains the following elements, in the order indicated. The required sub-elements are so marked:</P>
 
   <DL>
+    <DT><STRONG><CODE>dc-schema</CODE></STRONG> <EM>(Required)</EM></DT>
+
+    <DD>Name of metadata schema employed, e.g. <CODE>dc</CODE> for Dublin Core. This value must match the value of the <CODE>schema</CODE> element defined in <CODE>dublin-core-types.xml<CODE></DD>
+
     <DT><STRONG><CODE>dc-element</CODE></STRONG> <EM>(Required)</EM></DT>
 
     <DD>Name of the Dublin Core element entered in this field, e.g. <CODE>contributor</CODE>.</DD>
@@ -166,13 +170,22 @@
     Note that leaving the</CODE> required element empty will <EM>not</EM> mark a field as required, e.g.:<BR>
     <CODE>&lt;required&gt;&lt;/required&gt;</CODE></DD>
 
-    <DT><STRONG><CODE>link-url</CODE></STRONG></DT>
-    
-    <DD>The content is a valid URI. When this element and <CODE>link-text</CODE> are defined, a link appears on the right side of the hints. The link opens a new window. <STRONG>Note:</STRONG> You must define both elements.</DD>
-    
-    <DT><STRONG><CODE>link-text</CODE></STRONG></DT>
-    
-    <DD>The content should describe the link in <CODE>link-url</CODE>.</DD>
+    <DT><STRONG><CODE>visibility</CODE></STRONG></DT>
+
+    <DD>When this optional element is included with a value, it restricts the visibility of the field to the 
+    scope defined by that value. If the element is missing or empty, the field is visible in all scopes.
+    Currently supported scopes are:
+    <ul>
+       <li><strong>workflow</strong>: the field will only be visible in the workflow stages of submission. This
+           is good for hiding difficult fields for users, such as subject classifications, thereby easing the
+           use of the submission system.</li>
+       <li><strong>submit</strong>: the field will only be visible in the initial submission, and not in the
+           workflow stages.</li>
+    </ul>
+    For example:<br/>
+    <CODE>&lt;visibility&gt;workflow&lt;/visibility&gt;</CODE><br/>
+    Note that it is considered a configuration error to limit a field's scope while also requiring it -
+    an exception will be generated when this combination is detected.</DD>
   </DL>
 
   <P>Look at the example <CODE>input-forms.xml</CODE> and experiment with a a trial custom form to learn this specification language thoroughly. It is a very simple way to express the layout of data-entry forms, but the only way to learn all its subtleties is to use it.</P>
Only in dspace-1.4-source/docs: update.html
Only in dspace-1.4-source: etc
Only in dspace-1.4-source: jsp
Only in dspace-1.4-source: lib
Only in dspace-1.4-source/src: edu
Only in dspace-1.4-source/src/org/dspace: administer
Only in dspace-1.4-source/src/org/dspace/app: checker
Only in dspace-1.4-source/src/org/dspace/app: didl
Only in dspace-1.4-source/src/org/dspace/app: itemexport
Only in dspace-1.4-source/src/org/dspace/app: itemimport
Only in dspace-1.4-source/src/org/dspace/app: mediafilter
Only in dspace-1.4-source/src/org/dspace/app: mets
Only in dspace-1.4-source/src/org/dspace/app: oai
Only in dspace-1.4-source/src/org/dspace/app: packager
Only in dspace-1.4-source/src/org/dspace/app: statistics
Only in dspace-1.4-source/src/org/dspace/app/webui: filter
Only in dspace-1.4-source/src/org/dspace/app/webui: jsptag
Only in dspace-1.4-source/src/org/dspace/app/webui: servlet
Only in dspace-1.4-source/src/org/dspace/app/webui/util: Authenticate.java
diff -aur dspacepatch/src/org/dspace/app/webui/util/DCInput.java dspace-1.4-source/src/org/dspace/app/webui/util/DCInput.java
--- dspacepatch/src/org/dspace/app/webui/util/DCInput.java	2006-09-04 16:21:27.000000000 +0200
+++ dspace-1.4-source/src/org/dspace/app/webui/util/DCInput.java	2006-02-08 15:34:03.000000000 +0100
@@ -1,9 +1,9 @@
 /*
  * DCInput.java
  *
- * Version: $Revision: 1.4 $
+ * Version: $Revision: 1.7 $
  *
- * Date: $Date: 2006/03/08 12:18:25 $
+ * Date: $Date: 2006/02/08 14:34:03 $
  *
  * Copyright (c) 2002-2005, Hewlett-Packard Company and Massachusetts
  * Institute of Technology.  All rights reserved.
@@ -43,99 +43,141 @@
 import java.util.List;
 import java.util.Map;
 
+import org.dspace.content.MetadataSchema;
+
 /**
  * Class representing a line in an input form.
- *
+ * 
  * @author Brian S. Hughes, based on work by Jenny Toves, OCLC
  * @version
  */
 public class DCInput
 {
-	/** the DC element name */
-	private String dcElement = null;
-	/** the DC qualifier, if any */
-	private String dcQualifier = null;
-	/** a label describing input */
-	private String label = null;
-	/** the input type */
-	private String inputType = null;
-	/** is input required? */
-	private boolean required = false;
-	/** if required, text to display when missing */
-	private String warning = null;
-	/** is input repeatable? */
-	private boolean repeatable = false;
-	/** 'hint' text to display */
-	private String hint = null;
-	/** the link, if desired */
-	private String linkURL = null;
-	/** the text for the link */
-	private String linkText = null;
-	/** if input list-controlled, name of list */
-	private String valueListName = null;
-	/** if input list-controlled, the list itself */
-	private List valueList = null;
-	
-    /**
-     * Class constructor for creating a DCInput object
-     * based on the contents of a HashMap
-     *
-     * @param row      the corresponding row in the table
+    /** the DC element name */
+    private String dcElement = null;
+
+    /** the DC qualifier, if any */
+    private String dcQualifier = null;
+
+    /** the DC namespace schema */
+    private String dcSchema = null;
+
+    /** a label describing input */
+    private String label = null;
+
+    /** the input type */
+    private String inputType = null;
+
+    /** is input required? */
+    private boolean required = false;
+
+    /** if required, text to display when missing */
+    private String warning = null;
+
+    /** is input repeatable? */
+    private boolean repeatable = false;
+
+    /** 'hint' text to display */
+    private String hint = null;
+
+    /** if input list-controlled, name of list */
+    private String valueListName = null;
+
+    /** if input list-controlled, the list itself */
+    private List valueList = null;
+
+    /** if non-null, visibility scope restriction */
+    private String visibility = null;
+
+    /** the name of the controlled vocabulary to use */
+    private String vocabulary = null;
+
+    /**
+     * Class constructor for creating a DCInput object based on the contents of
+     * a HashMap
+     * 
+     * @param row
+     *            the corresponding row in the table
      */
     public DCInput(Map fieldMap, Map listMap)
     {
-    	dcElement = (String)fieldMap.get("dc-element");
-       	dcQualifier = (String)fieldMap.get("dc-qualifier");
-       	String repStr = (String)fieldMap.get("repeatable");
-       	repeatable = "true".equalsIgnoreCase(repStr) || "yes".equalsIgnoreCase(repStr);
-       	label = (String)fieldMap.get("label");
-       	inputType = (String)fieldMap.get("input-type");
-       	// these types are list-controlled
-       	if ( "dropdown".equals( inputType) || "qualdrop_value".equals( inputType ))
-       	{
-       		valueListName = (String)fieldMap.get("value-pairs-name");
-       		valueList = (List)listMap.get( valueListName );
-       	}
-       	hint = (String)fieldMap.get("hint");
-       	warning = (String)fieldMap.get("required");
-       	required = ( warning != null && warning.length() > 0 );
-       	linkURL = (String)fieldMap.get("link-url");
-       	linkText = (String)fieldMap.get("link-text");
+        dcElement = (String) fieldMap.get("dc-element");
+        dcQualifier = (String) fieldMap.get("dc-qualifier");
+
+        // Default the schema to dublin core
+        dcSchema = (String) fieldMap.get("dc-schema");
+        if (dcSchema == null)
+        {
+            dcSchema = MetadataSchema.DC_SCHEMA;
+        }
+
+        String repStr = (String) fieldMap.get("repeatable");
+        repeatable = "true".equalsIgnoreCase(repStr)
+                || "yes".equalsIgnoreCase(repStr);
+        label = (String) fieldMap.get("label");
+        inputType = (String) fieldMap.get("input-type");
+        // these types are list-controlled
+        if ("dropdown".equals(inputType) || "qualdrop_value".equals(inputType))
+        {
+            valueListName = (String) fieldMap.get("value-pairs-name");
+            valueList = (List) listMap.get(valueListName);
+        }
+        hint = (String) fieldMap.get("hint");
+        warning = (String) fieldMap.get("required");
+        required = (warning != null && warning.length() > 0);
+        visibility = (String) fieldMap.get("visibility");
+        vocabulary = (String) fieldMap.get("vocabulary");
+    }
+
+    /**
+     * Is this DCInput for display in the given scope? The scope should be
+     * either "workflow" or "submit", as per the input forms definition. If the
+     * internal visibility is set to "null" then this will always return true.
+     * 
+     * @param scope
+     *            String identifying the scope that this input's visibility
+     *            should be tested for
+     * 
+     * @return whether the input should be displayed or not
+     */
+    public boolean isVisible(String scope)
+    {
+        return (visibility == null || visibility.equals(scope));
     }
 
     /**
      * Get the repeatable flag for this row
-     *
+     * 
      * @return the repeatable flag
      */
     public boolean isRepeatable()
     {
-    	return repeatable;
+        return repeatable;
     }
 
     /**
      * Alternate way of calling isRepeatable()
-     *
+     * 
      * @return the repeatable flag
      */
     public boolean getRepeatable()
     {
-    	return isRepeatable();
+        return isRepeatable();
     }
 
     /**
      * Get the input type for this row
-     *
+     * 
      * @return the input type
      */
     public String getInputType()
     {
         return inputType;
     }
-    
+
     /**
      * Get the DC element for this form row.
-     *
+     * 
      * @return the DC element
      */
     public String getElement()
@@ -144,149 +186,167 @@
     }
 
     /**
-     * Get the warning string for a missing required field, formatted for an HTML table.
-     *
+     * Get the DC namespace prefix for this form row.
+     * 
+     * @return the DC namespace prefix
+     */
+    public String getSchema()
+    {
+        return dcSchema;
+    }
+
+    /**
+     * Get the warning string for a missing required field, formatted for an
+     * HTML table.
+     * 
      * @return the string prompt if required field was ignored
      */
     public String getWarning()
     {
-    	return "<tr><td colspan=\"4\" class=\"submitFormWarn\">" + warning + "</td></tr>";
+        return "<tr><td colspan=\"4\" class=\"submitFormWarn\">" + warning
+                + "</td></tr>";
     }
-    
+
     /**
      * Is there a required string for this form row?
-     *
+     * 
      * @return true if a required string is set
      */
     public boolean isRequired()
     {
-    	return required;
+        return required;
     }
-    
+
     /**
      * Get the DC qualifier for this form row.
-     *
+     * 
      * @return the DC qualifier
      */
     public String getQualifier()
     {
         return dcQualifier;
     }
-    
+
     /**
      * Get the hint for this form row, formatted for an HTML table
-     * If link-text and link-url are set, the link is appended
+     * 
      * @return the hints
      */
     public String getHints()
     {
-        if(linkText == null || linkURL == null)
-        {
-          	return "<tr><td colspan=\"4\" class=\"submitFormHelp\">" + hint + "</td></tr>";
-        }
-        else
-        {
-            return "<tr><td>&nbsp;</td><td colspan=\"2\" class=\"submitFormHelp\">" + hint 
-                        + "</td><td><a href=\"" + linkURL
-                            + "\">" + linkText + "</a></td></tr>";
-        }
+        return "<tr><td colspan=\"4\" class=\"submitFormHelp\">" + hint
+                + "</td></tr>";
     }
-    
+
     /**
      * Get the label for this form row.
-     *
+     * 
      * @return the label
      */
     public String getLabel()
     {
         return label;
     }
-    
-    /**
-     * Get the link for this form row
-     * @return the link
-     */
-     public String getLinkURL()
-     {
-        return linkURL;
-     }
-     
-     /**
-      * Get the text for the link
-      *
-      * @return the linktext
-      */
-      public String getLinkText()
-      {
-        return linkText;
-      }
 
     /**
-     * Get the name of the pairs type 
-     *
+     * Get the name of the pairs type
+     * 
      * @return the pairs type name
      */
     public String getPairsType()
     {
-    	return valueListName;
+        return valueListName;
     }
-    
+
     /**
-     * Get the name of the pairs type 
-     *
+     * Get the name of the pairs type
+     * 
      * @return the pairs type name
      */
     public List getPairs()
     {
-    	return valueList;
+        return valueList;
     }
-    
+
     /**
-     * Gets the display string that corresponds to the passed storage string in a
-     * particular display-storage pair set.
-     *
-     * @param allPairs       HashMap of all display-storage pair sets
-     * @param pairTypeName   Name of display-storage pair set to search
-     * @param storageString  the string that gets stored
-     *
-     * @return the displayed string whose selection causes storageString to be stored, null if no match
+     * Get the name of the controlled vocabulary that is associated with this
+     * field
+     * 
+     * @return the name of associated the vocabulary
+     */
+    public String getVocabulary()
+    {
+        return vocabulary;
+    }
+
+    /**
+     * Set the name of the controlled vocabulary that is associated with this
+     * field
+     * 
+     * @param vocabulary
+     *            the name of the vocabulary
+     */
+    public void setVocabulary(String vocabulary)
+    {
+        this.vocabulary = vocabulary;
+    }
+
+    /**
+     * Gets the display string that corresponds to the passed storage string in
+     * a particular display-storage pair set.
+     * 
+     * @param allPairs
+     *            HashMap of all display-storage pair sets
+     * @param pairTypeName
+     *            Name of display-storage pair set to search
+     * @param storageString
+     *            the string that gets stored
+     * 
+     * @return the displayed string whose selection causes storageString to be
+     *         stored, null if no match
      */
     public String getDisplayString(String pairTypeName, String storedString)
     {
-    	if (valueList != null)
-    	{
-    		for (int i = 0; i < valueList.size(); i += 2)
-    		{
-    			if (((String)valueList.get(i+1)).equals(storedString))
-    			{
-    				return (String)valueList.get(i);
-    			}
-    		}
-    	}
-    	return null;
+        if (valueList != null)
+        {
+            for (int i = 0; i < valueList.size(); i += 2)
+            {
+                if (((String) valueList.get(i + 1)).equals(storedString))
+                {
+                    return (String) valueList.get(i);
+                }
+            }
+        }
+        return null;
     }
 
     /**
-     * Gets the stored string that corresponds to the passed display string in a particular display-storage pair set.
-     *
-     * @param allPairs       HashMap of all display-storage pair sets
-     * @param pairTypeName   Name of display-storage pair set to search
-     * @param displayString  the string that gets displayed
-     *
-     * @return the string that gets stored when displayString gets selected, null if no match
+     * Gets the stored string that corresponds to the passed display string in a
+     * particular display-storage pair set.
+     * 
+     * @param allPairs
+     *            HashMap of all display-storage pair sets
+     * @param pairTypeName
+     *            Name of display-storage pair set to search
+     * @param displayString
+     *            the string that gets displayed
+     * 
+     * @return the string that gets stored when displayString gets selected,
+     *         null if no match
      */
     public String getStoredString(String pairTypeName, String displayedString)
     {
-    	if (valueList != null)
-    	{
-    		for (int i = 0; i < valueList.size(); i += 2)
-    		{
-    			if (((String)valueList.get(i)).equals(displayedString))
-    			{
-    				return (String)valueList.get(i+1);
-    			}
-    		}
-    	}
-    	return null;
+        if (valueList != null)
+        {
+            for (int i = 0; i < valueList.size(); i += 2)
+            {
+                if (((String) valueList.get(i)).equals(displayedString))
+                {
+                    return (String) valueList.get(i + 1);
+                }
+            }
+        }
+        return null;
     }
+
 }
Only in dspace-1.4-source/src/org/dspace/app/webui/util: DCInputSet.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: DCInputsReader.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: FileUploadRequest.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: JSPManager.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: RequestInfo.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: SubmissionInfo.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: UIUtil.java
Only in dspace-1.4-source/src/org/dspace/app/webui/util: XMLUtil.java
Only in dspace-1.4-source/src/org/dspace: authorize
Only in dspace-1.4-source/src/org/dspace: browse
Only in dspace-1.4-source/src/org/dspace: checker
Only in dspace-1.4-source/src/org/dspace: content
Only in dspace-1.4-source/src/org/dspace: core
Only in dspace-1.4-source/src/org/dspace: eperson
Only in dspace-1.4-source/src/org/dspace: handle
Only in dspace-1.4-source/src/org/dspace: history
Only in dspace-1.4-source/src/org/dspace: license
Only in dspace-1.4-source/src/org/dspace: search
Only in dspace-1.4-source/src/org/dspace: storage
Only in dspace-1.4-source/src/org/dspace: workflow
Only in dspace-1.4-source/src: overview.html
