-
Notifications
You must be signed in to change notification settings - Fork 488
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into sbgrid-json-migration
- Loading branch information
Showing
42 changed files
with
709 additions
and
256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+15.4 KB
...-guides/source/_static/installation/files/etc/maintenance/HarvardShield_RGB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 118 additions & 0 deletions
118
doc/sphinx-guides/source/_static/installation/files/etc/maintenance/maintenance.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <?xml version='1.0' encoding='UTF-8' ?> | ||
| <!DOCTYPE html> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> | ||
| <head> | ||
| <title>Harvard Dataverse</title> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <meta http-equiv="Content-Language" content="en" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
| <meta name="description" content="The Dataverse Project is an open source software application to share, cite and archive data. Dataverse provides a robust infrastructure for data stewards to host and archive data, while offering researchers an easy way to share and get credit for their data." /> | ||
|
|
||
| <link type="image/png" rel="icon" href="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/images/favicondataverse.png.xhtml" /> | ||
|
|
||
| <link type="image/png" rel="image_src" href="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/images/dataverseproject.png.xhtml" /> | ||
|
|
||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" /> | ||
|
|
||
| <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css" /> | ||
|
|
||
| <link rel="stylesheet" href="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/css/fontcustom.css" /> | ||
|
|
||
| <link rel="stylesheet" href="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/css/socicon.css" /> | ||
|
|
||
| <link rel="stylesheet" href="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/css/structure.css" /> | ||
|
|
||
| <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script> | ||
|
|
||
| <style type="text/css"> | ||
| @font-face { | ||
| font-family: "fontcustom"; | ||
| src: url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot"); | ||
| src: url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.eot?#iefix") format("embedded-opentype"), | ||
| url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.woff") format("woff"), | ||
| url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.ttf") format("truetype"), | ||
| url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg"); | ||
| font-weight: normal; | ||
| font-style: normal; | ||
| } | ||
|
|
||
| @font-face { | ||
| font-family: 'socicon'; | ||
| src: url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.eot'); | ||
| src: url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.eot?#iefix') format('embedded-opentype'), | ||
| url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.woff') format('woff'), | ||
| url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.woff2') format('woff2'), | ||
| url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.ttf') format('truetype'), | ||
| url('https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/socicon-font/socicon-webfont.svg#sociconregular') format('svg'); | ||
| font-weight: normal; | ||
| font-style: normal; | ||
| text-transform: initial; | ||
| } | ||
|
|
||
| @media screen and (-webkit-min-device-pixel-ratio:0) { | ||
| @font-face { | ||
| font-family: "fontcustom"; | ||
| src: url("https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/fontcustom/fontcustom_0cdeefae934823416d24b6c2132ac702.svg#fontcustom") format("svg"); | ||
| } | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div id="dataverse-header-block"> | ||
| <!-- Navbar Panel --> | ||
| <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" role="navigation"> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <span class="navbar-brand"><i id="icon-dataverse" class="icon-dataverse"></i> Dataverse</span> | ||
| </div> | ||
| <div class="collapse navbar-collapse" id="topNavBar"> | ||
| <ul class="nav navbar-nav navbar-right"> | ||
| <li> | ||
|   | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
|
|
||
| <!-- Header Panel --> | ||
| <div style="background:#F5F5F5;" class="container bg-muted" id="dataverseHeader"> | ||
| <div class="dataverseHeaderBlock"> | ||
| <div class="dataverseHeaderCell dataverseHeaderLogo"> | ||
| <img alt="Harvard Dataverse" src="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/doc/sphinx-guides/source/_static/installation/files/etc/maintenance/HarvardShield_RGB.png"/> | ||
| </div> | ||
| <div class="dataverseHeaderCell dataverseHeaderName"> | ||
| <span class="dataverseHeaderDataverseName" style="color:#000000;">Harvard Dataverse</span> | ||
| </div> | ||
| <div class="dataverseHeaderCell dataverseHeaderTagline"> | ||
| <span style="color:#a51c30;">A collaboration with Harvard Library, Harvard University IT, and IQSS</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="container" id="content"> | ||
| <div class="jumbotron" style="margin-top:20px;"> | ||
| <h2><em>We apologize for the service interruption.</em></h2> | ||
| <p>The Harvard Dataverse is currently undergoing maintenance. At this time both the application and APIs are not able to be used. However, the datasets stored in the Harvard Dataverse are fine and not impacted by this maintenance.</p> | ||
| <p>If you have any comments, questions or concerns, please reach out to support@dataverse.org.</p> | ||
| </div> | ||
| </div> | ||
| <div class="container" id="footer"> | ||
| <div class="row"> | ||
| <div class="col-sm-8 small"> | ||
| <p>Developed at the <a href="http://www.iq.harvard.edu/" title="Institute for Quantitative Social Science" target="_blank">Institute for Quantitative Social Science</a>  |  Dataverse Project on <a href="https://twitter.com/dataverseorg" target="_blank" title="Dataverse Project on Twitter"><span class="socicon socicon-twitter" title="Dataverse Project on Twitter"></span></a>  |  Code available at <a href="https://github.com/IQSS/dataverse" target="_blank" title="Dataverse On GitHub"><span class="socicon socicon-github" title="Dataverse On GitHub"></span></a> | ||
| </p> | ||
| <p>Copyright © 2016, The President & Fellows of Harvard College | <a href="http://best-practices.dataverse.org/harvard-policies/harvard-privacy-policy.html" target="_blank">Privacy Policy</a> | ||
| </p> | ||
| </div> | ||
| <div class="col-sm-4 text-right"> | ||
| <div class="poweredbylogo"> | ||
| <span>Powered by</span> | ||
| <a href="http://dataverse.org/" title="The Dataverse Project" target="_blank"><img src="https://cdn.rawgit.com/IQSS/dataverse/87cf58b5c3e8e01cf0f4891465df02334852eed3/src/main/webapp/resources/images/dataverseproject_logo.jpg" alt="The Dataverse Project" /></a> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| ALTER TABLE datafile ADD COLUMN checksumtype character varying(255); | ||
| UPDATE datafile SET checksumtype = 'MD5'; | ||
| ALTER TABLE datafile ALTER COLUMN checksumtype SET NOT NULL; | ||
| -- alternate statement for sbgrid.org and others interested in SHA-1 support | ||
| -- note that in the database we use "SHA1" (no hyphen) but the GUI will show "SHA-1" | ||
| --UPDATE datafile SET checksumtype = 'SHA1'; | ||
| ALTER TABLE datafile RENAME md5 TO checksumvalue; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/bin/sh | ||
| # existing, works, no files, commenting out | ||
| #curl -s -X POST -H "Content-type:application/json" -d @scripts/search/tests/data/dataset-finch1.json "http://localhost:8080/api/dataverses/root/datasets/?key=$API_TOKEN" | ||
| # new, has files | ||
| curl -s -X POST -H "Content-type:application/json" -d @scripts/issues/3354/datasetWithSha1Files.json "http://localhost:8080/api/dataverses/root/datasets/?key=$API_TOKEN" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| { | ||
| "datasetVersion": { | ||
| "files": [ | ||
| { | ||
| "label": "foo.txt", | ||
| "dataFile": { | ||
| "filename": "foo.txt", | ||
| "contentType": "text/plain", | ||
| "storageIdentifier": "157484f9d6c-c36006fa39e5", | ||
| "originalFormatLabel": "UNKNOWN", | ||
| "checksum": { | ||
| "type": "SHA-1", | ||
| "value": "f1d2d2f924e986ac86fdf7b36c94bcdf32beec15" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "metadataBlocks": { | ||
| "citation": { | ||
| "fields": [ | ||
| { | ||
| "value": "Dataset with SHA-1 files", | ||
| "typeClass": "primitive", | ||
| "multiple": false, | ||
| "typeName": "title" | ||
| }, | ||
| { | ||
| "value": [ | ||
| { | ||
| "authorName": { | ||
| "value": "Finch, Fiona", | ||
| "typeClass": "primitive", | ||
| "multiple": false, | ||
| "typeName": "authorName" | ||
| }, | ||
| "authorAffiliation": { | ||
| "value": "Birds Inc.", | ||
| "typeClass": "primitive", | ||
| "multiple": false, | ||
| "typeName": "authorAffiliation" | ||
| } | ||
| } | ||
| ], | ||
| "typeClass": "compound", | ||
| "multiple": true, | ||
| "typeName": "author" | ||
| }, | ||
| { | ||
| "value": [ | ||
| { "datasetContactEmail" : { | ||
| "typeClass": "primitive", | ||
| "multiple": false, | ||
| "typeName": "datasetContactEmail", | ||
| "value" : "finch@mailinator.com" | ||
| } | ||
| }], | ||
| "typeClass": "compound", | ||
| "multiple": true, | ||
| "typeName": "datasetContact" | ||
| }, | ||
| { | ||
| "value": [ { | ||
| "dsDescriptionValue":{ | ||
| "value": "Some people prefer SHA-1 to MD5 for file fixity.", | ||
| "multiple":false, | ||
| "typeClass": "primitive", | ||
| "typeName": "dsDescriptionValue" | ||
| }}], | ||
| "typeClass": "compound", | ||
| "multiple": true, | ||
| "typeName": "dsDescription" | ||
| }, | ||
| { | ||
| "value": [ | ||
| "Other" | ||
| ], | ||
| "typeClass": "controlledVocabulary", | ||
| "multiple": true, | ||
| "typeName": "subject" | ||
| } | ||
| ], | ||
| "displayName": "Citation Metadata" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.