Merge pull request #3 from IQSS/master

Update beta branch to 5/2

scripts/api/data/dataset-bad-missingInitialVersion.json

@@ -0,0 +1,5 @@
+{
+  "authority":"anAuthority",
+  "identifier":"dataset-one",
+  "protocol":"chadham-house-rule"
+}

scripts/api/data/dataset-sample1.json

@@ -0,0 +1,98 @@
+{
+  "authority": "anAuthority",
+  "identifier": "dataset-one",
+  "protocol": "chadham-house-rule",
+  "initialVersion": {
+    "authors": [
+      {
+        "displayOrder": 0,
+        "affiliation": {
+          "value": "IQSS"
+        },
+        "name": {
+          "value": "Castro, Eleni"
+        }
+      }
+    ],
+    "UNF": "UNF",
+    "title": "Replication Data for: Building a Bridge Between Journal Articles and Research Data",
+    "distributionDate": "Distribution Date",
+    "productionDate": "Production Date",
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "value": "Replication Data for: Building a Bridge Between Journal Articles and Research Data",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "title"
+          },
+          {
+            "value": [
+              [
+                {
+                  "value": "Castro, Eleni",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorName"
+                },
+                {
+                  "value": "IQSS",
+                  "typeClass": "primitive",
+                  "multiple": false,
+                  "typeName": "authorAffiliation"
+                }
+              ]
+            ],
+            "typeClass": "compound",
+            "multiple": true,
+            "typeName": "author"
+          },
+          {
+            "value": [
+              "ecastro@fas.harvard.edu"
+            ],
+            "typeClass": "primitive",
+            "multiple": true,
+            "typeName": "distributorContact"
+          },
+          {
+            "value": "Research dataset for my publication on connecting journal articles and their underlying research data. Includes an analysis of current data publication practices.",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "description"
+          },
+          {
+            "value": [
+              "data publication"
+            ],
+            "typeClass": "primitive",
+            "multiple": true,
+            "typeName": "keyword"
+          },
+          {
+            "value": [
+              "Social Sciences"
+            ],
+            "typeClass": "controlledVocabulary",
+            "multiple": true,
+            "typeName": "subject"
+          },
+          {
+            "value": "Privileged, Pete",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "depositor"
+          },
+          {
+            "value": "2014-05-01",
+            "typeClass": "primitive",
+            "multiple": false,
+            "typeName": "dateOfDeposit"
+          }
+        ],
+        "displayName": "Citation Metadata"
+      }
+    }
+  }
+}

scripts/api/data/metadatablocks/astrophysics.tsv

@@ -4,51 +4,51 @@
 	astroType	Type	The nature or genre of the content of the files in the dataset.		text	0	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	astroFacility	Facility	The observatory or facility where the data was obtained. 		text	1	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
 	astroInstrument	Instrument	The instrument used to collect the data.		text	2	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	resolution.Spatial	Spatial Resolution	The spatial (angular) resolution that is typical of the observations, in decimal degrees.		float	3	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		astrophysics
