4/30 code drop to beta

doc/Sphinx/source/Developers/dev-main.rst

@@ -15,7 +15,7 @@ Download solr-4.6.0.tgz from http://lucene.apache.org/solr/ to any directory you
 - ``cd ~/solr``
 - ``tar xvfz solr-4.6.0.tgz``
 - ``cd solr-4.6.0/example``
-- ``cp ~/NetBeansProjects/dataverse_temp/conf/solr/4.6.0/schema.xml solr/collection1/conf/schema.xml``
+- ``cp ~/NetBeansProjects/dataverse/conf/solr/4.6.0/schema.xml solr/collection1/conf/schema.xml``
 - ``java -jar start.jar``
 
 Please note: If you prefer, once the proper ``schema.xml`` file is in place, you can simply double-click "start.jar" rather that running ``java -jar start.jar`` from the command line.

doc/Sphinx/source/User/dataset-management.rst

@@ -38,6 +38,6 @@ browse it or search for it. Once your Dataset is ready to go public, go to your
 click on the "Unpublished" button on the right hand side of the page which should indicate: 
 "This Dataset is unpublished. To publish it click 'Publish Dataset' link."
 
-Important Note: Once a Dataset is published it cannot be unpublished.
+Important Note: Once a Dataset is published it **cannot be unpublished**; it can be archived instead.
 
 .. |image1| image:: ./img/DatasetDiagram.png

doc/Sphinx/source/User/find-use-data.rst

@@ -1,6 +1,9 @@
 Finding and Using Data
 +++++++++++++++++++++++
 
+Finding Data
+=============
+
 Without logging in to Dataverse, users can browse
 Dataverse, search for dataverses, datasets, and files, view dataset descriptions and files for
 public datasets, and subset, analyze and visualize data for public data
@@ -9,7 +12,7 @@ files. To view a restricted dataverse, dataset, or file, a user will need to be
 A user can search the dataverses, datasets, and files within a particular dataverse by using the search bar found on a dataverse page. For example, if you are on the Murray Research Archive Dataverse page, you can search that specific dataverse's contents by using the search bar and/or facets displayed on the page.
 
 Basic Search
-===============
+--------------
 From the Dataverse homepage, you can begin searching with an exact phrase search or entering a search term or query in the search box that says, "Search this dataverse" 
 
 **Search results features**
@@ -20,15 +23,15 @@ From the Dataverse homepage, you can begin searching with an exact phrase search
     - Viewing more or less: the top five results show in each facet, to view more, click on "More..." in the bottom right of a facet. Once you've chosen to see more, an option to view less will appear in the bottom left of the facet.
 
 - Result cards: after entering a search term or query, results cards that match appear underneath the search bar and to the right of the facets.
-    - Relevancy of results: each results card shows which metadata fields match the search query or term you entered into the search bar. If the search term or query was found in the title or name of the dataverse, dataset, or file, the search term or query will be bolded within it.
+    - Relevancy of results: each results card shows which metadata fields match the search query or term you entered into the search bar with the matching term or query bolded. If the search term or query was found in the title or name of the dataverse, dataset, or file, the search term or query will be bolded within it.
 
 - Other basic search features: 
-    - Sorting results: search results can be sorted by name (both A-Z and Z-A), publication date, or relevancy of results. The sort button can be found about the search results, in the top right.
-    - Bookmarkable URLs: search URLS can be copied and sent to a fellow researcher or can be bookmarked for you to be able to return to at a later time.
+    - Sorting results: search results can be sorted by name (A-Z or Z-A), newest or oldest, or relevancy of results. The sort button can be found above the search results, in the top right.
+    - Bookmarkable URLs: search URLs can be copied and sent to a fellow researcher or can be bookmarked for you to be able to return to at a later time.
 
 
 Advanced Search 
-================
+-----------------
 
 In an advanced search, you can refine your criteria by choosing which
 Metadata fields to search. You can perform an advanced search on Citation metadata fields as well as domain specific metadata fields (Social Sciences & Humanities, Astronomy & Astrophysics, and Biomedical). Additionally, you can perform an advanced search for dataverses and files.
@@ -83,11 +86,28 @@ To perform an advanced search, click the Advanced Search link next to the search
 
 
 Browsing Dataverse
-===================
+--------------------
 
-In Dataverse, browsing happens when a user hasn't entered a search term or query into the basic search bar. Browsing is the default for a user when they are on the Dataverse homepage or a specific dataverse's page. When browsing, only Dataverses and Datasets appear in the results list and the results can be sorted by Name (both A-Z and Z-A) and Publication Date (Newest and Oldest).
+In Dataverse, browsing happens when a user hasn't entered a search term or query into the basic search bar. Browsing is the default for a user when they are on the Dataverse homepage or a specific dataverse's page. When browsing, only dataverses and datasets appear in the results list and the results can be sorted by Name (A-Z or Z-A) and by Newest or Oldest.
 
 Additionally, a user can browse all dataverses by clicking on the triangle to the right of a dataverse's name in the breadcrumbs. A drop down menu will appear that holds a listing of all the dataverses within that dataverse. You can click the triangles next to a dataverse's name to view more dataverses within that dataverse. As you continue to browse dataverses, they will appear in the breadcrumbs.
 
 The dataverse breadcrumbs appear on each dataverse page and can be used to navigate throughout Dataverse.
 
