Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
b703e27
Support SHA1 rather than MD5 as a checksum on a per file basis #3354
pdurbin Sep 20, 2016
801f802
Merge branch 'develop' into 3354-alt-checksum
pdurbin Sep 23, 2016
242080d
add ability to change footer copyright #3379
pdurbin Sep 23, 2016
20cef00
Merge branch 'develop' into 3354-alt-checksum
pdurbin Sep 23, 2016
6f4165a
set values before applying null constraint, cleanup #3354
pdurbin Sep 23, 2016
2b2a3c7
removed unused cruft #3354
pdurbin Sep 23, 2016
002e98f
Merge branch 'develop' into 3354-alt-checksum
pdurbin Sep 26, 2016
0921847
Merge branch 'develop' into 3379-custom-footer-copyright
pdurbin Sep 27, 2016
51017bd
make copyright year dynamic #2905, document `:FooterCopyright` #3379
pdurbin Sep 27, 2016
86195c7
Merge branch 'develop' into 3379-custom-footer-copyright
pdurbin Sep 27, 2016
3f4be2c
Merge branch 'develop' into 3354-alt-checksum
pdurbin Sep 28, 2016
a56a215
Fixed guides markdown formatting resulting in build error: WARNING: T…
mheppler Sep 28, 2016
c977f27
Fixed guides markdown formatting resulting in build error: WARNING: I…
mheppler Sep 28, 2016
438f244
Fixed guides markdown formatting resulting in build error: WARNING: u…
mheppler Sep 28, 2016
5b5eee7
Fixed guides markdown formatting resulting in build error: WARNING: t…
mheppler Sep 28, 2016
065cd9c
Fixed guides markdown formatting resulting in build error: WARNING: D…
mheppler Sep 28, 2016
e6c64c9
Fixed guides markdown formatting resulting in build error: WARNING: d…
mheppler Sep 28, 2016
95f1b12
Fixed guides markdown formatting resulting in build error: WARNING: n…
mheppler Sep 28, 2016
b1b9321
Fixed URL ref to githubicon.png which was displaying as a broken img …
mheppler Sep 28, 2016
d78a834
change default to be "Copyright © [YYYY]" #3379
pdurbin Sep 29, 2016
05345eb
Merge branch 'develop' into 3379-custom-footer-copyright
pdurbin Sep 29, 2016
7c2e568
Fixed formatting to resolve img display issue in the guides. [ref #3181]
mheppler Sep 29, 2016
e89b3a7
Fixed formatting to resolve toctree issue in installation guide. [ref…
mheppler Sep 29, 2016
2d01328
Added the stata doc file (that the sphinx build was complaining about…
landreev Sep 29, 2016
0078249
Merge branch '3181-guides-build-warning' of https://github.com/IQSS/d…
landreev Sep 29, 2016
6e8e673
kill the Windows and Ubuntu dev pages #3181
pdurbin Sep 29, 2016
ffa76b4
kill unused superuser page #3181
pdurbin Sep 29, 2016
1c190ac
Kill old redirect page. Unlikely to be bookmarked by now #3181
pdurbin Sep 29, 2016
aa9d284
cleanup rdata page #3181
pdurbin Sep 29, 2016
ea5481b
remove last warning! :) #3181
pdurbin Sep 29, 2016
691d3b7
Fixed formatting to resolve toctree issue in guides. [ref #3181]
mheppler Sep 29, 2016
f15d860
Removed duplicate img files. [ref #3181]
mheppler Sep 29, 2016
d8f1b98
Made copyright year in guides footer dynamic. [ref #3181 #2905]
mheppler Sep 29, 2016
1f8cd53
Merge pull request #3380 from IQSS/3379-custom-footer-copyright
kcondon Sep 29, 2016
ce836f2
Fixed format issue in toctree in user guides. [ref #3181]
mheppler Sep 29, 2016
9cbb0d8
Merge branch 'develop' into 3181-guides-build-warning
mheppler Sep 29, 2016
98c8568
Merge pull request #3389 from IQSS/3181-guides-build-warning
kcondon Sep 29, 2016
49092e2
bump version from 4.5 to 4.5.1 #3365
pdurbin Sep 30, 2016
02fa3a2
add GoogleAnalyticsCode example
donsizemore Sep 30, 2016
9f93e7b
Merge pull request #3393 from donsizemore/patch-4
kcondon Sep 30, 2016
74d6846
use "latest" in path to github icon #3388
pdurbin Sep 30, 2016
df82a45
Merge pull request #3394 from IQSS/3388-github-icon
kcondon Sep 30, 2016
d601f27
Merge pull request #3392 from IQSS/3365-bump-version-to-4.5.1
kcondon Sep 30, 2016
5e26721
Merge branch 'develop' into 3354-alt-checksum
pdurbin Sep 30, 2016
301e34a
Merge pull request #3367 from IQSS/3354-alt-checksum
kcondon Oct 4, 2016
f020323
Merge branch 'develop' into 3338-oauth-orcid
pdurbin Oct 4, 2016
e1b9dcf
Persist immutable id (a number) rather than mutable one #3338
pdurbin Oct 5, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions conf/solr/4.6.0/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@
<field name="unf" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="fileSizeInBytes" type="long" stored="true" indexed="true" multiValued="false"/>
<field name="fileMd5" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="fileChecksumType" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="fileChecksumValue" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="fileContentType" type="string" stored="true" indexed="true" multiValued="false"/>
<field name="deaccessionReason" type="string" stored="true" indexed="false" multiValued="false"/>

Expand Down
Binary file removed doc/Sphinx/source/img/image1institutional.png
Binary file not shown.
Binary file removed doc/Sphinx/source/img/image2institutional.png
Binary file not shown.
Binary file removed doc/Sphinx/source/img/image3institutional.png
Binary file not shown.
Binary file removed doc/Sphinx/source/img/image4institutional.png
Binary file not shown.
9 changes: 4 additions & 5 deletions doc/sphinx-guides/source/admin/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ These "superuser" tasks are managed via the new page called the Dashboard. A use
Contents:

.. toctree::
:maxdepth: 2

harvestclients
harvestserver
metadataexport
timers
harvestclients
harvestserver
metadataexport
timers
6 changes: 3 additions & 3 deletions doc/sphinx-guides/source/api/dataaccess.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ Multiple File ("bundle") download
Returns the files listed, zipped.

Parameters:
~~~~~~~~~~
~~~~~~~~~~~
none.

"All Formats" bundled access for Tabular Files.
----------------------------------------------
-----------------------------------------------

``/api/access/datafile/bundle/$id``

Expand All @@ -78,7 +78,7 @@ It returns a zipped bundle that contains the data in the following formats:
* File citation, in Endnote and RIS formats.

Parameters:
~~~~~~~~~~
~~~~~~~~~~~
none.

Data Variable Metadata Access
Expand Down
13 changes: 6 additions & 7 deletions doc/sphinx-guides/source/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ Rather than using a production installation of Dataverse, API users are welcome
Contents:

.. toctree::
:maxdepth: 2

sword
search
dataaccess
native-api
client-libraries
apps
sword
search
dataaccess
native-api
client-libraries
apps
4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/api/native-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Publish the Dataverse pointed by ``identifier``, which can either by the dataver
Datasets
~~~~~~~~

**Note** Creation of new datasets is done by ``POST``ing them onto dataverses. See dataverse section.
**Note** Creation of new datasets is done with a ``POST`` onto dataverses. See dataverse section.

**Note** In all commands below, dataset versions can be referred to as:

Expand Down Expand Up @@ -185,7 +185,7 @@ Delete a Private URL from a dataset (if it exists)::
DELETE http://$SERVER/api/datasets/$id/privateUrl?key=$apiKey

Builtin Users
~~~~~
~~~~~~~~~~~~~

This endopint deals with users of the built-in authentication provider. Note that users may come from other authentication services as well, such as Shibboleth.
For this service to work, the setting ``BuiltinUsers.KEY`` has to be set, and its value passed as ``key`` to
Expand Down
9 changes: 5 additions & 4 deletions doc/sphinx-guides/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import sys
import os
from datetime import datetime
sys.path.insert(0, os.path.abspath('../../'))
import sphinx_bootstrap_theme

Expand Down Expand Up @@ -56,16 +57,16 @@

# General information about the project.
project = u'Dataverse'
copyright = u'2016, The President & Fellows of Harvard College'
copyright = u'%d, The President & Fellows of Harvard College' % datetime.now().year

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '4.5'
version = '4.5.1'
# The full version, including alpha/beta/rc tags.
release = '4.5'
release = '4.5.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -358,7 +359,7 @@
epub_title = u'Dataverse'
epub_author = u'Dataverse Team'
epub_publisher = u'Dataverse Team'
epub_copyright = u'2014, Dataverse Team'
epub_copyright = u'%d, The President & Fellows of Harvard College' % datetime.now().year

# The basename for the epub file. It defaults to the project name.
#epub_basename = u'Consilience Documentation'
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/developers/dev-environment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Development Environment
Assumptions
-----------

This guide assumes you are using a Mac but we do have pages for :doc:`/developers/windows` and :doc:`/developers/ubuntu`.
This guide assumes you are using a Mac. If you are using Windows or Linux, please reach out to other developers at https://groups.google.com/forum/#!forum/dataverse-dev

Requirements
------------
Expand Down
23 changes: 10 additions & 13 deletions doc/sphinx-guides/source/developers/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ Developer Guide
Contents:

.. toctree::
:maxdepth: 2

intro
dev-environment
branching-strategy
testing
documentation
debugging
coding-style
making-releases
tools
unf/index


intro
dev-environment
branching-strategy
testing
documentation
debugging
coding-style
making-releases
tools
unf/index
51 changes: 0 additions & 51 deletions doc/sphinx-guides/source/developers/ubuntu.rst

This file was deleted.

10 changes: 5 additions & 5 deletions doc/sphinx-guides/source/developers/unf/index.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.. _unf:

====================================
=====================================
Universal Numerical Fingerprint (UNF)
====================================
=====================================

Contents:

.. toctree::
:maxdepth: 2

unf-v3
unf-v5
unf-v6
unf-v3
unf-v5
unf-v6

.. figure:: ./img/unf-diagram.png
:align: center
Expand Down
3 changes: 0 additions & 3 deletions doc/sphinx-guides/source/developers/unf/unf-v5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ UNF Version 5
**To address this, the Project is about to release UNF Version 6. The release date is still being discussed. It may coincide with the release of Dataverse 4.0. Alternatively, the production version of DVN 3.6.3 may get upgraded to use UNF v6 prior to that. This will be announced shortly. In the process, we are solving another problem with UNF v5 - this time we've made an effort to offer very implementer-friendly documentation that describes the algorithm fully and unambiguously. So if you are interested in implementing your own version of a UNF calculator, (something we would like to encourage!) please proceed directly to the Version 6 documentation.**

**Going forward, we are going to offer a preserved version of the Version 5 library and, possibly, an online UNF v5 calculator, for the purposes of validating vectors and data sets for which published Version 5 UNFs exist.**

-----

5 changes: 0 additions & 5 deletions doc/sphinx-guides/source/developers/windows.rst

This file was deleted.

4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

Dataverse 4.5 Guides
Dataverse 4.5.1 Guides
======================

These guides are for the most recent version of Dataverse. For the guides for **version 4.3.1** please go `here <http://guides.dataverse.org/en/4.3.1/>`_.
These guides are for the most recent version of Dataverse. For the guides for **version 4.5** please go `here <http://guides.dataverse.org/en/4.5/>`_.

.. toctree::
:glob:
Expand Down
55 changes: 43 additions & 12 deletions doc/sphinx-guides/source/installation/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Persistent identifiers are a required and integral part of the Dataverse platfor

JVM Options: :ref:`doi.baseurlstring`, :ref:`doi.username`, :ref:`doi.password`

Database Settings: :ref:`:DoiProvider`, :ref:`:Protocol`, :ref:`:Authority`, :ref:`:DoiSeparator`
Database Settings: :ref:`:DoiProvider <:DoiProvider>`, :ref:`:Protocol <:Protocol>`, :ref:`:Authority <:Authority>`, :ref:`:DoiSeparator <:DoiSeparator>`

Please note that any datasets creating using the test configuration cannot be directly migrated and would need to be created again once a valid DOI namespace is configured.

Expand All @@ -104,8 +104,9 @@ Once this configuration is complete, your Dataverse installation should be ready
JVM Options
-----------

JVM stands Java Virtual Machine and as a Java application, Glassfish can read JVM options when it is started. A number of JVM options are configured by the installer below is a complete list of the Dataverse-specific JVM options. You can inspect the configured options by running ``asadmin list-jvm-options | egrep 'dataverse|doi'
``.
JVM stands Java Virtual Machine and as a Java application, Glassfish can read JVM options when it is started. A number of JVM options are configured by the installer below is a complete list of the Dataverse-specific JVM options. You can inspect the configured options by running:

``asadmin list-jvm-options | egrep 'dataverse|doi'``

When changing values these values with ``asadmin``, you'll need to delete the old value before adding a new one, like this:

Expand Down Expand Up @@ -188,24 +189,30 @@ dataverse.dataAccess.thumbnail.pdf.limit

For limiting the size of thumbnail images generated from files.

.. _doi.baseurlstring:

doi.baseurlstring
+++++++++++++++++
.. _doi.baseurlstring:

As of this writing "https://ezid.cdlib.org" and "https://mds.datacite.org" are the only valid values. See also these related database settings below:

- :DoiProvider
- :Protocol
- :Authority
- :DoiSeparator

.. _doi.username:

doi.username
++++++++++++
.. _doi.username:

Used in conjuction with ``doi.baseurlstring``.

.. _doi.password:

doi.password
++++++++++++
.. _doi.password:

Used in conjuction with ``doi.baseurlstring``.

dataverse.handlenet.admcredfile
Expand Down Expand Up @@ -265,30 +272,45 @@ This is the email address that "system" emails are sent from such as password re

``curl -X PUT -d "Support <support@example.edu>" http://localhost:8080/api/admin/settings/:SystemEmail``

:FooterCopyright
++++++++++++++++

By default the footer says "Copyright © [YYYY]" but you can add text after the year, as in the example below.

``curl -X PUT -d ", The President &#38; Fellows of Harvard College" http://localhost:8080/api/admin/settings/:FooterCopyright``

.. _:DoiProvider:

:DoiProvider
++++++++++++
.. _:DoiProvider:

As of this writing "EZID" and "DataCite" are the only valid options.

``curl -X PUT -d EZID http://localhost:8080/api/admin/settings/:DoiProvider``

.. _:Protocol:

:Protocol
+++++++++
.. _:Protocol:

As of this writing "doi" is the only valid option for the protocol for a persistent ID.

``curl -X PUT -d doi http://localhost:8080/api/admin/settings/:Protocol``

.. _:Authority:

:Authority
++++++++++
.. _:Authority:

Use the DOI authority assigned to you by your DoiProvider.

``curl -X PUT -d 10.xxxx http://localhost:8080/api/admin/settings/:Authority``

.. _:DoiSeparator:

:DoiSeparator
+++++++++++++
.. _:DoiSeparator:

It is recommended that you keep this as a slash ("/").

``curl -X PUT -d "/" http://localhost:8080/api/admin/settings/:DoiSeparator``
Expand Down Expand Up @@ -370,7 +392,9 @@ Limit the number of files in a zip that Dataverse will accept.
:GoogleAnalyticsCode
++++++++++++++++++++

For setting up Google Analytics for your Dataverse installation.
Set your Google Analytics Tracking ID thusly:

``curl -X PUT -d 'trackingID' http://localhost:8080/api/admin/settings/:GoogleAnalyticsCode``

:SolrHostColonPort
++++++++++++++++++
Expand All @@ -392,7 +416,7 @@ The relative path URL to which users will be sent after signup. The default sett
The location of your TwoRavens installation. Activation of TwoRavens also requires the setting below, ``TwoRavensTabularView``

:TwoRavensTabularView
+++++++++++++++++++
+++++++++++++++++++++

Set ``TwoRavensTabularView`` to true to allow a user to view tabular files via the TwoRavens application. This boolean affects whether a user will see the "Explore" button.

Expand Down Expand Up @@ -477,3 +501,10 @@ Host FQDN or URL of your Piwik instance before the ``/piwik.php``. Examples:
or

``curl -X PUT -d hostname.domain.tld/stats http://localhost:8080/api/admin/settings/:PiwikAnalyticsHost``

:FileFixityChecksumAlgorithm
++++++++++++++++++++++++++++

Dataverse calculates checksums for uploaded files so that users can determine if their file was corrupted via upload or download. This is sometimes called "file fixity": https://en.wikipedia.org/wiki/File_Fixity

The default checksum algorithm used is MD5 and should be sufficient for establishing file fixity. "SHA-1" is an experimental alternate value for this setting.
Loading