-	resolution.Spectral	Spectral Resolution	The spectral resolution that is typical of the observations, given as the ratio λ/Δλ.		float	4	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		astrophysics
-	resolution.Temporal	Time Resolution	The temporal resolution that is typical of the observations, given in seconds.		float	5	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Spectral.Bandpass	Bandpass	Conventional bandpass name		text	6	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE		astrophysics
-	coverage.Spectral.CentralWavelength	Central Wavelength (m)	The central wavelength of the spectral bandpass, in meters.		float	7	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	coverage.Spectral.Wavelength	Wavelength Range	The minimum and maximum wavelength of the spectral bandpass.			8	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Spectral.MinimumWavelength 	Minimum (m)	The minimum wavelength of the spectral bandpass, in meters.		float	9	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Spectral.Wavelength	astrophysics
-	coverage.Spectral.MaximumWavelength	Maximum (m)	The maximum wavelength of the spectral bandpass, in meters.		float	10	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Spectral.Wavelength	astrophysics
-	coverage.Temporal	Dataset Date Range	 Time period covered by the data.			11	TRUE	FALSE	FALSE	FALSE	FALSE	FALSE		
-	coverage.Temporal.StartTime	Start	Dataset Start Date	YYYY-MM-DD	date	12	FALSE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Temporal	astrophysics
-	coverage.Temporal.StopTime	End	Dataset End Date	YYYY-MM-DD	date	13	FALSE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Temporal	astrophysics
-	coverage.Spatial	Sky Coverage	The sky coverage of the data object.		text	14	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Depth	Depth Coverage	The (typical) depth coverage, or sensitivity, of the data object in Jy.		float	15	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.ObjectDensity	Object Density	The (typical) density of objects, catalog entries, telescope pointings, etc., on the sky, in number per square degree.		float	16	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.ObjectCount	Object Count	The total number of objects, catalog entries, etc., in the data object.		int	17	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.SkyFraction	Fraction of Sky	The fraction of the sky represented in the observations, ranging from 0 to 1.		float	18	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Polarization	Polarization	The polarization coverage		text	19	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	redshiftType	RedshiftType	RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.		text	20	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	resolution.Redshift	Redshift Resolution	The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.		float	21	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
-	coverage.RedshiftValue	Redshift Value	The value of the redshift (unitless) or Doppler velocity (km/s in the data object.			22	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Redshift.MinimumValue	Minimum	The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	23	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
-	coverage.Redshift.MaximumValue	Maximum	The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	24	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
-	ucd	UCD (Unified Content Descriptors)	A list of the UCDs (Unified Content Descriptors) represented in the data object.		text	25	FALSE	TRUE	TRUE	FALSE	FALSE	FALSE		astrophysics
+	astroObject	Object	Astronomical Objects represented in the data (Given as SIMBAD recognizable names preferred).		text	3	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	resolution.Spatial	Spatial Resolution	The spatial (angular) resolution that is typical of the observations, in decimal degrees.		float	4	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	resolution.Spectral	Spectral Resolution	The spectral resolution that is typical of the observations, given as the ratio λ/Δλ.		float	5	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	resolution.Temporal	Time Resolution	The temporal resolution that is typical of the observations, given in seconds.		float	6	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Spectral.Bandpass	Bandpass	Conventional bandpass name		text	7	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	coverage.Spectral.CentralWavelength	Central Wavelength (m)	The central wavelength of the spectral bandpass, in meters.		float	8	TRUE	FALSE	TRUE	TRUE	FALSE	FALSE		astrophysics
+	coverage.Spectral.Wavelength	Wavelength Range	The minimum and maximum wavelength of the spectral bandpass.		float	9	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Spectral.MinimumWavelength	Minimum (m)	The minimum wavelength of the spectral bandpass, in meters.		float	10	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Spectral.Wavelength	astrophysics
+	coverage.Spectral.MaximumWavelength	Maximum (m)	The maximum wavelength of the spectral bandpass, in meters.		float	11	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Spectral.Wavelength	astrophysics
+	coverage.Temporal	Dataset Date Range	 Time period covered by the data.		date	12	TRUE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Temporal.StartTime	Start	Dataset Start Date	YYYY-MM-DD	date	13	FALSE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Temporal	astrophysics
+	coverage.Temporal.StopTime	End	Dataset End Date	YYYY-MM-DD	date	14	FALSE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage.Temporal	astrophysics
+	coverage.Spatial	Sky Coverage	The sky coverage of the data object.		text	15	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Depth	Depth Coverage	The (typical) depth coverage, or sensitivity, of the data object in Jy.		float	16	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.ObjectDensity	Object Density	The (typical) density of objects, catalog entries, telescope pointings, etc., on the sky, in number per square degree.		float	17	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.ObjectCount	Object Count	The total number of objects, catalog entries, etc., in the data object.		int	18	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.SkyFraction	Fraction of Sky	The fraction of the sky represented in the observations, ranging from 0 to 1.		float	19	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Polarization	Polarization	The polarization coverage		text	20	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	redshiftType	RedshiftType	RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.		text	21	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	resolution.Redshift	Redshift Resolution	The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.		float	22	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	coverage.RedshiftValue	Redshift Value	The value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	23	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
+	coverage.Redshift.MinimumValue	Minimum	The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	24	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
+	coverage.Redshift.MaximumValue	Maximum	The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	25	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage.RedshiftValue	astrophysics
 #controlledVocabulary	DatasetField	Value	displayOrder											
-	type	Image	0											
-	type	Mosaic	1											
-	type	EventList	2											
-	type	Spectrum	3											
-	type	Cube	4											
-	type	Table	5											
-	type	Catalog	6											
-	type	LightCurve	7											
-	type	Simulation	8											
-	type	Figure	9											
-	type	Artwork	10											
-	type	Animation	11											
-	type	PrettyPicture	12											
-	type	Documentation	13											
-	type	Other	14											
-	type	Library	15											
-	type	Press Release	16											
-	type	Facsimile	17											
-	type	Historical	18											
-	type	Observation	19											
-	type	Object	20											
-	type	Value	21											
-	type	ValuePair	22											
-	type	Survey	23											
+	astroType	Image	0											
+	astroType	Mosaic	1											
+	astroType	EventList	2											
+	astroType	Spectrum	3											
+	astroType	Cube	4											
+	astroType	Table	5											
+	astroType	Catalog	6											
+	astroType	LightCurve	7											
+	astroType	Simulation	8											
+	astroType	Figure	9											
+	astroType	Artwork	10											
+	astroType	Animation	11											
+	astroType	PrettyPicture	12											
+	astroType	Documentation	13											
+	astroType	Other	14											
+	astroType	Library	15											
+	astroType	Press Release	16											
+	astroType	Facsimile	17											
+	astroType	Historical	18											
+	astroType	Observation	19											
+	astroType	Object	20											
+	astroType	Value	21											
+	astroType	ValuePair	22											
+	astroType	Survey	23											

scripts/api/data/metadatablocks/biomedical.tsv

@@ -1,11 +1,11 @@
 #metadataBlock	name	displayName												
 	biomedical	Biomedical Metadata												
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	showabovefold	required	parent	metadatablock_id
-	studyDesignType	Design Type	Select the design types that are based on the overall experimental design.		text	0	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyDesignType	Design Type	Design types that are based on the overall experimental design.		text	0	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
 	studyFactorType	Factor Type	Factors used in the Study. 		text	1	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayMeasurementType	Measurement Type	A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification). The term can be free text or from, for example, a controlled vocabulary or an ontology.  If the latter source is used the Term Accession Number and Term Source REF fields below are  required.  		text	2	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayOrganism	Organism	The taxonomic name of the organism used in a study or from which the  starting biological material derives.		text	4	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