+
+Using Data
+===========
+
+View Dataverses & Datasets
+-------------
+
+After performing a search and finding the dataverse or dataset you are looking for, click on the name of the dataverse or dataset or on the thumbnail image to be taken to the page for that dataverse or dataset. Once on a dataverse page, you can view the dataverses, datasets, and files within that dataverse.
+
+Once on a dataset page, you will see the title, citation, description, and several other fields as well as a button to email the dataset contact. Below that information, the files, metadata, and version information for the dataset are available. 
+
+Download Files
+--------------
+
+Within the Files tab on a dataset page, a user can either Explore the file using SolaFide or Download the file as tab-delimited, RData, Saved Original, or the variable metadata.
+
+

scripts/api/data/metadatablocks/astrophysics.tsv

@@ -1,31 +1,31 @@
 #metadataBlock	name	displayName												
 	astrophysics	Astronomy and Astrophysics Metadata												
 #datasetField	name	title	description	watermark	 fieldType	displayOrder	advancedSearchField	allowControlledVocabulary	allowmultiples	facetable	showabovefold	required	parent	metadatablock_id
-	type	Type	The nature or genre of the content of the files in the dataset.		text	0	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	facility	Facility	The observatory or facility where the data was obtained. 		text	1	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	instrument	Instrument	The instrument used to collect the data.		text	2	TRUE	TRUE	TRUE	TRUE	FALSE	FALSE		astrophysics
-	resolution	Resolution	The resolution of the data object contents.		float	3	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
-	resolution.Spatial	Spatial Resolution	The spatial (angular) resolution that is typical of the observations, in decimal degrees.		float	4	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	resolution	astrophysics
-	resolution.Spectral	Spectral Resolution	The spectral resolution that is typical of the observations, given as the ratio λ/Δλ.		float	5	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	resolution	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	resolution	astrophysics
-	resolution.Redshift	Redshift Resolution	The resolution in redshift (unitless) or Doppler velocity (km/s) in the data object.		float	7	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	resolution	astrophysics
-	coverage	Coverage	The extent of scope of the content of the data object.		text	8	FALSE	FALSE	TRUE	FALSE	FALSE	FALSE		astrophysics
-	coverage.Spectral.Bandpass	Bandpass	Conventional bandpass name		text	9	TRUE	TRUE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Spectral.CentralWavelength	Central Wavelength (m)	The central wavelength of the spectral bandpass, in meters.		float	10	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Spectral.MinimumWavelength 	Minimum Wavelength (m)	The minimum wavelength of the spectral bandpass, in meters.		float	11	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Spectral.MaximumWavelength	Maximum Wavelength (m)	The maximum wavelength of the spectral bandpass, in meters.		float	12	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Temporal.StartTime	Dataset Start Date	Dataset Start Date		date	13	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Temporal.StopTime	Dataset End Date	Dataset End Date		date	14	TRUE	FALSE	FALSE	TRUE	FALSE	FALSE	coverage	astrophysics
-	coverage.Spectral	Spectral Coverage	The spectral coverage of the data object.		text	15	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.Spatial	Sky Coverage	The sky coverage of the data object.		text	16	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.Depth	Depth Coverage	The (typical) depth coverage, or sensitivity, of the data object in Jy.		float	17	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.ObjectDensity	Object Density	The (typical) density of objects, catalog entries, telescope pointings, etc., on the sky, in number per square degree.		float	18	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.ObjectCount	Object Count	The total number of objects, catalog entries, etc., in the data object.		int	19	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.SkyFraction	Fraction of Sky	The fraction of the sky represented in the observations, ranging from 0 to 1.		float	20	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.Polarization	Polarization	The polarization coverage		text	21	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.Redshift.MinimumValue	coverage.Redshift.MinimumValue	The minimum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	22	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	coverage.Redshift.MaximumValue	coverage.Redshift.MaximumValue	The maximum value of the redshift (unitless) or Doppler velocity (km/s in the data object.		float	23	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE	coverage	astrophysics
-	redshiftType	RedshiftType	RedshiftType string C "Redshift"; or "Optical" or "Radio" definitions of Doppler velocity used in the data object.		text	24	FALSE	FALSE	FALSE	FALSE	FALSE	FALSE		astrophysics
+	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
 #controlledVocabulary	DatasetField	Value	displayOrder											
 	type	Image	0