-	studyAssayCellType	Cell Type	The name of the cell line from which the source or sample derives.		text	5	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayMeasurementType	Measurement Type	A term to qualify the endpoint, or what is being measured (e.g. gene expression profiling; protein identification). 		text	2	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayOrganism	Organism	The taxonomic name of the organism used in a study or from which the  starting biological material derives.		text	3	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
+	studyAssayCellType	Cell Type	The name of the cell line from which the source or sample derives.		text	4	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		biomedical
 #controlledVocabulary	DatasetField	Value	displayOrder											
 	studyDesignType	Case Control	0											
 	studyDesignType	Cross Sectional	1											

scripts/api/data/metadatablocks/general.tsv → scripts/api/data/metadatablocks/citation.tsv

@@ -6,26 +6,26 @@
 	authorName	Name	The author's Family Name, Given Name or the name of the organization responsible for this dataset.	FamilyName, GivenName or Organization	text	2	TRUE	FALSE	FALSE	TRUE	TRUE	TRUE	author	citation
 	authorAffiliation	Affiliation	The organization with which the author is affiliated.		text	3	TRUE	TRUE	FALSE	TRUE	TRUE	FALSE	author	citation
 	distributorContact	Contact E-mail	The e-mail address(es) of the contact(s) for the Dataset. This will not be displayed.		text	4	FALSE	FALSE	TRUE	FALSE	TRUE	TRUE		citation
-	description	Description	A summary describing the purpose, nature, and scope of the Dataset.		textbox	5	TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation
+	dsDescription	Description	A summary describing the purpose, nature, and scope of the Dataset.		textbox	5	TRUE	FALSE	FALSE	FALSE	TRUE	TRUE		citation
 	keyword	Keyword	Key terms that describe important aspects of the Dataset.		text	6	TRUE	FALSE	TRUE	TRUE	TRUE	FALSE		citation
 	subject	Subject	Domain-specific Subjects that are topically relevant to the Dataset.		text	7	TRUE	TRUE	TRUE	TRUE	TRUE	TRUE		citation
 	notesText	Notes	Additional important information about the Dataset		textbox	8	FALSE	FALSE	FALSE	FALSE	TRUE	FALSE		citation
-	otherId	Other ID	Another unique identifier that identifies this dataset (e.g., producer's or another repository's number).			9	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	otherId	Other ID	Another unique identifier that identifies this dataset (e.g., producer's or another repository's number).		text	9	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	otherIdValue	Identifier	Other identifier that corresponds to this Dataset.		text	10	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
 	otherIdAgency	Agency	Name of agency which generated this identifier.		text	11	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	otherId	citation
-	publication	Related Publication	Publications that use the data from this Dataset.			12	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	publication	Related Publication	Publications that use the data from this Dataset.		text	12	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	publicationCitation	Publication Citation	The full bibliographic citation for this related publication.		textbox	13	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation
 	publicationIDType	ID Type	The type of digital identifier used for this publication (e.g., Digital Object Identifier (DOI)).		text	14	FALSE	TRUE	FALSE	FALSE	FALSE	FALSE	publication	citation
 	publicationIDNumber	ID Number	The identifier for the selected ID type.		text	15	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation
 	publicationURL	URL	Link to the publication web page (e.g., journal article page, archive record page, or other).		url	16	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	publication	citation
-	contributor	Contributor	The organization or person responsible for either collecting, managing, distributing, or otherwise contributing in some form to the development of the resource.			17	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	contributor	Contributor	The organization or person responsible for either collecting, managing, distributing, or otherwise contributing in some form to the development of the resource.		text	17	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	contributorType	Type	The type of contributor of the  resource.  		text	18	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	contributor	citation
 	contributorName	Name	The Family Name, Given Name or organization name of the contributor.	FamilyName, GivenName or Organization	text	19	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	contributor	citation
 	contributorAffiliation	Affiliation	The organization which the contributor is affiliated with.		text	20	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	contributor	citation
 	contributorAbbreviation	Abbreviation	The abbreviation by which the contributor's affiliation is commonly known (e.g., IQSS, ICPSR, etc).		text	21	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	contributor	citation
 	productionDate	Production Date	Date when the data collection or other materials were produced (not distributed, released or archived).		date	22	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE		citation
 	productionPlace	Production Place	The location where the data collection and any other related materials were produced.		text	23	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
-	grantNumber	Grant Information	Grant Information			24	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
+	grantNumber	Grant Information	Grant Information		text	24	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		citation
 	grantNumberValue	Grant Number	The grant or contract number of the project that  sponsored the effort.		text	25	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	grantNumber	citation
 	grantNumberAgency	Grant Agency	Grant Number Agency		text	26	FALSE	TRUE	FALSE	FALSE	FALSE	FALSE	grantNumber	citation
 	depositor	Depositor	The person (Family Name, Given Name) or the name of the organization that deposited this Dataset to the repository.		text	27	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		citation
@@ -82,4 +82,4 @@
 	contributorType	Sponsor	14											
 	contributorType	Supervisor	15											
 	contributorType	Work Package Leader	16											
-	contributorType	Other	17											
+	contributorType	Other	17