Add users to silo
+ ${self.body()}
+
+
+
+ This has been formatted by the sample "example.xsl" transform -
+ use your own XSLT to get a nicer page
+
+
+
+
+
+ +
-
+
+
+
+
+ -
+
- + Index Statistics + +
-
+ Field Statistics
+
-
+
-
+
+
+ -
+
+
- + Document statistics + +
Index Statistics
+Field Statistics
+Document statistics
+
+
+
+
+ |
+
+ |
+ |
|---|---|
|
+ |
+
+
+ 50
+ 800
+ 160
+ blue
+
+
+ |
+
+
+ |
+
|
+ |
+
-
+
-
+
-
-
-
\ No newline at end of file
diff --git a/rdfdatabank/public/api_files/lyx.css b/rdfdatabank/public/api_files/lyx.css
deleted file mode 100644
index fd1dc3a..0000000
--- a/rdfdatabank/public/api_files/lyx.css
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
-* Styles for lyx document.
-*/
-body {
- font: 90% sans-serif;
- background: #f9f9f9;
- color: black;
- margin: 0;
- padding: 0;
-}
-
-#globalWrapper {
- margin: 10px 80px 10px 80px;
- padding: 20px;
- background: #ffffff;
- line-height: 1.5em;
- overflow: hidden;
-}
-a {
- text-decoration: none;
- color: #0030c0;
- background: none;
-}
-a:visited {
- color: #603090;
-}
-a:active {
- color: #ffa000;
-}
-a:hover {
- text-decoration: underline;
-}
-h1 {
- margin-top: 1em;
- line-height: 1.5em;
-}
-h1.Part {
- text-align: center;
-}
-h1.Part- {
- text-align: center;
-}
-sup {
- font-size: 0.75em;
- line-height: 0.5em;
- vertical-align: text-top;
-}
-sub {
- font-size: 0.75em;
- line-height: 0.5em;
- vertical-align: text-bottom;
-}
-div.Standard {
- margin: 1em 0;
-}
-div.Unindented {
- margin: 0;
-}
-div.Indented {
- text-indent: 30pt;
- margin: 0;
-}
-div.Indented * {
- text-indent: 0pt;
-}
-p.dir {
- float: right;
-}
-p.printindex {
- font-size: 0.90em;
-}
-a.printindex {
- color: black;
-}
-img.embedded {
- width: 100%;
- _width: auto;
-}
-div.float {
- margin-top: 1ex;
- margin-bottom: 1ex;
- text-align: center;
-}
-span.float {
- margin-top: 1ex;
- margin-bottom: 1ex;
- text-align: center;
-}
-div.figure {
- display: inline-block;
- padding: 1ex;
- margin-left: auto;
- margin-right: auto;
- border: thin solid #c0c0c0;
-}
-div.table {
- display: inline-block;
- padding: 1ex;
- margin-left: auto;
- margin-right: auto;
- border: thin solid #c0c0c0;
-}
-div.algorithm {
- display: inline-block;
- text-align: left;
- padding: 1ex;
- margin-left: auto;
- margin-right: auto;
- border: thin solid #c0c0c0;
-}
-div.caption {
- text-align: center;
- font-family: sans-serif;
- margin-left: auto;
- margin-right: auto;
- padding: 0.5ex;
-}
-img.figure {
- width: 100%;
- _width: auto;
-}
-div.multifigure {
- padding: 1ex;
- width: 100%;
-}
-div.multitable {
- display: inline-block;
- padding: 1ex;
- margin-left: auto;
- margin-right: auto;
- border: thin solid #c0c0c0;
-}
-div.multialgorithm {
- display: inline-block;
- padding: 1ex;
- margin-left: auto;
- margin-right: auto;
- border: thin solid #c0c0c0;
-}
-table {
- display: inline-table;
- text-align: center;
- border-collapse: collapse;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-tr.header {
- border-bottom: thin solid #c0c0c0;
- background: #ffffff;
- font-weight: bold;
-}
-td {
- padding: 1ex;
- border: thin solid #f0f0f0;
-}
-td div.Standard {
- margin: 0ex;
- padding: 0ex;
-}
-div.caption div.Standard, div.table div.Standard {
- margin: 0ex;
- padding: 0ex;
-}
-td.numeric {
- text-align: right;
-}
-td.empty {
- text-align: center;
-}
-.right {
- text-align: right;
-}
-.center {
- text-align: center;
- margin-left: auto;
- margin-right: auto;
-}
-p.biblio {
- font-size: 0.90em;
-}
-div.Paragraph, div.Paragraph- {
- font-weight: bold;
- font-size: 103%;
-}
-span.versalitas {
- font-variant: small-caps;
-}
-span.sans {
- font-family: sans-serif;
-}
-span.mathsf {
- font-family: sans-serif;
- font-style: normal;
-}
-span.red {
- color: #c00000;
-}
-span.blue {
- color: #0000c0;
-}
-span.green {
- color: #00c000;
-}
-span.magenta {
- color: #c000c0;
-}
-span.cyan {
- color: #00c0c0;
-}
-span.yellow {
- color: #c0c000;
-}
-span.white {
- color: #ffffff;
-}
-.formula {
- color: #000040;
- text-align: center;
- font-family: serif;
- margin: 1.2em 0;
-}
-div.formula {
- padding: 0.5ex;
- margin-left: auto;
- margin-right: auto;
-}
-span.overline {
- text-decoration: overline;
-}
-span.bar {
- text-decoration: overline;
-}
-.fraction {
- display: inline-block;
- vertical-align: middle;
- text-align: center;
-}
-.fraction .fraction {
- font-size: 80%;
- line-height: 100%;
-}
-.fullfraction {
- display: inline-block;
- vertical-align: middle;
- text-align: center;
-}
-span.numerator {
- display: block;
-}
-span.numerator-l {
- display: block;
- text-align: left;
-}
-span.numerator-r {
- display: block;
- text-align: right;
-}
-span.numeratorl {
- display: block;
- text-align: left;
-}
-span.numeratorr {
- display: block;
- text-align: right;
-}
-span.denominator {
- display: block;
- padding: 0;
- border-top: thin solid #000040;
-}
-span.sqrt {
- display: inline-block;
- vertical-align: middle;
-}
-span.radical {
- display: inline-block;
- padding: 0;
- font-size: 150%;
- vertical-align: top;
-}
-span.root {
- display: inline-block;
- border-top: thin #000040 solid;
- padding: 0;
- vertical-align: middle;
-}
-span.symbol {
- font-size: 125%;
-}
-span.bigsymbol {
- font-size: 150%;
-}
-span.largesymbol {
- font-size: 175%;
-}
-span.hugesymbol {
- font-size: 200%;
-}
-span.limits {
- display: inline-table;
- vertical-align: middle;
-}
-sub.bigsymbol {
- display: table-row;
- text-align: left;
- line-height: 150%;
-}
-sup.bigsymbol {
- display: table-row;
- text-align: left;
- line-height: 150%;
-}
-span.symbolover {
- display: inline-block;
- text-align: center;
- position: relative;
- float: right;
- right: 100%;
- bottom: 0.5em;
- width: 0px;
-}
-span.withsymbol {
- display: inline-block;
-}
-span.symbolunder {
- display: inline-block;
- text-align: center;
- position: relative;
- float: right;
- right: 80%;
- top: 0.3em;
- width: 0px;
-}
-span.dotted {
- border-top: thin #000040 dotted;
-}
-span.FootMarker {
- color: #004000;
-}
-span.Foot {
- float: right;
- clear: right;
- margin: 0.2ex;
- border: thin solid #c0c0c0;
- background: #ffffff;
- width: 30%;
- padding: 0.5ex;
- font: small normal;
- text-align: left;
-}
-span.Marginal {
- float: right;
- clear: right;
- margin: 0.2ex;
- border: thin solid #c0c0c0;
- background: #ffffff;
- width: 30%;
- padding: 0.5ex;
- font: small normal;
- text-align: left;
-}
-span.Note {
- display: none;
-}
-span.code {
- font-family: monospace;
-}
-div.Plain {
- display: inline;
- width: auto;
-}
-h1.title {
- text-align: center;
-}
-h2.author {
- text-align: center;
-}
-h2.Date {
- text-align: center;
-}
-span.text {
- font-style: normal;
-}
-span.textipa {
- color: #008080;
-}
-span.Description-entry {
- font-weight: bold;
-}
-span.List-entry {
- display: inline-block;
- width: 25%;
- vertical-align: text-top;
-}
-span.List-contents {
- display: inline-block;
- width: 75%;
- vertical-align: text-top;
-}
-div.Space {
- display: none;
-}
-span.fraktur {
- font-family: "Lucida Blackletter", eufm10, blackletter;
-}
-span.blackboard {
- font-family: Blackboard, msbm10, serif;
-}
-span.script {
- font-family: "Monotype Corsiva", "Apple Chancery", "URW Chancery L", cursive;
-}
-span.arraydef {
- display: none;
-}
-span.appendix {
- display: none;
-}
-h1.biblio {
- font-size: 140%;
-}
-table.formula {
- display: inline-block;
- text-align: center;
- border-collapse: collapse;
- margin: 0em;
- vertical-align: middle;
-}
-td.formula-l {
- text-align: left;
- padding: 0.2ex;
- border: 0ex;
-}
-td.formula-c {
- text-align: center;
- padding: 0.2ex;
- border: 0ex;
-}
-td.formula-r {
- text-align: right;
- padding: 0.2ex;
- border: 0ex;
-}
-table.cases {
- display: inline-block;
- text-align: center;
- border-collapse: collapse;
- margin: 0.2em;
- border-left: thin solid #000040;
- vertical-align: middle;
-}
-table.cases tr td {
- padding-left: 1ex;
- padding-right: 1em;
-}
-table.environment {
- display: inline-block;
- text-align: right;
- margin: 0;
- vertical-align: middle;
-}
-table.environment tr td {
- padding: 0 1em;
-}
-span.greyedout {
- color: #808080;
-}
-div.Description, div.List, li {
- margin: 1em 0;
-}
-li.nested {
- list-style-type: none;
-}
-span.Info {
- background: #f0f0f0;
- border: thin solid #c0c0c0;
-}
-pre {
- padding: 0em;
- margin: 0em;
- width: auto;
- font-family: monospace;
- line-height: 1.5em;
-}
-pre.LyX-Code {
- margin: 0.5em 3em;
-}
-a.Label {
- text-decoration: none;
- color: #000000;
-}
-div.wrap-l, div.wrap-o, div.wrap-i {
- margin: 2ex;
- float: left;
-}
-div.wrap-r {
- margin: 2ex;
- float: right;
-}
-div.abstract {
- margin: 3em;
- text-align: center;
-}
-p.abstract-message {
- font-weight: bold;
-}
-div.listing {
- display: inline-block;
- text-align: left;
- margin-left: auto;
- margin-right: auto;
- padding: 0.5ex;
- border: thin solid #c0c0c0;
-}
-div.framed {
- outline-style: solid;
-}
-div.frameless {
-}
-div.Framed {
- outline-style: double;
-}
-div.Frameless {
- outline-style: outset;
-}
-div.Doublebox {
- outline-style: double;
-}
-div.Shadowbox {
- outline-style: outset;
-}
-div.Shaded {
- outline-style: inset;
-}
-div.ovalbox {
- outline-style: groove;
-}
-div.Ovalbox {
- outline-style: ridge;
-}
-span.number-left {
- float: left;
- background: #f0f0f0;
- width: 3em;
- text-align: right;
- margin-right: 1em;
-}
-span.number-right {
- float: right;
- background: #f0f0f0;
- width: 3em;
- text-align: right;
- margin-left: 1em;
-}
-a.eqnumber {
- display: inline-block;
- float: right;
- clear: right;
- font-weight: bold;
- color: #000040;
-}
-span.unknown {
- color: #800000;
-}
-span.phantom {
- color: #ffffff;
-}
-div.tocheader {
- margin: 1em 0;
- font-size: large;
-}
-a.toc {
- color: black;
-}
-a.biblioentry {
- color: black;
-}
-div.tocindent {
- padding: 0 0 0 2em;
-}
-div.toc {
- margin: 0.5em 0;
- font-size: 0.95em;
-}
-div.fulltoc {
- padding: 1em;
-}
-span.hspace {
- display: inline-block;
-}
-span.vspace {
- display: inline-block;
-}
-span.hfill {
- display: inline-block;
- margin-left: auto;
- margin-right: auto;
- min-width: 20mm;
- background: #fff0f0;
-}
-span.binom {
- display: inline-block;
- vertical-align: middle;
- text-align: center;
- font-size: 80%;
-}
-span.fullbinom {
- display: inline-block;
- vertical-align: middle;
- text-align: center;
-}
-span.upbinom {
- display: block;
- padding: 0em;
-}
-span.downbinom {
- display: block;
- padding: 0em;
-}
-div.defskip {
- display: block;
- height: 1em;
-}
-div.smallskip {
- display: block;
- height: 0.5em;
-}
-div.medskip {
- display: block;
- height: 1em;
-}
-div.bigskip {
- display: block;
- height: 2em;
-}
-div.vfill {
- display: block;
- height: 30em;
-}
-span.menuitem {
- font-size: 105%;
-}
-div.chunk {
- width: auto;
-}
-span.chunkleft {
- font-style: normal;
-}
-span.chunkright {
- font-style: normal;
-}
-span.chunkdecl {
- font-style: italic;
- padding: 0em 2em;
-}
-span.chunkref {
- font-style: italic;
-}
-span.normal {
- font-style: normal;
-}
-span.overbrace {
- border-top: 2pt solid #000000;
-}
-span.underbrace {
- border-bottom: 2pt solid #000000;
-}
-div.warning {
- font-size: 120%;
- color:#cc0000;
-}
-div.PlainVisible {
- width: auto;
-}
-div.splitheader {
- margin: 0em;
- text-align: center;
- background: #f9f9f9;
-}
-span.next {
- float: right;
- width: 15em;
- text-align: right;
-}
-span.up {
- display: inline-block;
- text-align: center;
-}
-span.prev {
- float: left;
- width: 15em;
- text-align: left;
-}
-hr.footer {
- margin-top: 2em;
-}
-div.footer {
- font-size: 0.90em;
- margin: 1em 0;
-}
diff --git a/rdfdatabank/public/static/databank_logo.png b/rdfdatabank/public/static/databank_logo.png
new file mode 100644
index 0000000..2fe501d
Binary files /dev/null and b/rdfdatabank/public/static/databank_logo.png differ
diff --git a/rdfdatabank/public/static/databank_logo_generic.png b/rdfdatabank/public/static/databank_logo_generic.png
new file mode 100644
index 0000000..dbb7695
Binary files /dev/null and b/rdfdatabank/public/static/databank_logo_generic.png differ
diff --git a/rdfdatabank/public/static/jquery.js b/rdfdatabank/public/static/jquery.js
new file mode 100644
index 0000000..b1ae21d
--- /dev/null
+++ b/rdfdatabank/public/static/jquery.js
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F-/objects -
-
-GETAccept: *, authd - Returns an HTML
-page listing the ’silos’ your account can see
-
-
-POST,PUT,DELETENOOP
-
--/objects/{silo name} -
-
-GETAccept:text/html - Returns an HTML
-page listing the ids, along with a form for item creation
-
-
-GETAccept: text/plain, application/json -
- Returns a JSON-encoded hash/dict, keys map to exising item ids, and
-include embargo information
-
-
-POSTCreate new object
-
--
-
-
-
-
--Parameters-> id = {id to create}, -embargoed = {true|false}, embargoed_until = {ISO8601 date}, -title={(Optional)} ---Returns:Accept:text/html - 302 to splash - page for newly created object, 201 otherwise on success. Code 409 if -object already exists. --
-
-PUT,DELETENOOP
-
--/objects/{silo name}/{id} -
-
-GETAccept: text/html - returns HTML
-splash page for item id
-
-
-GETAccept: application/json - returns
-item’s JSON-encoded state
-
-
-GETAccept: application/rdf+xml, text/xml
- - returns item’s RDF manifest as RDF/XML
-
-
-GETAccept: text/rdf+n3 - returns item’s
-RDF manifest as N3
-
-
-GETAccept: application/x-turtle -
-returns item’s RDF manifest as Turtle
-
-
-GETAccept: text/rdf+ntriples,
-text/rdf+nt - returns item’s RDF manifest as ntriples
-
-
-POSTIf Item id doesn’t
-exist, create it. (As POST /objects/{silo} id=...)
-
-
-POSTItem id does exist:
-
--
-
-
-
-
--Embargo-controlChange embargo -information on item id --
-
-
-
-
-
--Parameters-> embargo_change = true, -embargoed = {true|false}, embargoed_until = {ISO8601 date} ---Returns:JSON-encoded statement of new -embargo information with a 200 on success. --
-
-File-upload:Upload file to root -directory (makes HTML forms easier) ---
-
-
-
-
--Parameters-> file = Multipart-encoded - (HTML) file upload, filename = {Optional filename for upload} ---Returns:Accept: text/html - 302 redirect - to top-level item view on success ---Returns:Accept: * - 200/201 on -update/creation of file with filename 403 if filename == existing - subdirectory name. (For the sake of web UI) --
-
-Text-uploadConvenience function for HTML - to update/create text files ---
-
-
-
-
--Parameters-> text = {UTF text to -store}, filename = {desired filename} ---Returns:As File upload, but with the -following changes: if ’filename’ isn’t set, 406 error will result. If -filename == ’manifest.rdf’, and the text isn’t valid RDF/XML, again, 406 - will result. --
-
- -
-
-
-DELETEDeletes the item id - 200
-on success, 404 if id doesn’t exist
-
-
-PUTNOOP
-
--/objects/{silo -name}/{id}/{subpath} -
-
-GETAccept: text/html - HTML page listing
- the files within a given subpath
-
-
-GETAccept: text/plain, application/json -
- JSON-encoded listing of files {’parts’: { ’filename’: {python os.stat
-results}, ...} with ’readme_text’ being a potential top-level key-value
-pair
-
-
-PUTresults in a 403 - cannot put content
- onto an existing directory
-
-
-POSTUpload a file within the subpath
-
--
-
-
-
-
--Parameters-> file = Multipart-encoded - (HTML) file upload, filename = {Optional filename for upload} ---Returns:Accept: * - 200/201 on -update/creation of file with filename 403 if filename == existing - subdirectory name. (For the sake of web UI) --
-
-DELETETODO - recursive delete. Returns
-400 if the directory has subdirectories but this is not intended to be a
- long-term API choice.
-
--/objects/{silo -name}/{id}[/{subpath}]/{filename} -
-
-GETGETs the file at
-[/{subpath}]/{filename}, 404 otherwise
-
-
-PUTPUTs the request body in the place of
- the [/subpath]/filename, whether it already exists or not.
-
--
-
-
-
-
--Returns200/201 for update/creation --
-
-POSTUpload a file within the same
-subpath as the file (HTML convenience)
-
--
-
-
-
-
--Parameters-> file = Multipart-encoded - (HTML) file upload, filename = {Optional filename for upload} ---Returns:Accept: * - 200/201 on -update/creation of file with filename 403 if filename == existing - subdirectory name. (For the sake of web UI) --
-
-DELETERemoves the filename from the item
- and subpath.
-
--
-
-
-
-
--Returns:200 on success. --
-
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;EAbout Databank
+
+
diff --git a/rdfdatabank/templates/add_users_to_silo.html b/rdfdatabank/templates/add_users_to_silo.html
new file mode 100644
index 0000000..a60783a
--- /dev/null
+++ b/rdfdatabank/templates/add_users_to_silo.html
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+
diff --git a/rdfdatabank/templates/admin_api.html b/rdfdatabank/templates/admin_api.html
new file mode 100644
index 0000000..2c8697e
--- /dev/null
+++ b/rdfdatabank/templates/admin_api.html
@@ -0,0 +1,488 @@
+# -*- coding: utf-8 -*-
+Databank is being developed by the Bodleian Digital Library Systems and Services of the University of Oxford as a part of the Dataflow project
+ +DataFlow is creating a two-stage data management infrastructure that makes it easy for you and your research group to work with, annotate, publish, and permanently store your research data. You manage this locally using your own instance of DataStage, while allowing your institution to deploy DataBank easily to preserve and publish your most valuable data packages.
+ +Published data packages have assigned DOIs to make them citable and to gain you academic credit.
+ +Want to test-drive the system? Help develop it? Learn more and Join us!
+
+
+Admin
+API call to
-
+
- Obtain a list silos that are owned by user +
- Modify the silo metadata +
- Delete the silo +
- Create usernames and assign passwords +
- update passwords +
- Add/remove users from a silo +
Sections
+ + +
+
+
+
+/admin
+
+ API call to obtain a list of silos owned by the user, create new silos, delete silo, manage users and alter silo metadata
+Controller: datasets action: siloview
+
+
+GET: Obtain a list of datasets in a silo
+Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ Accept:text/html
+ Returns the ids of each dataset in the silo, along with a form for changing the embargo information and deleting the dataset. A form for dataset creation is also available.
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded list of dataset ids in that silo along with the embargo information for each dataset
+ The file datasetsInSiloInformation.txt contains an example of the data returned (data_returned)
+ Accept:*/*, default
+ Returns text/HTML listing the ids of each dataset, along with a form for changing the embargo information and deleting the dataset. A form for dataset creation is also available.
+
+
+POST: Create new dataset
+Parameters
+
+
+
+
+ | id | {id to create} |
| embargoed | {true|false} (optional). If the parameter is not supplied, a default value of false will be used. |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
| title | {(Optional)} |
Returns
+
+
+
+ 409 if dataset already exists
+ 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
+ + 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
Accept: text/html
+ 302 to splash page for newly created dataset
+ Accept: text/plain, application/json
+ 201 created
+ Accept: */*, default
+ Returns text/plain, 201 created
+
+
+
+
+PUT, DELETE: NOOP
+
+
+
+
+/{silo name}/datasets/{id}
+
+ API call to obtain information about the dataset, create a dataset, modify the datasets embargo information, post files to the dataset and delete the dataset. All of this is performed on the latest version of the dataset.
+Controller: datasets action: datasetview
+
+
+GET: Obtain information about the dataset
+Returns
+
+
+404 if dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ Accept: text/html
+ returns HTML splash page for dataset id. The page contains the following:
+
+ -
+
- Readme text +
- List of files / folders at the top level +
- Dataset's embargo state +
- Manifest data +
- If authenticated and authorized user:
+-
+
- View options: Choice to view page as anonymous user or as editor +
- Form to modify manifest +
- Form to upload file +
- List of dataset unpack endpoints, to unpack file to new dataset +
+
Accept: application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Dataset's embargo information data_returned["embargos"] +
- If user is authenticated and authorized (editor = true) / anonymous (editor = false) - data_returned["editor"] +
- List of zipfiles - data_returned["zipfiles"] +
- If user is authenticated and authorized, the view chosen by the user - data_returned["view"] +
- Manifest data in two forms - data_returned["manifest"] and data_returned["manifest_pretty"] +
- Hash dict of files / folders at the top level - data_returned["parts"][file_or_directory_name"]
+ If it is a file, the file stat information is also available. See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The file datasetInformation.txt contains an example of the data returned (data_returned)
+ Accept: application/rdf+xml, text/xml
+ returns dataset's RDF manifest as RDF/XML
+ Accept: text/rdf+n3
+ returns dataset's RDF manifest as N3
+ Accept: application/x-turtle
+ Returns dataset's RDF manifest as Turtle
+ Accept: text/rdf+ntriples, text/rdf+nt
+ returns dataset's RDF manifest as ntriples
+ Accept: */*, default
+ returns text/HTML of splash page for dataset id, as described above
+
+
+POST: Create new dataset. Dataset id doesn't exist. (As POST /{silo}/datasets id=...)
+Parameters
+
+
+
+
+ | embargoed | {true|false} (optional). If the parameter is not supplied, a default value of false will be used. |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
| title | {(Optional)} |
Returns
+
+
+
+ 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
+ + 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
Accept: text/html
+ 302 to splash page for newly created dataset
+ Accept: text/plain, application/json
+ 201 created
+ Accept: */*, default
+ Returns text/plain, 201 created
+
+
+POST : change embargo information in dataset. On success, version is incremented.
+
+
+ TODO:
+ Redo this bit of code, removing the parameter embargo_change and just using embargoed and embargoed_until
+ Parameters
+
+
+
+
+ | embargo_change | true (used as a convenience parameter for html forms) |
| embargoed | {true|false} |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
Returns
+
+
+ 401 if not a valid user
+ 403 if not authorized
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain, application/json
+ 204 updated
+ Accept: */*, default
+ 204 updated
+
+
+POST: Upload file to root directory. On success, version is incremented.
+Parameters
+
+
+
+
+ | file | Multipart-encoded (HTML) file upload |
| filename | {Optional filename for upload} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 400 if filename contains ..
+ 403 if filename is an existing directory in dataset. Cannot post a file to update a directory with a file.
+ 400 if filename is manifest.rdf and cannot read / parse rdf in manifest
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+ Accept: */*, default
+ Returns text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+
+
+POST: Text upload. Convenience function for HTML to update/create text files. On success, version is incremented.
+Parameters
+
+
+
+
+ | text | {UTF text to store} |
| filename | {desired filename} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 400 if filename contains ..
+ 406 if the parameter filename is missing
+ 403 if filename is an existing directory in dataset. Cannot post a file to update a directory with a file.
+ 406 if the filename is manifet.rdf and cannot parse rdf
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+ Accept: */*, default
+ Returns text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+
+
+DELETE Deletes the dataset id
+
+
+ Be Aware!
+ Delete currently deletes the dataset. This action cannot be undone and your data is lost following this action.
+
+
+ TODO:
+ Delete currently deletes the dataset. This SHOULD NOT happen. On delete, create a new version with just a stub in the manifest saying deleted. Also, this dataset should not be returned in the list of datasets and dataset create should not return a 409.
+ Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if id doesn't exist
+ Accept: */*, default
+ Returns text/plain, 200 on success
+
+
+
+
+PUT NOOP
+
+
+
+
+/{silo name}/datasets/{id}/version{#}
+
+ API call to obtain information about a particular version of the dataset
+Controller: datasets action: datasetview_vnum
+
+
+
+
+GET: Obtain information about a particular version of the dataset
+Returns
+
+
+404 if dataset is not available
+ 404 if version number # of dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ Accept: text/html
+ returns HTML splash page for dataset id. The page contains the following:
+
+ -
+
- Readme text +
- List of files / folders at the top level +
- Dataset's embargo state +
- Manifest data +
Accept: application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Dataset's embargo information data_returned["embargos"] +
- If user is authenticated and authorized (editor = true) / anonymous (editor = false) - data_returned["editor"] +
- If user is authenticated and authorized, the view chosen by the user - data_returned["view"]
(Note : this will always return empty as there is no edit possible for previous versions of the dataset)
+ - Manifest data - data_returned["manifest_pretty"] +
- Hash dict of files / folders at the top level - data_returned["parts"][file_or_directory_name"]
+ If it is a file, the file stat information is also available. See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The files
+ datasetInformation-version0.txt and
+ datasetInformation-version1.txt
+ contain an example of the data returned (data_returned)
+
+ Accept: application/rdf+xml, text/xml
+ returns dataset's RDF manifest as RDF/XML
+ Accept: text/rdf+n3
+ returns dataset's RDF manifest as N3
+ Accept: application/x-turtle
+ Returns dataset's RDF manifest as Turtle
+ Accept: text/rdf+ntriples, text/rdf+nt
+ returns dataset's RDF manifest as ntriples
+ Accept: */*, default
+ returns text/HTML of splash page for dataset id, as described above
+
+
+
+
+/{silo name}/datasets/{id}/{subpath}
+
+ API call to view files / contents of a folder and add, update or delete a file. All of these actions are performed on the latest version of the dataset. +
+Controller: datasets action: itemview
+
+
+GET: view the contents of subpath (subpath could point to a file or a folder)
+Returns
+
+
+404 if dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ 404 if subpath is not available
+ subpath is a file
+
+
+ Accept: */*, default
+ The file is served
+ subpath is a directory
+
+
+ Accept: text/html
+ HTML page listing the files within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Hash dict of files / folders at subpath (just that level) - data_returned["parts"]["file_or_directory_name"]
+ If it is a file, the file stat information is also available. + See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The file
+ datasetSubdirInformation.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ HTML page listing the files within the given subpath and readme_text
+
+
+PUT: used to add content to a file.
+ If the subpath points to manifest.rdf, the content is munged with exisitng metadata.
+ If the subpath does not exist, a file is created in the same name as the filename in path including all the intermediate directories in the subpath (using os.makedirs) and the contents are added to that file.
+ On success, version is incremented.
+
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 403 if subpath points to a directory - cannot put content onto an existing directory
+ 400 if subpath contains ..
+ Accept: text/html
+ 302 to the subpath, listing the files within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 204 Updated, if subpath did exist
+ 201 created, if subpath did not exist
+ Accept: */*, default
+ Return text/plain. 201 on creation and 204 on update.
+
+
+POST Upload a file within the subpath
+ If the subpath + filename parameter points to manifest.rdf, the content is munged with exisitng metadata.
+ If the subpath + filename parameter does not exist, the file is added as filename into subpath. The intermediate directories in the subpath (using os.makedirs) are created if they do not exist.
+ On success, version is incremented.
+
Parameters
+
+
+
+
+ | file | Multipart-encoded (HTML) file upload |
| filename | {Optional filename for upload}. + When provided, it is only used if subpath points to an existing directory. |
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 400 if subpath contains ..
+ 403 if subpath + filename points to an existing directory
+ Accept: text/html
+ 302 to the subpath, listing the file filename within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 204 Updated, if subpath did exist
+ 201 created, if subpath did not exist
+ Accept: */*, default
+ Returns text/plain. 201 on creation and 204 on update.
+
+
+
+
+DELETE: deletes files or directories within the dataset. It also performs recursive deletes (directories with sub-directories within them).
+ On success, version is incremented.
+
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 403 if subpath is manifest.rdf
+ Accept: */*, default
+ Returns text/plain. 200 OK on successful completion.
+
+
+
+
+/{silo name}/datasets/{id}[/{subpath}]/version{#}
+
+ API call to obtain a file or view the contents of a folder, for a particular version of the dataset
+Controller: datasets action: itemview
+
+
+GET: Obtain files or view the contents of a directory for a particular version of the dataset.
+Returns
+
+
+404 if dataset, subpath or version number (#) is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ subpath is a file
+
+
+ Accept: */*, default
+ The file is served
+ subpath is a directory
+
+
+ Accept: text/html
+ HTML page listing the files within the given subpath and readme_text (pertaining to that version)
+
+
+ TODO:
+ The html display is not showing the files. Fix bug!
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Hash dict of files / folders at subpath (just that level) - data_returned["parts"]["file_or_directory_name"]
+ If it is a file, the file stat information is also available. + See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The files
+ datasetSubdirInformation-version3.txt and
+ datasetSubdirInformation-version1.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ HTML page listing the files within the given subpath and readme_text
+
+
+
+
diff --git a/rdfdatabank/templates/admin_silos.html b/rdfdatabank/templates/admin_silos.html
new file mode 100644
index 0000000..fbe80d8
--- /dev/null
+++ b/rdfdatabank/templates/admin_silos.html
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ POST, PUT, DELETE: NOOP
+Admin Interface
+ +
+
+
+% if c.granary_list:
+Edit options
+-
+ % if 'administrator' in c.ident['permissions']:
+
-
+
Create new silo
+ % endif
+ -
+
View users
+ -
+
Create new user
+
+
+% endif
+
+% if 'administrator' in c.ident['permissions']:
+
+% endif
+
+
+
diff --git a/rdfdatabank/templates/admin_siloview.html b/rdfdatabank/templates/admin_siloview.html
index 5542d86..45f3bcf 100644
--- a/rdfdatabank/templates/admin_siloview.html
+++ b/rdfdatabank/templates/admin_siloview.html
@@ -1,15 +1,68 @@
# -*- coding: utf-8 -*-
<%inherit file="/base.html" />
<%def name="head_tags()">
- List of silos managed by you
+ +Admin Archive ${c.silo_name}
+Admin Interface - ${c.silo}
% if c.message:${c.message}
% endif --
Delete this silo - NO UNDO!
--% endif +
+
+
+Edit options
+ +Silo Metadata
+<%include file="/silo_metadata.html"/> + + + + + + + diff --git a/rdfdatabank/templates/admin_user.html b/rdfdatabank/templates/admin_user.html new file mode 100644 index 0000000..a9bda0f --- /dev/null +++ b/rdfdatabank/templates/admin_user.html @@ -0,0 +1,82 @@ +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +Details for user ${c.username}
+% if c.message: +${c.message}
+% endif + +% if c.user: +
+
+
+
+% endif
+
+
+% if c.ident['user'].user_name == c.username:
+
+% endif
+
+
+
diff --git a/rdfdatabank/templates/admin_users.html b/rdfdatabank/templates/admin_users.html
new file mode 100644
index 0000000..8d47c16
--- /dev/null
+++ b/rdfdatabank/templates/admin_users.html
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Edit options
+-
+ % if c.ident['user'].user_name == c.username:
+
-
+
Update user details
+ % endif
+ -
+
Delete user
+
+ -
+ View users
+
-
+
View silos
+
Users of ${c.silo_name}
+% if c.message: +${c.message}
+% endif ++% if c.users: +
-
+ % for o in c.users:
+
- ${o} + % endfor +
+
Create new user
+<%include file="/register_new_user.html"/> diff --git a/rdfdatabank/templates/alter_silo.html b/rdfdatabank/templates/alter_silo.html index 31a174a..6d5c0c6 100644 --- a/rdfdatabank/templates/alter_silo.html +++ b/rdfdatabank/templates/alter_silo.html @@ -1,20 +1,72 @@ # -*- coding: utf-8 -*- -Alter Silo
--
diff --git a/rdfdatabank/templates/api.html b/rdfdatabank/templates/api.html new file mode 100644 index 0000000..b8da929 --- /dev/null +++ b/rdfdatabank/templates/api.html @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +Databank API
+API documentation for:
+
+
+
+
+To learn more about Databank visit the Databank wiki
+
+
+<%include file="${c.api_file}"/>
diff --git a/rdfdatabank/templates/atom_results.html b/rdfdatabank/templates/atom_results.html
new file mode 100644
index 0000000..ebedd08
--- /dev/null
+++ b/rdfdatabank/templates/atom_results.html
@@ -0,0 +1,2 @@
+
+${c.atom}
diff --git a/rdfdatabank/templates/base.html b/rdfdatabank/templates/base.html
index bf78c86..429c429 100644
--- a/rdfdatabank/templates/base.html
+++ b/rdfdatabank/templates/base.html
@@ -1,63 +1,198 @@
-# -*- coding: utf-8 -*-
-
-
-
-
-
-
- ${self.head_tags()}
-
-
-% if c.silo_name:
-To learn more about Databank visit the Databank wiki
+Archives - Search API: ${c.silo_name} - ${c.silo_name} package upload
-% else: -Archives - Search API
-% endif -% if c.ident and c.ident['role'] == "admin": -
-
-% endif
-% if c.id:
-% if c.path:
-Admin pages -% if c.silo_name: -Admin ${c.silo_name} -% endif -
-Subdirectory ${c.id}/${c.path}
-Root directory: ${c.id}
-% else: -Root directory of ${c.id}
-% endif -% endif - ${self.body()} -- - - - +# -*- coding: utf-8 -*- + + + + + + + + + + + + + + + ${ h.javascript_link( '/static/jquery.js' ) } + ${self.head_tags()} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ <%include file="/header.html"/>
+
+ <%
+ user_logged_in = request.environ.get("repoze.who.identity")
+ showAdmin = False
+ if user_logged_in:
+ c.user_logged_in_name = user_logged_in['repoze.who.userid']
+ if 'permissions' in user_logged_in and 'administrator' in user_logged_in['permissions']:
+ showAdmin = 'admin'
+ elif 'permissions' in user_logged_in and 'manager' in user_logged_in['permissions']:
+ showAdmin = 'manage'
+ current_url = request.environ.get('PATH_INFO')
+ %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rdfdatabank/templates/cookies.html b/rdfdatabank/templates/cookies.html
new file mode 100755
index 0000000..3c147fd
--- /dev/null
+++ b/rdfdatabank/templates/cookies.html
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ -
+
- skip to content +
- skip to navigation + +
+
+
+
+
+
+
+
+
+
+ Cookies in Databank
+
+
diff --git a/rdfdatabank/templates/create_doi.html b/rdfdatabank/templates/create_doi.html
new file mode 100644
index 0000000..f98db20
--- /dev/null
+++ b/rdfdatabank/templates/create_doi.html
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/create_new_item.html b/rdfdatabank/templates/create_new_item.html
index 3c1a694..c69f55c 100644
--- a/rdfdatabank/templates/create_new_item.html
+++ b/rdfdatabank/templates/create_new_item.html
@@ -1,5 +1,7 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/create_new_silo.html b/rdfdatabank/templates/create_new_silo.html
index db05b37..7c40cd0 100644
--- a/rdfdatabank/templates/create_new_silo.html
+++ b/rdfdatabank/templates/create_new_silo.html
@@ -1,13 +1,25 @@
# -*- coding: utf-8 -*-
-
+
+What are cookies
+Cookies are small text files that can be written and read by websites and stored by the browser on your computer, tablet or smartphone. They do a number of things including allowing access to some types of content and functionality to users, and collecting anonymous user information so that site owners can monitor the performance of their sites. They are a kind of .memory. for a website that can help it respond appropriately to users and user behaviour.
+
+
+Cookies on this website
+This website stores cookies for use in website analytics and other cookies that are striclty necessary to provide certain features or content, you have requested based on the authentication information provided by you.
+The analytics cookies anonymously tracks individual visitor behaviour on the website so that we can see how the site is being used. We only use this information for monitoring and improving our website and content for the benefit of our users (you).
+More information about controlling these cookies can be found at http://www.bodleian.ox.ac.uk/cookies. +
Create new Silo
--
- diff --git a/rdfdatabank/templates/datasets_api.html b/rdfdatabank/templates/datasets_api.html new file mode 100644 index 0000000..01cb71c --- /dev/null +++ b/rdfdatabank/templates/datasets_api.html @@ -0,0 +1,493 @@ +# -*- coding: utf-8 -*- +
+
+Datasets
+API call to
-
+
- Obtain a list of datasets in a silo +
- Obtain information about the latest version of the dataset or information about a particular vesion of the dataset +
- View the contents of the dataset - view / download files and view contents of sub-directories (latest verison or a particular version) +
- Create a dataset +
- Modify the datasets embargo information +
- Add new files to the dataset (including metadata files) +
- Update existing files in the dataset (including metadata files) +
- Delete files in the dataset +
- Delete the dataset +
Sections
+-
+
- /{silo name}/datasets +
- /{silo name}/datasets/{id} +
- /{silo name}/datasets/{id}/version{#} +
- /{silo name}/datasets/{id}/{subpath} +
- /{silo name}/datasets/{id}[/{subpath}]/version{#} +
+
+
+
+/{silo name}/datasets
+
+ API call to obtain a list of datasets in a silo and create a new dataset
+Controller: datasets action: siloview
+
+
+GET: Obtain a list of datasets in a silo
+Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ Accept:text/html
+ Returns the ids of each dataset in the silo, along with a form for changing the embargo information and deleting the dataset. A form for dataset creation is also available.
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded list of dataset ids in that silo along with the embargo information for each dataset
+ The file datasetsInSiloInformation.txt contains an example of the data returned (data_returned)
+ Accept:*/*, default
+ Returns text/HTML listing the ids of each dataset, along with a form for changing the embargo information and deleting the dataset. A form for dataset creation is also available.
+
+
+POST: Create new dataset
+Parameters
+
+
+
+
+ | id | {id to create} |
| embargoed | {true|false} (optional). If the parameter is not supplied, a default value of true will be used. |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
| title | {(Optional)} |
Returns
+
+
+
+ 409 if dataset already exists
+ 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
+ + 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
Accept: text/html
+ 302 to splash page for newly created dataset
+ Accept: text/plain, application/json
+ 201 created
+ Accept: */*, default
+ Returns text/plain, 201 created
+
+
+
+
+PUT, DELETE: NOOP
+
+
+
+
+/{silo name}/datasets/{id}
+
+ API call to obtain information about the dataset, create a dataset, modify the datasets embargo information, post files to the dataset and delete the dataset. All of this is performed on the latest version of the dataset.
+Controller: datasets action: datasetview
+
+
+GET: Obtain information about the dataset
+Returns
+
+
+404 if dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ Accept: text/html
+ returns HTML splash page for dataset id. The page contains the following:
+
+ -
+
- Readme text +
- List of files / folders at the top level +
- Dataset's embargo state +
- Manifest data +
- If authenticated and authorized user:
+-
+
- View options: Choice to view page as anonymous user or as editor +
- Form to modify manifest +
- Form to upload file +
- List of dataset unpack endpoints, to unpack file to new dataset +
+
Accept: application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Dataset's embargo information data_returned["embargos"] +
- If user is authenticated and authorized (editor = true) / anonymous (editor = false) - data_returned["editor"] +
- List of zipfiles - data_returned["zipfiles"] +
- If user is authenticated and authorized, the view chosen by the user - data_returned["view"] +
- Manifest data in two forms - data_returned["manifest"] and data_returned["manifest_pretty"] +
- Hash dict of files / folders at the top level - data_returned["parts"][file_or_directory_name"]
+ If it is a file, the file stat information is also available. See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The file datasetInformation.txt contains an example of the data returned (data_returned)
+ Accept: application/rdf+xml, text/xml
+ returns dataset's RDF manifest as RDF/XML
+ Accept: text/rdf+n3
+ returns dataset's RDF manifest as N3
+ Accept: application/x-turtle
+ Returns dataset's RDF manifest as Turtle
+ Accept: text/rdf+ntriples, text/rdf+nt
+ returns dataset's RDF manifest as ntriples
+ Accept: */*, default
+ returns text/HTML of splash page for dataset id, as described above
+
+
+POST: Create new dataset. Dataset id doesn't exist. (As POST /{silo}/datasets id=...)
+Parameters
+
+
+
+
+ | embargoed | {true|false} (optional). If the parameter is not supplied, a default value of true will be used. |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
| title | {(Optional)} |
Returns
+
+
+
+ 401 If not a valid user
+ 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
+ + 403 if not authorized
+ 403 if the name of the dataset does not confirm to the naming rule (name can contain only the followin characters 0-9a-zA-Z-_:
+
Accept: text/html
+ 302 to splash page for newly created dataset
+ Accept: text/plain, application/json
+ 201 created
+ Accept: */*, default
+ Returns text/plain, 201 created
+
+
+POST : change embargo information in dataset. On success, version is incremented.
+
+
+ TODO:
+ Redo this bit of code, removing the parameter embargo_change and just using embargoed and embargoed_until
+ Parameters
+
+
+
+
+ | embargo_change | true (used as a convenience parameter for html forms) |
| embargoed | {true|false} |
| embargoed_until | {ISO8601 date} (optional). If embargoed = true and no date has been supplied, a default time delta of 70 years will be used |
Returns
+
+
+ 401 if not a valid user
+ 403 if not authorized
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain, application/json
+ 204 updated
+ Accept: */*, default
+ 204 updated
+
+
+POST: Upload file to root directory. On success, version is incremented.
+Parameters
+
+
+
+
+ | file | Multipart-encoded (HTML) file upload |
| filename | {Optional filename for upload} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 400 if filename contains ..
+ 403 if filename is an existing directory in dataset. Cannot post a file to update a directory with a file.
+ 400 if filename is manifest.rdf and cannot read / parse rdf in manifest
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+ Accept: */*, default
+ Returns text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+
+
+POST: Text upload. Convenience function for HTML to update/create text files. On success, version is incremented.
+Parameters
+
+
+
+
+ | text | {UTF text to store} |
| filename | {desired filename} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 400 if filename contains ..
+ 406 if the parameter filename is missing
+ 403 if filename is an existing directory in dataset. Cannot post a file to update a directory with a file.
+ 406 if the filename is manifet.rdf and cannot parse rdf
+ Accept: text/html
+ 302 to splash page of dataset
+ Accept: text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+ Accept: */*, default
+ Returns text/plain
+ 204 on update, if filename exists.
+ 201 on creation, if filename does not exist
+
+
+DELETE Deletes the dataset id
+
+
+ Be Aware!
+ Delete currently deletes the dataset. This action cannot be undone and your data is lost following this action.
+
+
+ TODO:
+ Delete currently deletes the dataset. This SHOULD NOT happen. On delete, create a new version with just a stub in the manifest saying deleted. Also, this dataset should not be returned in the list of datasets and dataset create should not return a 409.
+ Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if id doesn't exist
+ Accept: */*, default
+ Returns text/plain, 200 on success
+
+
+
+
+PUT NOOP
+
+
+
+
+/{silo name}/datasets/{id}/version{#}
+
+ API call to obtain information about a particular version of the dataset
+Controller: datasets action: datasetview_vnum
+
+
+
+
+GET: Obtain information about a particular version of the dataset
+Returns
+
+
+404 if dataset is not available
+ 404 if version number # of dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ Accept: text/html
+ returns HTML splash page for dataset id. The page contains the following:
+
+ -
+
- Readme text +
- List of files / folders at the top level +
- Dataset's embargo state +
- Manifest data +
Accept: application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Dataset's embargo information data_returned["embargos"] +
- If user is authenticated and authorized (editor = true) / anonymous (editor = false) - data_returned["editor"] +
- If user is authenticated and authorized, the view chosen by the user - data_returned["view"]
(Note : this will always return empty as there is no edit possible for previous versions of the dataset)
+ - Manifest data - data_returned["manifest_pretty"] +
- Hash dict of files / folders at the top level - data_returned["parts"][file_or_directory_name"]
+ If it is a file, the file stat information is also available. See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The files
+ datasetInformation-version0.txt and
+ datasetInformation-version1.txt
+ contain an example of the data returned (data_returned)
+
+ Accept: application/rdf+xml, text/xml
+ returns dataset's RDF manifest as RDF/XML
+ Accept: text/rdf+n3
+ returns dataset's RDF manifest as N3
+ Accept: application/x-turtle
+ Returns dataset's RDF manifest as Turtle
+ Accept: text/rdf+ntriples, text/rdf+nt
+ returns dataset's RDF manifest as ntriples
+ Accept: */*, default
+ returns text/HTML of splash page for dataset id, as described above
+
+
+
+
+/{silo name}/datasets/{id}/{subpath}
+
+ API call to view files / contents of a folder and add, update or delete a file. All of these actions are performed on the latest version of the dataset. +
+Controller: datasets action: itemview
+
+
+GET: view the contents of subpath (subpath could point to a file or a folder)
+Returns
+
+
+404 if dataset is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ 404 if subpath is not available
+ subpath is a file
+
+
+ Accept: */*, default
+ The file is served
+ subpath is a directory
+
+
+ Accept: text/html
+ HTML page listing the files within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Hash dict of files / folders at subpath (just that level) - data_returned["parts"]["file_or_directory_name"]
+ If it is a file, the file stat information is also available. + See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The file
+ datasetSubdirInformation.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ HTML page listing the files within the given subpath and readme_text
+
+
+PUT: used to add content to a file.
+ If the subpath points to manifest.rdf, the content is munged with exisitng metadata.
+ If the subpath does not exist, a file is created in the same name as the filename in path including all the intermediate directories in the subpath (using os.makedirs) and the contents are added to that file.
+ On success, version is incremented.
+
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 403 if subpath points to a directory - cannot put content onto an existing directory
+ 400 if subpath contains ..
+ Accept: text/html
+ 302 to the subpath, listing the files within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 204 Updated, if subpath did exist
+ 201 created, if subpath did not exist
+ Accept: */*, default
+ Return text/plain. 201 on creation and 204 on update.
+
+
+POST Upload a file within the subpath
+ If the subpath + filename parameter points to manifest.rdf, the content is munged with exisitng metadata.
+ If the subpath + filename parameter does not exist, the file is added as filename into subpath. The intermediate directories in the subpath (using os.makedirs) are created if they do not exist.
+ On success, version is incremented.
+
Parameters
+
+
+
+
+ | file | Multipart-encoded (HTML) file upload |
| filename | {Optional filename for upload}. + When provided, it is only used if subpath points to an existing directory. |
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 400 if subpath contains ..
+ 403 if subpath + filename points to an existing directory
+ Accept: text/html
+ 302 to the subpath, listing the file filename within the given subpath and readme_text
+ Accept: text/plain, application/json
+ 204 Updated, if subpath did exist
+ 201 created, if subpath did not exist
+ Accept: */*, default
+ Returns text/plain. 201 on creation and 204 on update.
+
+
+
+
+DELETE: deletes files or directories within the dataset. It also performs recursive deletes (directories with sub-directories within them).
+ On success, version is incremented.
+
Returns
+
+
+401 if not authenticated
+ 403 if not authorized
+ 403 if subpath is manifest.rdf
+ Accept: */*, default
+ Returns text/plain. 200 OK on successful completion.
+
+
+
+
+/{silo name}/datasets/{id}[/{subpath}]/version{#}
+
+ API call to obtain a file or view the contents of a folder, for a particular version of the dataset
+Controller: datasets action: itemview
+
+
+GET: Obtain files or view the contents of a directory for a particular version of the dataset.
+Returns
+
+
+404 if dataset, subpath or version number (#) is not available
+ 401 if not authenticated and dataset is under embargo
+ 403 if not authorized and dataset is under embargo
+ subpath is a file
+
+
+ Accept: */*, default
+ The file is served
+ subpath is a directory
+
+
+ Accept: text/html
+ HTML page listing the files within the given subpath and readme_text (pertaining to that version)
+
+
+ TODO:
+ The html display is not showing the files. Fix bug!
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded hash/dict. The keys map to the following :
+
+ -
+
- Readme text - data_returned["readme_text"] +
- Hash dict of files / folders at subpath (just that level) - data_returned["parts"]["file_or_directory_name"]
+ If it is a file, the file stat information is also available. + See http://docs.python.org/library/os.html#os.stat for more information.
+ If it is a directory, the dictionary value is empty as there is no stat information
+
The files
+ datasetSubdirInformation-version3.txt and
+ datasetSubdirInformation-version1.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ HTML page listing the files within the given subpath and readme_text
+
+
+
+
diff --git a/rdfdatabank/templates/datasetview.html b/rdfdatabank/templates/datasetview.html
new file mode 100644
index 0000000..d5b94b5
--- /dev/null
+++ b/rdfdatabank/templates/datasetview.html
@@ -0,0 +1,212 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+
+ POST, PUT, DELETE: NOOP
+Data package ${c.id}
+% if 'title' in c.metadata and c.metadata['title'][0]: +${c.metadata['title'][0]}
+% endif +% if c.version: +Version ${c.version}
+% elif c.versions: +Version ${c.versions[-1]}
+% endif + +% if c.editor: +
+
+% endif
+
+
+Edit options
+ + + +-
+
-
+
View state information
+ -
+
Update access policy
+ -
+
Add metadata
+ -
+
Upload file
+ -
+
Delete data package
+ % if c.zipfiles:
+ -
+
Unpack zip files
+ % endif
+
+% if c.version and c.versions and c.version == c.versions[-1]:
+
+
+You are currently viewing the latest version (${c.version}) of the data package
+% elif c.version: +You are currently viewing version ${c.version} of the data package
+% elif c.versions: +You are currently viewing the latest version (${c.versions[-1]}) of the data package
+% else: +You are currently viewing the latest version of th data package
+% endif + +% if c.versions: +View other versions:
+% endif +
+
+
+% if c.embargos:
+
diff --git a/rdfdatabank/templates/delete_item.html b/rdfdatabank/templates/delete_item.html
index 3c1a694..c8cd06a 100644
--- a/rdfdatabank/templates/delete_item.html
+++ b/rdfdatabank/templates/delete_item.html
@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/doiview.html b/rdfdatabank/templates/doiview.html
new file mode 100644
index 0000000..b5486cf
--- /dev/null
+++ b/rdfdatabank/templates/doiview.html
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Access Information
+
+% if c.embargos and c.current in c.embargos and c.embargos[c.current]:
+<%
+from rdfdatabank.lib.utils import formatDate
+c.emb = c.embargos[c.current]
+dt_human = c.emb[1]
+if dt_human and dt_human.strip():
+ dt_human = formatDate(dt_human)
+%>
+ % if c.emb[0] == True or c.emb[0] == 1 or (isinstance(c.emb[0], basestring) and c.emb[0].strip().lower() in ['true', '1']):
+ % if (isinstance(c.emb[1], basestring) and c.emb[1].strip()):
+ Data package is embargoed until ${dt_human}. Only the metadata is openly accessible.
+ % else:
+ Data package is embargoed indefinitely. Only the metadata is openly accessible.
+ % endif
+ % else:
+ Data package is openly accessible
+ % endif
+% else:
+ Data package is openly accessible
+% endif
+% endif
+
+
+
+
+% if c.show_files:
+
+
+
+% if c.editor:
+ Data package contents
+
+ % if c.editor:
+ <%include file="/part_list.html"/>
+ % else:
+ <%include file="/part_list_display.html"/>
+ % endif
+
+% endif
+
+
+% if c.readme_text:
+README text
+
+<%include file="/readme_section.html"/>
+
+% endif
+
+
+Metadata
+
+<%include file="/rdf_manifest.html"/>
+
+
+
+ % if c.view == 'editor':
+
+% endif
+
+-
+
+
+
+
+
+
+
+ % if c.zipfiles:
+
+ % endif
+ % endif
+
DOI Information for ${c.silo_name}/${c.id}/version${c.version}
+% if c.heading: +${c.heading}
+%endif +
+% if c.message:
+
+
+% if c.dois:
+ ${c.message}
+% endif +% if c.resp_status: +Response code from Datacite: ${c.resp_status}
+% endif +% if c.resp_reason: +Response message from Datacite: ${c.resp_reason}
+% endif +DOIs available for this data package
+-
+ % for v, d in c.dois.iteritems():
+
- Verison ${v}: ${d} + % endfor +
DOI: ${c.version_doi}
+% endif + +% if c.editor: + <%include file="/create_doi.html"/> +% endif + +%if c.metadata: +Metadata associated with the DOI
+${c.metadata}
+% endif
+
diff --git a/rdfdatabank/templates/embargo_form.html b/rdfdatabank/templates/embargo_form.html
index acd9982..a764b60 100644
--- a/rdfdatabank/templates/embargo_form.html
+++ b/rdfdatabank/templates/embargo_form.html
@@ -1,17 +1,46 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
+
diff --git a/rdfdatabank/templates/error.html b/rdfdatabank/templates/error.html
new file mode 100644
index 0000000..1fab39c
--- /dev/null
+++ b/rdfdatabank/templates/error.html
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+
+
+Oops!
+
+
+${c.code}
+
+
diff --git a/rdfdatabank/templates/file_upload.html b/rdfdatabank/templates/file_upload.html
index 017f7be..0e34ccc 100644
--- a/rdfdatabank/templates/file_upload.html
+++ b/rdfdatabank/templates/file_upload.html
@@ -1,9 +1,10 @@
-# -*- coding: utf-8 -*-
-${c.status}
+${c.message}
+Add File to ${c.id}
--
- +# -*- coding: utf-8 -*- + diff --git a/rdfdatabank/templates/files_unpack.html b/rdfdatabank/templates/files_unpack.html new file mode 100644 index 0000000..87d4b45 --- /dev/null +++ b/rdfdatabank/templates/files_unpack.html @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +% if c.zipfile: + +%endif diff --git a/rdfdatabank/templates/footer.html b/rdfdatabank/templates/footer.html new file mode 100644 index 0000000..4f00d3c --- /dev/null +++ b/rdfdatabank/templates/footer.html @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- + +
+
diff --git a/rdfdatabank/templates/header.html b/rdfdatabank/templates/header.html
new file mode 100644
index 0000000..79bcaa8
--- /dev/null
+++ b/rdfdatabank/templates/header.html
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+<%
+from pylons import app_globals as ag
+%>
+ Copyright resides with the noted authors/creators of the works held here, unless otherwise noted.
+ +DataBank + %if ag.api_version: + ${ag.api_version} + % endif +
+<%include file="/search_form.html"/> + diff --git a/rdfdatabank/templates/home.html b/rdfdatabank/templates/home.html new file mode 100644 index 0000000..35d3ff1 --- /dev/null +++ b/rdfdatabank/templates/home.html @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +Welcome to DataBank
+
+
+
+Store, archive, publish and access your data from the web using Databank.
+
+
+
+
+
+DataBank is a repository that will keep data safe in the long term.
+You can use Databank to store, retrieve and publish data at any time, from anywhere on the web. You can accomplish these tasks using
+-
+
- The simple web interface of a hosted instance of Databank; as in this website you are viewing +
- Form another service, using the Databank API +
- Run your own instance of Databank +
+
+
+Using the web interface
+To get started, read this document on the Databank wiki
+You should be able to browse and search for all of the bibliographic information in this instance of Databank and where allowed, view the data packages.
+A demo instance of databank is available at http://databank-vm1.oerc.ox.ac.uk/ where you will be to create data pacakges, upload files and manage users.
+
+
+
+Using the Databank API
+The API provides a restful web interface to all of Databank's features. Documentation on the API
+ +
+
+
diff --git a/rdfdatabank/templates/item_file_upload.html b/rdfdatabank/templates/item_file_upload.html
new file mode 100644
index 0000000..7439b61
--- /dev/null
+++ b/rdfdatabank/templates/item_file_upload.html
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/items_api.html b/rdfdatabank/templates/items_api.html
new file mode 100644
index 0000000..7505239
--- /dev/null
+++ b/rdfdatabank/templates/items_api.html
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+Running your own instance of Databank
+Databank is written in Python. The Databank code is licensed under MIT and can be checked out from https://github.com/dataflow/RDFDatabank
+For instructions on installing Databank, follow this document
+ +
+
diff --git a/rdfdatabank/templates/itemview.html b/rdfdatabank/templates/itemview.html
index a818026..a26ffa8 100644
--- a/rdfdatabank/templates/itemview.html
+++ b/rdfdatabank/templates/itemview.html
@@ -1,36 +1,118 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
-
- Items
+Sections
+-
+
+
- /{silo name}/items/{id} +
- /{silo name}/items/{id}/{path} +
- /{silo name}/items/{id}/{path}/{subpath} +
+
+
+
+/{silo name}/items/{id}
+
+ API call to obtain a list of unpack end-points, read the contents of a zip-file (without unpacking) and unpack a zip file into a new / existing dataset
+Controller: items action: datasetview
+
+
+GET
+Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if dataset id does not exist
+ Accept: text/html
+ Returns an HTML page with list of zipfiles in {id} with form to unpack the zip file
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded list of zipfiles in dataset
+ The file
+ itemInformationForDataset.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ Returns text/html - an HTML page with list of zipfiles in {id} with form to unpack the zip file
+
+
+POST Unpack file. Create new dataset/update existing dataset with contents of upacked file
+Parameters
+
+
+
+
+ | filename | {name of file to be unpacked, including the path} |
| Id | {(Optional)}. if Id is not supplied, the default dataset id for the new dataset will be {dataset_id}-{file_name} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if file to unpack (as given by filename) was not found
+ 415 if file is not of type application/zip
+ 400 if there was an error reading the zipfile (BadZipFile)
+ Accept:text/html
+ 302 to splash page for newly created dataset / updated dataset
+ Accept: text/plain, application/json
+ 201/204 on creation/update of dataset
+ Accept: */*, default
+ Returns text/plain - 201/204 on creation/update of dataset
+
+
+
+
+PUT, DELETE NOOP
+
+
+
+
+/{silo name}/items/{id}/{path}
+
+ API call to read the contents of a zip-file (without having to unpack) and unpack a zip file into a new / existing dataset
+Controller: items action: itemview
+
+
+GET
+Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if path does not exist, or if path does not point to a file
+ 415 if file is not of type application/zip
+ 400 if there was an error reading the zipfile (BadZipFile)
+ Accept: text/html
+ Returns a HTML page listing the contents of the zipfile
+ Accept: text/plain, application/json
+ 200 OK
+ Returns a JSON-encoded hash dict listing the contents of the ziipfile (files / directories in archive), along with the size of the uncompressed member and and the date of last modification of the member as a tuple of 6 values (Year, Month, Day of month, Hours, Minutes, Seconds).
+ The file
+ itemInformationForZipFileinDataset.txt
+ contains an example of the data returned (data_returned)
+
+ Accept: */*, default
+ Returns text/html - an HTML page listing the contents of the zipfile
+
+
+POST Unpack file. Create new dataset/update existing dataset with contents of upacked file
+Parameters
+
+
+
+
+ | filename | {name of file to be unpacked, including the path} |
| Id | {(Optional)}. if Id is not supplied, the default dataset id for the new dataset will be {dataset_id}-{file_name} |
Returns
+
+
+401 if not a valid user
+ 403 if not authorized
+ 404 if path does not exist, or if path does not point to a file
+ 415 if file is not of type application/zip
+ 400 if there was an error reading the zipfile (BadZipFile)
+ Accept:text/html
+ 302 to splash page for newly created dataset / updated dataset
+ Accept: text/plain, application/json
+ 201/204 on creation/update of dataset
+ Accept: */*, default
+ Returns text/plain - 201/204 on creation/update of dataset
+
+
+
+
+PUT, DELETE NOOP
+
+
+
+
+/{silo name}/items/{id}/{path}/{subpath}
+
+ API call to retreive a file from the zip file
+Controller: items action: subitemview
+
+
+
+TODO:
+ This is yet to be implemented
+View as Editor , or User -% endif -% if c.readme_text: -<%include file="/readme_section.html"/> -% endif -<%include file="/part_list.html"/> -% if c.item and c.view == "editor": -
-
-<%include file="/file_upload.html"/>
-% endif
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Detailed view (As Editor) -
-
-
- Item's JSON state (Accept: application/json): -
- ${repr(c.item)} -
- Item's Embargo state -
-
-<%
-c.current = c.id
-%>
-
<%include file="/embargo_form.html"/>
-Embargo state: True - only those logged in and with edit rights can see item. False - Anyone can GET the item and it's files.
-Embargo date: Aim is for ISO8601 dates to provide embargo trigger events. Currently unused, unvalidated and unparsed.
- - Item's RDF Manifest (Accept: most RDF mimetypes): -
${c.item.rdf_to_string(format="pretty-xml")}
-- Change RDF Manifest: -
- <%include file="/rdf_manifest_form.html"/> -
Data package ${c.id}
+% if c.version: +Version ${c.version}
+% elif c.versions: +Version ${c.versions[-1]}
+% endif + + +% if c.editor: +
+
+% endif
+
+
+Edit options
+ +-
+
-
+ Upload file
+
+% if c.version and c.versions and c.version == c.versions[-1]:
+
+
+You are currently viewing the latest version (${c.versions[-1]}) of the data package
+% elif c.version: +You are currently viewing version ${c.version} of the data package
+% elif c.versions: +You are currently viewing the latest version (${c.versions[-1]}) of the data package
+% else: +You are currently viewing the latest version of th data package
+% endif + +% if c.versions: +View other versions:
+% endif +
+
+% if c.parts:
+
+
+
+% if c.readme_text:
+Data package contents within ${c.path}
+
+ % if c.show_files:
+ % if c.editor:
+ <%include file="/part_list.html"/>
+ % else:
+ <%include file="/part_list_display.html"/>
+ % endif
+ % else:
+
+% else:
+ You do not have permission to view these files
+ % endif +There are no files or folders in this path
+% endif +README text
+
+<%include file="/readme_section.html"/>
+
+% endif
+
+
+% if c.editor and c.view == 'editor':
+
+
+% endif
+
diff --git a/rdfdatabank/templates/keywords.html b/rdfdatabank/templates/keywords.html
new file mode 100644
index 0000000..f13a756
--- /dev/null
+++ b/rdfdatabank/templates/keywords.html
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ List of keywords in the site goes here...
diff --git a/rdfdatabank/templates/list_of_archives.html b/rdfdatabank/templates/list_of_archives.html deleted file mode 100644 index d152d2f..0000000 --- a/rdfdatabank/templates/list_of_archives.html +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> - List of Archives:
-
-% endif
diff --git a/rdfdatabank/templates/list_of_datasets.html b/rdfdatabank/templates/list_of_datasets.html
new file mode 100644
index 0000000..41c388e
--- /dev/null
+++ b/rdfdatabank/templates/list_of_datasets.html
@@ -0,0 +1,151 @@
+# -*- coding: utf-8 -*-
+##=============================================================================
+## Pagination fucntion
+<%def name="pagination()">
+ % if len(c.permissible_offsets) > 0:
+
+ <%
+ jump = c.rows*10
+ lowerJump = c.start-jump
+ if lowerJump < 0:
+ lowerJump = 0;
+ higherJump = c.start+jump
+ if higherJump > c.lastPage:
+ higherJump = c.lastPage
+ %>
+
+ ## Goto to first page
+ % if c.start == 0:
+
+ % else:
+
+ % endif
+«
+
+ % if c.start != 0:
+…
+ % endif
+ <%! import math %>
+ <% pagcount = 0.0 %>
+ % for offset in c.permissible_offsets:
+ % if c.start == offset:
+
+ % else:
+
+ % endif
+ <%
+ offset_start = offset+1
+ offset_end = offset+c.rows
+ if offset_end > c.numFound:
+ offset_end = c.numFound
+ pagcount = float(offset_end) / float(c.rows)
+ pagcount= math.ceil(pagcount)
+ pagcount= int(pagcount)
+ %>
+${h.link_to(pagcount, "%s?start=%d&rows=%d"%(c.silo_name, offset, c.rows))}
+
+ % endfor
+ % if c.start != c.lastPage:
+…
+ % endif
+ ## Goto to last page
+ % if c.start == c.lastPage:
+
+ % else:
+
+ % endif
+»
+
+
+
+ % endif
+## end pagination()
+
+##=============================================================================
+
+% if c.silo_name:
+<%
+n = len(c.items)
+%>
+% if n > 0:
+
+## Pagination and sort options
+% if c.numFound and c.numFound > 0:
+
+ ${pagination()}
+
+% endif
+
+## Number of records, current span of records and items per page
+
+
+${ c.numFound} records found.
+
+% if c.numFound > 0:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
+% endif
+
+% endif
+
+
+${ c.numFound} records found.
+
+% if c.numFound > 0:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
+% endif
+
+% endif
+| + | +% if c.embargos and item in c.embargos and c.embargos[item]: +<% +from rdfdatabank.lib.utils import formatDate +c.emb = c.embargos[item] +dt_human = c.emb[1] +if dt_human and dt_human.strip(): + dt_human = formatDate(dt_human) +%> + % if c.emb[0] == True or c.emb[0] == 1 or (isinstance(c.emb[0], basestring) and c.emb[0].strip().lower() in ['true', '1']): + % if (isinstance(c.emb[1], basestring) and c.emb[1].strip()): + Data package is embargoed until ${dt_human} + % else: + Data package is embargoed indefinitely + % endif + % else: + Data package is openly accessible + % endif +% else: + Data package is openly accessible +% endif + | +
+ ${pagination()}
+
+% endif
+
+## Number of records, current record start and end and items per page
+%if c.numFound and c.numFound > 0:
+
+
+% endif
+
+% endif
+% endif
+
diff --git a/rdfdatabank/templates/list_of_silos.html b/rdfdatabank/templates/list_of_silos.html
new file mode 100644
index 0000000..738d52a
--- /dev/null
+++ b/rdfdatabank/templates/list_of_silos.html
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+
+${ c.numFound} records found.
+
+% if c.numFound > 0:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
+% endif
+
+% endif
+List of Silos
+% if c.silo_infos and n > 0: +Number of silos: ${n}
+
+
+
+
+% else:
+ | Silo title | +Number of data packages in silo | +Date silo last modified | +
|---|---|---|
| ${c.silo_infos[silo][0]} | +${c.silo_infos[silo][1]} | +${c.silo_infos[silo][2]} | +
Number of silos: ${n}
+% endif diff --git a/rdfdatabank/templates/list_of_zipfile_archives.html b/rdfdatabank/templates/list_of_zipfile_archives.html deleted file mode 100644 index c1dc151..0000000 --- a/rdfdatabank/templates/list_of_zipfile_archives.html +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> - List of package upload endpoints:
-
-% for silo in c.silos:
--
-<%
-c.silo_name = silo
-%>
-
<%include file="/upload_package.html"/>
-
-% endfor
-
-% endif
diff --git a/rdfdatabank/templates/list_of_zipfiles.html b/rdfdatabank/templates/list_of_zipfiles.html
new file mode 100644
index 0000000..2aa7be4
--- /dev/null
+++ b/rdfdatabank/templates/list_of_zipfiles.html
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ List of zipped packages
+
+% if c.silo_name and c.id and c.zipfiles:
+ List of package unpack endpoints
+
+<% c.zipFileCount = 0 %>
+% for zf in c.zipfiles:
+<%
+c.zipFileCount += 1
+c.zipfile = zf
+c.newid = c.zipfiles[zf]
+%>
+- ${zf} :
+View |
+Download
+<%include file="/files_unpack.html"/>
+
+% endfor
+
+% endif
diff --git a/rdfdatabank/templates/login.html b/rdfdatabank/templates/login.html
new file mode 100644
index 0000000..328dccd
--- /dev/null
+++ b/rdfdatabank/templates/login.html
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+<%def name="head_tags()">
+ Login to Databank
+
+
+<%def name="flash()">
+ % if session.has_key('login_flash'):
+
+ ${session.get('login_flash') | n}
+
<%include file="/upload_package.html"/>
-+
${session.get('login_flash') | n}
+
+ <% + del session['login_flash'] + session.save() + %> + % endif + + +<%inherit file="/base.html" /> +
Login
+${self.flash()} + +<% + user_logged_in = request.environ.get("repoze.who.identity") + if user_logged_in: + c.user_logged_in_name = user_logged_in['repoze.who.userid'] +%> +% if user_logged_in: + % if c.user_logged_in_name: +You are already logged in as ${c.user_logged_in_name}. +Please logout before logging in again.
You are already logged in. +Please logout before logging in again.
+
+ +% endif diff --git a/rdfdatabank/templates/logout.html b/rdfdatabank/templates/logout.html new file mode 100644 index 0000000..7b71542 --- /dev/null +++ b/rdfdatabank/templates/logout.html @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +<%def name="head_tags()"> +Loggin out
++% if c.message: +
${c.message | n}
+% endif
+You have successfully logged out.
+To login again click here
++ diff --git a/rdfdatabank/templates/package_form_upload.html b/rdfdatabank/templates/package_form_upload.html deleted file mode 100644 index f1de8f4..0000000 --- a/rdfdatabank/templates/package_form_upload.html +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -
Package upload
-<%include file="/upload_package.html"/>
diff --git a/rdfdatabank/templates/part_list.html b/rdfdatabank/templates/part_list.html index 16971a7..63b5dce 100644 --- a/rdfdatabank/templates/part_list.html +++ b/rdfdatabank/templates/part_list.html @@ -1,17 +1,45 @@ -% if c.parts: --
-<%
-if c.path:
- subpath = "/%s" % c.path
-else:
- subpath = ""
-%>
-% for part in c.parts:
-% if c.parts[part]:
-
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} - (remove) -% else: -
- ${part} - (remove) -% endif -% endfor -
-
+% for part in c.parts:
+% if not part.startswith('3=') and not part.startswith('4='):
+<%
+p1 = "_".join(c.silo_name.split("."))
+p2 = "_".join(c.id.split(":"))
+p3 = "_".join( "_".join(part.split(".")).split(" ") )
+lid = "%s_%s_%s"%(p1,p2, p3)
+if type(c.parts).__name__ == 'dict' and c.parts[part]:
+ sz = h.bytes_to_english(c.parts[part].st_size)
+ ext = "(%s)"%sz
+else:
+ ext = ""
+%>
+
- ${part} ${ext}
+
+% if part.endswith('.zip'):
+ 
+% endif
+% if c.latest:
+
+
+
+% endif
+
+% endif
+% endfor
+
+
-
+ <%
+ if c.path:
+ subpath = "/%s" % c.path
+ else:
+ subpath = ""
+ if c.version:
+ urlext = "?version=%s" % c.version
+ else:
+ urlext = ""
+ %>
+
+ % for part in c.parts:
+<%
+if type(c.parts).__name__ == 'dict' and c.parts[part]:
+ sz = h.bytes_to_english(c.parts[part].st_size)
+ ext = "(%s)"%sz
+else:
+ ext = ""
+%>
+ % if not part.startswith('3=') and not part.startswith('4='):
+
- ${part} ${ext}
+
+% if part.endswith('.zip'):
+
+% endif
+
+ % endif
+ % endfor
+
| Title |
+ % for v in c.metadata['title']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
|---|---|
| Identifier(s) |
+ % for v in c.metadata['identifier']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Description |
+ % for v in c.metadata['description']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Creator |
+ % for v in c.metadata['creator']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Subject |
+ % for v in c.metadata['subject']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Abstract |
+ % for v in c.metadata['abstract']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Created |
+ % for v in c.metadata['created']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Has version |
+ % for v in c.metadata['hasVersion']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Is Version of |
+ % for v in c.metadata['isVersionOf']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| License |
+ % for v in c.metadata['license']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Mediator |
+ % for v in c.metadata['mediator']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Modified |
+ % for v in c.metadata['modified']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Publisher |
+ % for v in c.metadata['publisher']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Rights |
+ % for v in c.metadata['rights']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Is embargoed |
+ % for v in c.metadata['isEmbargoed']:
+ <%
+ if str(v).lower() in ['true', '1']:
+ v = 'Yes'
+ else:
+ v = 'No'
+ %>
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Embargoed Until |
+ % for v in c.metadata['embargoedUntil']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Current version |
+ % for v in c.metadata['currentVersion']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| DOI |
+ % for v in c.metadata['doi']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
| Aggregates |
+
|
-
- +# -*- coding: utf-8 -*- +
+
+
diff --git a/rdfdatabank/templates/readme_section.html b/rdfdatabank/templates/readme_section.html
index b32dd78..63d299a 100644
--- a/rdfdatabank/templates/readme_section.html
+++ b/rdfdatabank/templates/readme_section.html
@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
-
-
+# -*- coding: utf-8 -*-
+
-${c.readme_text}
-
-
+
diff --git a/rdfdatabank/templates/register_new_user.html b/rdfdatabank/templates/register_new_user.html
new file mode 100644
index 0000000..f6ae769
--- /dev/null
+++ b/rdfdatabank/templates/register_new_user.html
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/search.html b/rdfdatabank/templates/search.html
new file mode 100644
index 0000000..5d7567d
--- /dev/null
+++ b/rdfdatabank/templates/search.html
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+
+<%def name="head_tags()">
+
+${c.readme_text}
+
+
+<%include file="/search_response_display.html"/>
+
+
+
+<% count = 0 %>
+
+
+
+
+
+
+
+
+
diff --git a/rdfdatabank/templates/search_advanced.html b/rdfdatabank/templates/search_advanced.html
new file mode 100644
index 0000000..80447ea
--- /dev/null
+++ b/rdfdatabank/templates/search_advanced.html
@@ -0,0 +1,153 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+
+<%def name="head_tags()">
+
+% if c.returned_facets:
+
+% endif
+Filter results
+% for facet in c.returned_facets:
+<% count = count + 1 %>
+% if c.returned_facets[facet] and len(c.returned_facets[facet]) > 1:
+
+
+
+% endif
+% endfor
+
+
+-
+% for result,value in c.returned_facets[facet]:
+
- +<% +from urllib import quote +try: + res = quote(result) +except: + res = result +if len(result) > 40: + res_label = result[:40] + '...' +else: + res_label = result +%> +${res_label} +(${value}) +% endfor +
+<% count = 0 %>
+
+
+
+
+
+
+
+
diff --git a/rdfdatabank/templates/search_form.html b/rdfdatabank/templates/search_form.html
new file mode 100644
index 0000000..8be3e3d
--- /dev/null
+++ b/rdfdatabank/templates/search_form.html
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+% if c.returned_facets:
+% for facet in c.returned_facets:
+<% count = count + 1 %>
+% if c.returned_facets[facet] and len(c.returned_facets[facet]) > 1:
+
+% endif
+
+
+
+% endif
+% endfor
+
+
+-
+% for result,value in c.returned_facets[facet]:
+
- +<% +from urllib import quote +try: + res = quote(result) +except: + res = result +if len(result) > 40: + res_label = result[:40] + '...' +else: + res_label = result +%> +${res_label} +(${value}) +% endfor +
+
+
diff --git a/rdfdatabank/templates/search_response_display.html b/rdfdatabank/templates/search_response_display.html
new file mode 100644
index 0000000..369cc3b
--- /dev/null
+++ b/rdfdatabank/templates/search_response_display.html
@@ -0,0 +1,195 @@
+<%namespace name="options" file="/search_response_options.html" />
+##=============================================================================
+## Current search options
+${options.currentsearch()}
+##=============================================================================
+## Pagination and sort options
+% if c.numFound and c.numFound > 0:
+
+ ${options.pagination()}
+ ${options.sortoptions()}
+
+% endif
+##=============================================================================
+## Number of records, current span of records and items per page
+
+
+
+##=============================================================================
+##Link to these results
+% if c.docs and c.add_facet:
+
+% endif
+##=============================================================================
+##Search results
+% if c.docs:
+
+${ c.numFound} records found.
+
+
+% if c.numFound > 0:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
+% endif
+
+% endif
+
+% if c.numFound > 0:
+${options.numresultspp("itemsppt")}
+% endif
+
+
This page'
CSV
JSON
+<% cnt = 0 %>
+% for doc_index in xrange(len(c.docs)):
+<%
+cnt += 1
+isSilo = False
+if 'type' in c.docs[doc_index] and c.docs[doc_index]['type']:
+ if not isinstance(c.docs[doc_index]['type'], list):
+ c.docs[doc_index]['type'] = [c.docs[doc_index]['type']]
+ for typ in c.docs[doc_index]['type']:
+ if typ.lower() == 'silo':
+ isSilo = True
+%>
+
+% if isSilo == True:
+
+
+% if isSilo == False:
+
+% endfor
+
+
+% endif
+##=============================================================================
+## Pagination and sort options
+%if c.numFound and c.numFound > 0:
+
+% if isSilo == True:
+
+% else:
+
+
+% endif
+% if 'title' in c.docs[doc_index] and c.docs[doc_index]['title'] and c.docs[doc_index]['title'][0]:
+${c.docs[doc_index]['title'][0]}
+% else:
+${c.docs[doc_index]['id']}
+% endif
+
+| Identifier | ${c.docs[doc_index]['id']} |
|---|---|
| Silo | ${c.docs[doc_index]['silo']} |
| ${lbl} | +% if isinstance(c.docs[doc_index][field], list): +% for txt in c.docs[doc_index][field]: +% if isinstance(txt, basestring): +<% +todisplay = txt +if c.truncate and len(txt) > c.truncate: + todisplay = txt[:c.truncate] + ' ...' +%> +% if txt.startswith('http'): +${todisplay |n} +% else: +${ todisplay |n} +% endif +% elif isinstance(txt, int) or isinstance(txt, bool): +${str(txt)} +% else: +${txt |n} +% endif +% endfor +% elif isinstance(c.docs[doc_index][field], basestring): +<% + todisplay = c.docs[doc_index][field] + if c.truncate and len(c.docs[doc_index][field]) > c.truncate: + todisplay = c.docs[doc_index][field][:c.truncate] + ' ...' +%> +% if c.docs[doc_index][field].startswith('http'): +${todisplay |n} +% else: +${ todisplay |n} +% endif +% elif isinstance(c.docs[doc_index][field], int) or isinstance(c.docs[doc_index][field], bool): +${str(c.docs[doc_index][field])} +% else: +${c.docs[doc_index][field] |n} +% endif + + |
| Silo identifier | ${c.docs[doc_index]['silo']} |
| Description | +% if isinstance(c.docs[doc_index]['description'], list): +% for txt in c.docs[doc_index]['description']: +<% +todisplay = txt +if c.truncate and len(txt) > c.truncate: + todisplay = txt[:c.truncate] + ' ...' +%> +${ todisplay |n} +% endfor +% else: +<% +todisplay = c.docs[doc_index]['description'] +if c.truncate and len(todisplay) > c.truncate: + todisplay = todisplay[:c.truncate] + ' ...' +%> +${ todisplay |n} + |
+ ${options.pagination()}
+ ${options.sortoptions()}
+
+% endif
+##=============================================================================
+## Number of records, current record start and end and items per page
+%if c.numFound and c.numFound > 0:
+
+
+
+% endif
+##=============================================================================
+
+
+
diff --git a/rdfdatabank/templates/search_response_options.html b/rdfdatabank/templates/search_response_options.html
new file mode 100644
index 0000000..0ddc157
--- /dev/null
+++ b/rdfdatabank/templates/search_response_options.html
@@ -0,0 +1,409 @@
+##=============================================================================
+<%def name="pagination()">
+ % if len(c.permissible_offsets) > 0:
+
+${ c.numFound} records found.
+
+
+% if c.numFound > 0:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
+% endif
+
+% endif
+
+% if c.numFound > 0:
+${options.numresultspp("itemsppb")}
+% endif
+
+
+ <%
+ jump = c.rows*10
+ lowerJump = c.start-jump
+ if lowerJump < 0:
+ lowerJump = 0;
+ higherJump = c.start+jump
+ if higherJump > c.lastPage:
+ higherJump = c.lastPage
+ %>
+
+
+ ## Goto to first page
+ % if c.start == 0:
+
+ % else:
+
+ % endif
+«
+
+ % if c.start != 0:
+…
+ % endif
+ <%! import math %>
+ <% pagcount = 0.0 %>
+ % for offset in c.permissible_offsets:
+ % if c.start == offset:
+
+ % else:
+
+ % endif
+ <%
+ offset_start = offset+1
+ offset_end = offset+c.rows
+ if offset_end > c.numFound:
+ offset_end = c.numFound
+ %>
+ <% pagcount = float(offset_end) / float(c.rows) %>
+ <% pagcount= math.ceil(pagcount) %>
+ <% pagcount= int(pagcount) %>
+${h.link_to(pagcount, "%s&start=%d&rows=%d&sort=%s"%(c.add_facet, offset, c.rows, c.sort))}
+
+ % endfor
+ % if c.start != c.lastPage:
+…
+ % endif
+ ## Goto to last page
+ % if c.start == c.lastPage:
+
+ % else:
+
+ % endif
+»
+
+
+
+
+ % endif
+## end pagination()
+
+##=============================================================================
+<%def name="sortoptions()">
+% if c.docs and c.add_facet:
+
+Sort by:
+
+% if (c.sort == "score desc"):
+<%
+ relstring = c.add_facet + "&start=%d&sort=score+desc&rows=%d"%(c.start, c.rows)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date 
|
+Silo
+
+% elif (c.sort == "publicationDate desc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+asc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date 
|
+Silo
+
+% elif (c.sort == "publicationDate asc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date 
|
+Silo
+
+% elif (c.sort == "silo desc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+asc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% elif (c.sort == "silo asc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% else:
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows,c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows ,c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% endif
+
+
+% endif
+## end sortoptions()
+
+##=============================================================================
+<%def name="numresultspp(idname)">
+% if c.docs and c.add_facet:
+ |
+Silo
+
+% elif (c.sort == "publicationDate desc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+asc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% elif (c.sort == "publicationDate asc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% elif (c.sort == "silo desc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+asc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% elif (c.sort == "silo asc"):
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows, c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows, c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% else:
+<%
+ relstring = c.add_facet + "&sort=score+desc&rows=%d&start=%d"%(c.rows,c.start)
+ datestring = c.add_facet + "&sort=publicationDate+desc&rows=%d&start=%d"%(c.rows, c.start)
+ titlestring = c.add_facet + "&sort=silo+desc&rows=%d&start=%d"%(c.rows ,c.start)
+%>
+Relevance |
+Date |
+Silo
+
+% endif
+
+
+
+% endif
+
+##=============================================================================
+<%def name="currentsearch()">
+## Current search
+
+Items per page:
+<%
+ twentyfstring = c.add_facet + "&rows=25&sort=%s"%c.sort
+ fiftystring = c.add_facet + "&rows=50&sort=%s"%c.sort
+ hundredstring = c.add_facet + "&rows=100&sort=%s"%c.sort
+%>
+% if (c.rows == 25):
+25
+50
+100
+
+% elif (c.rows == 50):
+25
+50
+100
+
+% elif (c.rows == 100):
+25
+50
+100
+
+% else:
+25
+50
+100
+
+% endif
+
+
+
+
+##=============================================================================
diff --git a/rdfdatabank/templates/searching.html b/rdfdatabank/templates/searching.html
new file mode 100644
index 0000000..03a66e5
--- /dev/null
+++ b/rdfdatabank/templates/searching.html
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Current Search
+ +##----c.q---- +
+
+
+##----c.typ filters (to be displayed only if search is not *:*)----
+% if c.typ and c.typ != 'all' and c.q != "*:*":
+
+% if c.q and c.q != "*:*":
+
+% else:
+
+% endif
+
+Text
${c.q |n}
+
+
+% endif
+
+##----c.chosen_facets----
+% if c.chosen_facets:
+% for facet in c.chosen_facets:
+<%
+currentfacet = []
+if isinstance(c.chosen_facets[facet], list):
+ currentfacet = c.chosen_facets[facet]
+else:
+ currentfacet = [c.chosen_facets[facet]]
+%>
+% for item in currentfacet:
+
+
+
+Search within
+${c.types[c.typ] |n}
+
+
+% endfor
+% endfor
+% endif
+
+
+
+
+${c.field_names[facet]|n}
${ item |n}
+Search interface goes here...
\ No newline at end of file diff --git a/rdfdatabank/templates/silo_admin.html b/rdfdatabank/templates/silo_admin.html index 186e1fb..0b25a9f 100644 --- a/rdfdatabank/templates/silo_admin.html +++ b/rdfdatabank/templates/silo_admin.html @@ -1,14 +1,17 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> - Admin Archives:
-
-% endif
-<%include file="/create_new_silo.html"/>
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Admin Interface - List of Silos
+
+Admin Interface - List of Silos
+% if c.granary_list:
+ Admin Archives:
+
+% endif
+<%include file="/create_new_silo.html"/>
diff --git a/rdfdatabank/templates/silo_metadata.html b/rdfdatabank/templates/silo_metadata.html
new file mode 100644
index 0000000..3b0766b
--- /dev/null
+++ b/rdfdatabank/templates/silo_metadata.html
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+
+ Silo label: ${c.silo}
+% if c.kw:
+ % if 'title' in c.kw and c.kw.get('title', None):
+ Title:${c.kw.get('title')}
+ % endif
+ % if 'description' in c.kw and c.kw.get('description', None):
+ Description:${c.kw.get('description')}
+ % endif
+ % if 'notes' in c.kw and c.kw.get('notes', None):
+ Notes:${c.kw.get('notes')}
+ % endif
+ % if 'disk_allocation' in c.kw and c.kw.get('disk_allocation', None):
+ Disk Allocation (in Kb):${c.kw.get('disk_allocation')}
+ % endif
+ % if ('administrators' in c.kw and c.kw['administrators']) or ('managers' in c.kw and c.kw['managers']) or ('submitters' in c.kw and c.kw['submitters']):
+ Members of the silo
+ % for role in ['administrators', 'managers', 'submitters']:
+ % if role in c.kw and c.kw[role]:
+ <%
+ admins = []
+ admins = [x.strip() for x in c.kw[role].split(",") if x]
+ %>
+ ${role}
+
+ % endif
+ % endfor
+ % elif 'owners' in c.kw:
+ <%
+ owners = []
+ owners = [x.strip() for x in c.kw['owners'].split(",") if x]
+ %>
+ Members of the silo
+
+ % endif
+% endif
+
+
diff --git a/rdfdatabank/templates/silo_user.html b/rdfdatabank/templates/silo_user.html
new file mode 100644
index 0000000..3c9fa4e
--- /dev/null
+++ b/rdfdatabank/templates/silo_user.html
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ User Info - ${c.username}
+
+
+
+
+ User info for ${c.username} in silo ${c.silo}
+% if c.message:
+
Silo label: ${c.silo}
+% if c.kw:
+ % if 'title' in c.kw and c.kw.get('title', None):
+ Title:${c.kw.get('title')}
+ % endif
+ % if 'description' in c.kw and c.kw.get('description', None):
+ Description:${c.kw.get('description')}
+ % endif
+ % if 'notes' in c.kw and c.kw.get('notes', None):
+ Notes:${c.kw.get('notes')}
+ % endif
+ % if 'disk_allocation' in c.kw and c.kw.get('disk_allocation', None):
+ Disk Allocation (in Kb):${c.kw.get('disk_allocation')}
+ % endif
+ % if ('administrators' in c.kw and c.kw['administrators']) or ('managers' in c.kw and c.kw['managers']) or ('submitters' in c.kw and c.kw['submitters']):
+ Members of the silo
+ % for role in ['administrators', 'managers', 'submitters']: + % if role in c.kw and c.kw[role]: + <% + admins = [] + admins = [x.strip() for x in c.kw[role].split(",") if x] + %> +${role}
+ + % endif + % endfor + % elif 'owners' in c.kw: + <% + owners = [] + owners = [x.strip() for x in c.kw['owners'].split(",") if x] + %> +
Members of the silo
+ + % endif +% endif +${c.message}
+% endif + +% if c.user: + +
+
+
+
+
+
+
+% if 'administrator' in c.ident['permissions'] or 'manager' in c.ident['permissions']:
+
+% endif
+
+
+% if c.ident['user'].user_name == c.username:
+
+% endif
+% endif
+
diff --git a/rdfdatabank/templates/silo_users.html b/rdfdatabank/templates/silo_users.html
new file mode 100644
index 0000000..60c0a33
--- /dev/null
+++ b/rdfdatabank/templates/silo_users.html
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Edit options
+-
+
-
+
Update user role
+ -
+ Delete user from silo
+ % if c.ident['user'].user_name == c.username:
+
-
+ Update user details
+ % endif
+
-
+
Edit silo metadata
+ -
+ View users
+
-
+ View silos
+
Users in ${c.silo}
+% if c.message: +${c.message}
+% endif + +
+
+
+
+%if c.users:
+ Edit options
+ +-
+ % for u in c.users:
+ % if 'name' in u and u['name']:
+
- ${u['name']} + % else: +
- ${u['firstname']} ${u['lastname']}
+ % endif
+
+
+
+ % endfor
+
+
diff --git a/rdfdatabank/templates/siloview.html b/rdfdatabank/templates/siloview.html
index 438ba5a..c7388d8 100644
--- a/rdfdatabank/templates/siloview.html
+++ b/rdfdatabank/templates/siloview.html
@@ -1,32 +1,24 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
- Silos
+Obtain a list of all silos visible to your account or a list of datasets in a silo
+Sections
+-
+
- /silos +
- /{silo name} +
+
+
+
+/silos
+
+ Returns a list of silos visible to your account
+Controller: silos action: index
+
+
+GET
+Returns 401 if not a valid user
+Accept: text/html (with auth)
+Returns text/HTML listing the 'silos' your account can see, with links to dataset view
+Accept: text/plain, application/json (with auth)
+Returns a JSON-encoded list of exising silos your account can see.
+The file silos.txt contains an example of the data returned (data_returned)
+Accept: */*, default (with auth)
Returns text/HTML listing the ’silos’ your account can see, with links to dataset view
+
+
+
+
+POST, PUT, DELETE NOOP
+
+
+
+
+/{silo name}
+
+ Returns a list of datasets in the silo
+Controller: silos action: siloview
+
+
+GET
+Returns 401 if not a valid user and 403 if not authorized
+Accept:text/html (with auth)
+Returns text/HTML
+listing the ids of each dataset, along with a form for changing the embargo information and deleting the dataset.
+A form for dataset creation is also available.
+Accept: text/plain, application/json (with auth)
+Returns a JSON-encoded list of dataset ids in that silo, along with the embargo information for each dataset
+The file siloInformation.txt contains an example of the data returned (data_returned)
+Accept:*/*, default (with auth)
+Returns text/HTML
+listing the ids of each dataset, along with a form for changing the embargo information and deleting the dataset.
+A form for dataset creation is also available.
+
+
+
+POST, PUT, DELETE NOOP
+-
-% for key in ['title', 'description','owner']:
-% if c.silo.state.has_key(key):
-
- ${key.capitalize()} - ${c.silo.state[key]} -% endif -% endfor -
- Items:
-
-% for item in sorted(c.items):
-
-
- ${item}
-
- Delete item -<% -c.current = item -%> -
- <%include file="/embargo_form.html"/> -
-% endfor
-
- -
- ${item}
-
-
-% endif
-
Create new empty object:
--<%include file="create_new_item.html"/> -
+# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +Silo ${c.title}
+% elif c.silo_name: +Silo ${c.silo_name}
+% endif +% if c.editor: +
+
+% endif
+% if c.title:
+Create new data package
+ <%include file="create_new_item.html"/> +List of Data packages in ${c.title}
+% elif c.silo_name: +List of Data packages in ${c.silo_name}
+% else: +List of Data packages
+% endif +<%include file="list_of_datasets.html"/> diff --git a/rdfdatabank/templates/states_api.html b/rdfdatabank/templates/states_api.html new file mode 100644 index 0000000..2fcd3e7 --- /dev/null +++ b/rdfdatabank/templates/states_api.html @@ -0,0 +1,126 @@ +# -*- coding: utf-8 -*- +
+
diff --git a/rdfdatabank/templates/subitemview.html b/rdfdatabank/templates/subitemview.html
deleted file mode 100644
index 3a41b60..0000000
--- a/rdfdatabank/templates/subitemview.html
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
- States
+API call to obtain information regarding the state of a silo, the state of the latest version of a dataset or the state of a particular version of a dataset.
+ +Sections
+ + + +
+
+
+
+/{silo name}/states
+
+ Returns the state information of a silo. To view an example of the state information returned for the silo Sandbox (ans["silo"]) see SiloStateInfo.txt
+The state information for a silo contains the following:
+
+Name of the silo (machine name, used in uris) - ans["silo"]
+Base URI for the silo - ans["uri_base"]
+Users who can access the silo (silo owners) - ans["owners"]
+Silo description - ans["description"]
+Title of the silo (human readable) - ans["title"]
+Disk allocation for the silo (in kB) - ans["disk_allocation"]
+List of datasets in the silo with embargo information for each of the datasets - ans["datasets"], ans["datasets"]["dataset_name"]["embargo_info"] +
++Base URI for the silo - ans["uri_base"]
+Users who can access the silo (silo owners) - ans["owners"]
+Silo description - ans["description"]
+Title of the silo (human readable) - ans["title"]
+Disk allocation for the silo (in kB) - ans["disk_allocation"]
+List of datasets in the silo with embargo information for each of the datasets - ans["datasets"], ans["datasets"]["dataset_name"]["embargo_info"] +
+
+Note:
+ Disk allocation information is not used at the moment. In the future, this will be used to calculate if current levels of disk usage is within the allocation limit and warn or prevent users from submitting data if beyond this limit. Also, the unit will change from kB to MB.
+Controller: states action: siloview
+
+
+GET
+Returns 401 if not a valid user and 403 if not authorized
+Accept: */*, default (with auth)
Returns a JSON-encoded hash/dict, keys map
+with the silo name, base uri and embargo information for each of the datasets in the silo {silo name} as text/plain
+
+
+
+
+POST, PUT, DELETE NOOP
+
+
+
+
+/{silo name}/states/{id}
+
+ Returns the state information of the latest version of a dataset. To view an example of the state information returned for the dataset dataset2 see DatasetStateInfo-dataset2.txt and dataset1 see DatasetStateInfo-dataset1-version1.txt
+The state information for a dataset contains the following:
+Information about the dataset
+
+list of files in each version - ans["state"]["files"]
+list of sub-directories in each version - ans["state"]["subdir"]
+List of available versions - ans["state"]["versions]
+manifest file format - ans["state"]["rdffileformat"]
+manifest file name - ans["state"]["rdffilename"]
+Metadata for the dataset - ans["state"]["metadata"].
+
+Current version of the dataset - ans["state"]["currentversion"]
+Metadata files for each version - ans["state"]["metadata_files"] - This feature is not used at the moment
+Dates when each version was created - ans["state"]["version_dates"]
+Date last modified - ans["state"]["date"]
+
++list of sub-directories in each version - ans["state"]["subdir"]
+List of available versions - ans["state"]["versions]
+manifest file format - ans["state"]["rdffileformat"]
+manifest file name - ans["state"]["rdffilename"]
+Metadata for the dataset - ans["state"]["metadata"].
+
+ createdby - ans["state"]["metadata"]["createdby"]
+ uuid - ans["state"]["metadata"]["uuid"]
+ embargo date - ans["state"]["metadata"]["embargoed_until"]
+ State of embargo (true | false) - ans["state"]["metadata"]["embargoed"] +
+Id of the dataset - ans["state"]["item_id"]+ uuid - ans["state"]["metadata"]["uuid"]
+ embargo date - ans["state"]["metadata"]["embargoed_until"]
+ State of embargo (true | false) - ans["state"]["metadata"]["embargoed"] +
+Current version of the dataset - ans["state"]["currentversion"]
+Metadata files for each version - ans["state"]["metadata_files"] - This feature is not used at the moment
+Dates when each version was created - ans["state"]["version_dates"]
+Date last modified - ans["state"]["date"]
+
Information about each file in the latest version of the dataset
+
+ans["parts"]["file_name"] contains file information for each of the files listed in ans["state"]["files"]["#"] (# is the current version number), including the Namaste files that are generated and the databank metadata file manifest.rdf
+The Nameaste file generated in Databank are
+
+The file information returns the equivalent of a stat() system call on the given path. See http://docs.python.org/library/os.html#os.stat for more information. +
++The Nameaste file generated in Databank are
+
+ 3=when - Date last modified (example: 3=2011-02-09T14+15+05,064235)
+ 4=where - name of dataset (example: 4=dataset1)
+
+ 4=where - name of dataset (example: 4=dataset1)
+
+The file information returns the equivalent of a stat() system call on the given path. See http://docs.python.org/library/os.html#os.stat for more information. +
+
+TODO:
+Currently the state information returns information regarding all versions for some. Modify to return information peraining only to the relevant version.
+The name of metadata files are not included in the state information. Need to add files mentioned in 'seeAlso' to ans["state"]["metadata_files"]
+Controller: states action: datasetview
+
+
+GET
+Returns 401 if not a valid user and 403 if not authorized
+Returns 404 if dataset id does not exist
+Accept: */*, default (with auth)
Returns a JSON-encoded hash/dict, keys map with the detailed state information of the latest version of the dataset id as text/plain
+
+
+
+POST, PUT, DELETE NOOP
+
+
+
+
+/{silo name}/states/{id}/version#
+
+ Returns the state of a particular version of a dataset. To view an example of the state information returned for verison 0 of the dataset dataset1 see DatasetStateInfo-dataset1-version0.txt. For details pertaining to the information returned, see above
+
+
+TODO:
+Currently the state information returns information regarding all versions for some. Modify to return information peraining only to the relevant version.
+The name of metadata files are not included in the state information. Need to add files mentioned in 'seeAlso' to ans["state"]["metadata_files"]
+Controller: states action: datasetview_vnum
+
+
+GET
+Returns 401 if not a valid user and 403 if not authorized
+Returns 404 if dataset id does not exist
+Returns 404 if dataset version number # does not exist
+Accept: */*, default (with auth)
Returns a JSON-encoded hash/dict, keys map with the detailed state information of the version # of the dataset id as text/plain
+
+
+
+POST, PUT, DELETE NOOP
+SUCCESS!
- Package uploaded successfully
-
Zipfile stored in object: ${c.info['zip_id']}
-Uploaded zipfile size: ${h.bytes_to_english(c.info['zip_file_size'])} -
Resultant unpacked object: ${c.info['zip_target']}
diff --git a/rdfdatabank/templates/update_user.html b/rdfdatabank/templates/update_user.html new file mode 100644 index 0000000..b9b815d --- /dev/null +++ b/rdfdatabank/templates/update_user.html @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +Users
+% if c.message: +${c.message}
+% endif + +
+
+
+% if c.users:
+ % for user in c.users:
+ Edit options
+-
+
-
+ Create new user
+
-
+ View silos
+
+
${user['user_name']}
+ % if not ('groups' in user and user['groups']):
+
+
+
+ % endif
+
+
+ % endfor
+% endif
+
+
+
diff --git a/rdfdatabank/templates/zipfilesubitemview.html b/rdfdatabank/templates/zipfilesubitemview.html
new file mode 100644
index 0000000..208574b
--- /dev/null
+++ b/rdfdatabank/templates/zipfilesubitemview.html
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Contents of zipfile ${c.path}/${c.subpath}
+TO BE DONE
+% endif diff --git a/rdfdatabank/templates/zipfileview.html b/rdfdatabank/templates/zipfileview.html new file mode 100644 index 0000000..5ef4987 --- /dev/null +++ b/rdfdatabank/templates/zipfileview.html @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +Contents of zipfile ${c.path}
+ % if c.zipfile_contents: +-
+ % for zf in c.zipfile_contents:
+
-
+ ##
${zf} ( ${h.bytes_to_english(c.zipfile_contents[zf][0])} )
+${zf} ( ${h.bytes_to_english(c.zipfile_contents[zf][0])} )
+
+ % endfor
+
There are no contents avaialble
+ % endif +% endif diff --git a/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py b/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py new file mode 100644 index 0000000..7e9be8a --- /dev/null +++ b/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py @@ -0,0 +1,82 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Define configuration for RDFDatabank testing +""" + +class RDFDatabankConfig: + + granary_uri_root="http://dataflow-jenkins.bodleian.ox.ac.uk" + + # Access to local VM + endpointhost="localhost:5000" + + endpointpath="/sandbox/" + endpointpath2="/sandbox2/" + + # Access credentials for testing from local dev VM as user + endpointuser="sandbox_user" + endpointpass="sandbox" + + # Access credentials for testing from local dev VM as admin + #endpointadminuser="admin" + #endpointadminpass="test" + + #Admin1 of silo1 + endpointadminuser="admin" + endpointadminpass="test" + #Admin2 of silo1 + endpointadminuser2="admin2" + endpointadminpass2="test2" + #Admin3 of silo2 + endpointadminuser3="admin3" + endpointadminpass3="test3" + + #Manager1 of silo1 + endpointmanageruser="sandbox_manager" + endpointmanagerpass="managertest" + #Manager2 of silo1 + endpointmanageruser2="sandbox_manager2" + endpointmanagerpass2="managertest2" + #Manager3 of silo2 + endpointmanageruser3="sandbox_manager3" + endpointmanagerpass3="managertest3" + + #Submitter1 of silo1 + endpointsubmitteruser="sandbox_user" + endpointsubmitterpass="sandbox" + #Submitter2 of silo1 + endpointsubmitteruser2="sandbox_user2" + endpointsubmitterpass2="sandbox2" + #Submitter3 of silo2 + endpointsubmitteruser3="sandbox_user3" + endpointsubmitterpass3="sandbox3" + + #Access credentials for generic user + endpointgeneraluser = "" + endpointgeneralpass = "" + +# End. diff --git a/rdfdatabank/tests/RDFDatabankConfig.py b/rdfdatabank/tests/RDFDatabankConfig.py new file mode 100644 index 0000000..1d6c5e9 --- /dev/null +++ b/rdfdatabank/tests/RDFDatabankConfig.py @@ -0,0 +1,78 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Define configuration for RDFDatabank testing +""" + +class RDFDatabankConfig: + + granary_uri_root="http://databank" + + # Access via IP address + endpointhost="localhost" + endpointpath="/sandbox/" + endpointpath2="/sandbox2/" + + endpointuser="sandbox_user" + endpointpass="sandbox" + + #Admin1 of silo1 + endpointadminuser="admin" + endpointadminpass="test" + #Admin2 of silo1 + endpointadminuser2="admin2" + endpointadminpass2="test2" + #Admin3 of silo2 + endpointadminuser3="admin3" + endpointadminpass3="test3" + + #Manager1 of silo1 + endpointmanageruser="sandbox_manager" + endpointmanagerpass="managertest" + #Manager2 of silo1 + endpointmanageruser2="sandbox_manager2" + endpointmanagerpass2="managertest2" + #Manager3 of silo2 + endpointmanageruser3="sandbox_manager3" + endpointmanagerpass3="managertest3" + + #Submitter1 of silo1 + endpointsubmitteruser="sandbox_user" + endpointsubmitterpass="sandbox" + #Submitter2 of silo1 + endpointsubmitteruser2="sandbox_user2" + endpointsubmitterpass2="sandbox2" + #Submitter3 of silo2 + endpointsubmitteruser3="sandbox_user3" + endpointsubmitterpass3="sandbox3" + + #Access credentials for generic user + endpointgeneraluser = "" + endpointgeneralpass = "" + + # Later, may define methods to override these defaults, e.g. from a configuration file + +# End. diff --git a/rdfdatabank/tests/TestAdmin.py b/rdfdatabank/tests/TestAdmin.py new file mode 100644 index 0000000..88e03aa --- /dev/null +++ b/rdfdatabank/tests/TestAdmin.py @@ -0,0 +1,234 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Databank submission test cases +""" + +import os, os.path +from datetime import datetime, timedelta +import sys +import unittest +import logging +import httplib +import urllib +try: + # Running Python 2.5 with simplejson? + import simplejson as json +except ImportError: + import json + +from StringIO import StringIO + +from rdflib import RDF, URIRef, Literal +#from rdflib.Graph import ConjunctiveGraph as Graph +from rdflib import ConjunctiveGraph as Graph + +if __name__ == "__main__": + # For testing: + # add main library directory to python path if running stand-alone + sys.path.append("..") + +#from MiscLib import TestUtils +from testlib import TestUtils +from testlib import SparqlQueryTestCase + +from RDFDatabankConfig import RDFDatabankConfig + +logger = logging.getLogger('testAdmin') + +class TestAdmin(SparqlQueryTestCase.SparqlQueryTestCase): + """ + Test simple dataset submissions to RDFDatabank + """ + def setUp(self): + #super(TestAdmin, self).__init__() + self.setRequestEndPoint( + endpointhost=RDFDatabankConfig.endpointhost, + endpointpath=RDFDatabankConfig.endpointpath) + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + self.setRequestUriRoot( + manifesturiroot=RDFDatabankConfig.granary_uri_root) + self.testsilo = 'tessst' + return + + def tearDown(self): + return + + # Actual tests follow + def test1CreateSilo(self): + """List all silos your account has access to - GET /silo""" + #Write a test to list all the silos. Test to see if it returns 200 OK and the list of silos is not empty + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + #Create new silo + silolist = data + fields = \ + [ ("silo", self.testsilo), + ("title", "Sandbox silo"), + ("description", "Sandbox silo for testing"), + ("notes", "Created by test"), + ("owners", RDFDatabankConfig.endpointadminuser), + ("disk_allocation", "100000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, resource="admin/", endpointpath="/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s"%self.testsilo + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + #newsilolist = [] + #for k in data: + # newsilolist.append(k) + newsilolist = data + self.failUnless(len(newsilolist)>0, "No silos returned") + self.assertEquals(len(newsilolist), len(silolist)+1, "One additional silo should have been returned") + for s in silolist: self.failUnless(s in newsilolist, "Silo "+s+" in original list, not in new list") + self.failUnless(self.testsilo in newsilolist, "Silo "+self.testsilo+" not in new list") + return + + def test2SiloInfo(self): + """Get admin informaton of a silo - GET /silo_name/admin""" + # Access silo information in admin, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/%s/"%self.testsilo, + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + # check silo name and base_uri + self.assertEqual(data['title'], "Sandbox silo", "Silo title is %s not 'Sandbox silo'" %data['title']) + self.assertEqual(data['description'], "Sandbox silo for testing", "Silo title is '%s' not 'Sandbox silo for testing'" %data['description']) + self.assertEqual(data['notes'], "Created by test", "Silo notes is '%s' not 'Created by test'" %data['notes']) + self.assertEqual(data['owners'], RDFDatabankConfig.endpointadminuser, "Silo owner is '%s' not '%s'" %(data['owners'], RDFDatabankConfig.endpointadminuser)) + self.assertEqual(data['disk_allocation'], "100000", "Silo title is '%s' not '100000'" %data['disk_allocation']) + return + + def test3UpdateSiloInfo(self): + """Update silo metadata""" + fields = \ + [ ("silo", self.testsilo), + ("title", "Sandbox silo"), + ("description", "Sandbox silo for testing"), + ("notes", "Created by test"), + ("owners", "%s,%s"%(RDFDatabankConfig.endpointadminuser,RDFDatabankConfig.endpointuser)), + ("disk_allocation", "200000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST(reqdata, reqtype, + endpointpath="/%s/"%self.testsilo, resource="admin/", + expect_status=204, expect_reason="Updated", expect_type="text/plain") + # Access silo information in admin, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/%s/"%self.testsilo, + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + # check silo name and base_uri + self.assertEqual(data['title'], "Sandbox silo", "Silo title is %s not 'Sandbox silo'" %data['title']) + self.assertEqual(data['description'], "Sandbox silo for testing", "Silo title is '%s' not 'Sandbox silo for testing'" %data['description']) + self.assertEqual(data['notes'], "Created by test", "Silo notes is '%s' not 'Created by test'" %data['notes']) + self.assertEqual(data['owners'], "%s,%s"%(RDFDatabankConfig.endpointadminuser,RDFDatabankConfig.endpointuser), "Silo owner is '%s' not '%s,%s'" %(data['owners'], RDFDatabankConfig.endpointadminuser,RDFDatabankConfig.endpointuser)) + self.assertEqual(data['disk_allocation'], "200000", "Silo title is '%s' not '200000'" %data['disk_allocation']) + return + + def test4DeleteSilo(self): + """Delete silo test""" + #Delete Silo + resp = self.doHTTP_DELETE( + endpointpath="/%s/"%self.testsilo, + resource="admin/", + expect_status=200, expect_reason="OK") + # Access silo, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/%s/"%self.testsilo, + resource="admin/", + expect_status=403, expect_reason="Forbidden") + return + + # Sentinel/placeholder tests + + def testUnits(self): + assert (True) + + def testComponents(self): + assert (True) + + def testIntegration(self): + assert (True) + + def testPending(self): + #Need to have performance tests and analyse performance + #Need to set the permission of file being uploaded + #assert (False), "Pending tests follow" + assert (True) + +# Assemble test suite + +def getTestSuite(select="unit"): + """ + Get test suite + + select is one of the following: + "unit" return suite of unit tests only + "component" return suite of unit and component tests + "all" return suite of unit, component and integration tests + "pending" return suite of pending tests + name a single named test to be run + """ + testdict = { + "unit": + [ "testUnits" + , "test1CreateSilo" + , "test2SiloInfo" + , "test3UpdateSiloInfo" + , "test4DeleteSilo" + ], + "component": + [ "testComponents" + ], + "integration": + [ "testIntegration" + ], + "pending": + [ "testPending" + ] + } + return TestUtils.getTestSuite(TestAdmin, testdict, select=select) + +if __name__ == "__main__": + TestUtils.runTests("TestAdmin.log", getTestSuite, sys.argv) + +# End. diff --git a/rdfdatabank/tests/TestSubmission.py b/rdfdatabank/tests/TestSubmission.py new file mode 100644 index 0000000..496adc5 --- /dev/null +++ b/rdfdatabank/tests/TestSubmission.py @@ -0,0 +1,4517 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Databank submission test cases +""" + +import os, os.path +from datetime import datetime, timedelta +from dateutil.relativedelta import * +import sys +import unittest +import logging +import httplib +import urllib +import codecs +try: + # Running Python 2.5 with simplejson? + import simplejson as json +except ImportError: + import json + +#My system is running rdflib version 2.4.2. So adding rdflib v3.0 to sys path +#rdflib_path = os.path.join(os.getcwd(), 'rdflib') +#sys.path.insert(0, rdflib_path) +#import rdflib +#from rdflib.namespace import RDF +#from rdflib.graph import Graph +#from rdflib.plugins.memory import Memory +#from rdflib import URIRef +#from rdflib import Literal +#rdflib.plugin.register('sparql',rdflib.query.Processor,'rdfextras.sparql.processor','Processor') +#rdflib.plugin.register('sparql', rdflib.query.Result, +# 'rdfextras.sparql.query', 'SPARQLQueryResult') + +from StringIO import StringIO + +from rdflib import RDF, URIRef, Literal +from rdflib.Graph import ConjunctiveGraph as Graph + +#from time import sleep +#import subprocess + +if __name__ == "__main__": + # For testing: + # add main library directory to python path if running stand-alone + sys.path.append("..") + +#from MiscLib import TestUtils +from testlib import TestUtils +from testlib import SparqlQueryTestCase + +from RDFDatabankConfig import RDFDatabankConfig as RC +RDFDatabankConfig = RC() + +logger = logging.getLogger('TestSubmission') +#hdlr = logging.FileHandler('TestSubmission.log') +#fmt = logging.Formatter('%(asctime)s %(levelname)s %(message)s') +#hdlr.setFormatter(fmt) +#logger.addHandler(hdlr) +#logger.setLevel(logging.DEBUG) + +class TestSubmission(SparqlQueryTestCase.SparqlQueryTestCase): + """ + Test simple dataset submissions to RDFDatabank + """ + def setUp(self): + self.setRequestEndPoint( + endpointhost=RDFDatabankConfig.endpointhost, # Via SSH tunnel + endpointpath=RDFDatabankConfig.endpointpath) + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointuser, + endpointpass=RDFDatabankConfig.endpointpass) + self.setRequestUriRoot( + manifesturiroot=RDFDatabankConfig.granary_uri_root) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + return + + def tearDown(self): + return + + # Create empty test submission dataset + def createSubmissionDataset(self, embargoed=None, embargoed_until=None): + # Create a new dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + if embargoed != None: + if embargoed: + fields.append(('embargoed', 'True')) + else: + fields.append(('embargoed', 'False')) + if embargoed_until != None: + if embargoed_until == True: + fields.append(('embargoed_until', 'True')) + elif embargoed_until == False: + fields.append(('embargoed_until', 'False')) + else: + fields.append(('embargoed_until', embargoed_until)) + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return + + def uploadSubmissionZipfile(self, file_to_upload="testdir.zip"): + # Submit ZIP file, check response + fields = [] + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/%s"%(self._endpointpath, file_to_upload) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return zipdata + + def updateSubmissionZipfile(self, file_to_upload="testdir.zip", filename=None): + # Submit ZIP file, check response + fields = [] + if filename: + fields = \ + [ ("filename", filename) + ] + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + return zipdata + + # Actual tests follow + def test01CreateUser(self): + """Create user sandbox_user""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + userExists = False + for user in data: + if RDFDatabankConfig.endpointuser in user['user_name']: + userExists = True + + fields = [ + ('username',RDFDatabankConfig.endpointuser), + ('password',RDFDatabankConfig.endpointpass), + ('name',RDFDatabankConfig.endpointuser), + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + if userExists: + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + endpointpath="/", + resource="users/", + expect_status=403, expect_reason="Forbidden") + else: + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + endpointpath="/", + resource="users/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/users/%s"%RDFDatabankConfig.endpointuser + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + return + + def test02CreateSilo(self): + """List all silos your account has access to - GET /admin. If the silo 'sandbox' does not exist, create it""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name = RDFDatabankConfig.endpointpath.strip('/') + silolist = data + if not silo_name in silolist: + #Create new silo + owner_list = [RDFDatabankConfig.endpointadminuser] + if not RDFDatabankConfig.endpointuser in owner_list: + owner_list.append(RDFDatabankConfig.endpointuser) + owner_list = ",".join(owner_list) + fields = \ + [ ("silo", silo_name), + ("title", "Sandbox silo"), + ("description", "Sandbox silo for testing"), + ("notes", "Created by test"), + ("administrators", RDFDatabankConfig.endpointadminuser), + ("disk_allocation", "100000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, resource="admin/", endpointpath="/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s"%silo_name + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newsilolist = data + self.failUnless(len(newsilolist)>0, "No silos returned") + self.assertEquals(len(newsilolist), len(silolist)+1, "One additional silo should have been returned") + for s in silolist: self.failUnless(s in newsilolist, "Silo "+s+" in original list, not in new list") + self.failUnless(silo_name in newsilolist, "Silo '%s' not in new list"%silo_name) + return + + def test03AddUserMembership(self): + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access user details, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + membershipExists = False + silo_name = RDFDatabankConfig.endpointpath.strip('/') + if [silo_name, 'submitter'] in data['groups']: + membershipExists = True + fields = [ + ('role','submitter') + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + if membershipExists: + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + endpointpath=RDFDatabankConfig.endpointpath, + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=400, expect_reason="Bad Request") + else: + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + endpointpath=RDFDatabankConfig.endpointpath, + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s/users/%s"%(silo_name, RDFDatabankConfig.endpointuser) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEquals(data['user_name'], RDFDatabankConfig.endpointuser, "user info: username") + try: + self.assertEquals(data['name'], RDFDatabankConfig.endpointuser, "user info: name") + except: + pass + #self.assertEquals(data['firstname'], 'Sandbox', "user info: firstname") + #self.assertEquals(data['lastname'], 'User', "user info: lastname") + self.failUnless([silo_name, 'submitter'] in data['groups'], "user info: membership") + return + + def testListSilos(self): + """List all silos your account has access to - GET /silo""" + #Write a test to list all the silos. Test to see if it returns 200 OK and the list of silos is not empty + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + # check list of silos is not empty + self.failUnless(len(data)>0, "No silos returned") + + def testListDatasets(self): + """List all datasets in a silo - GET /silo_name/datasets""" + # Access list of datasets in the silo, check response + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Save initial list of datasets + datasetlist = [] + for k in data: + datasetlist.append(k) + # Create a new dataset + self.createSubmissionDataset() + # Read list of datasets, check that new list is original + new dataset + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = [] + for k in data: + newlist.append(k) + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist)+1, "One additional dataset") + for ds in datasetlist: self.failUnless(ds in newlist, "Dataset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless((ds in datasetlist) or (ds == "TestSubmission"), "Datset "+ds+" in new list, not in original list") + self.failUnless("TestSubmission" in newlist, "testSubmission in new list") + # Delete new dataset + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # read list of datasets, check result is same as original list + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = [] + for k in data: + newlist.append(k) + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist), "Back to original content in silo") + for ds in datasetlist: self.failUnless(ds in newlist, "Datset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless(ds in datasetlist, "Datset "+ds+" in new list, not in original list") + + def testSiloState(self): + """Get state informaton of a silo - GET /silo_name/states""" + # Access state information of silo, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data) = self.doHTTP_GET( + resource="states/", + expect_status=200, expect_reason="OK", expect_type="application/json") + # check silo name and base_uri + silo_name = RDFDatabankConfig.endpointpath.strip('/') + silo_base = URIRef(self.getManifestUri("datasets/")) + self.assertEqual(data['silo'], silo_name, 'Silo name is %s not %s' %(data['silo'], silo_name)) + self.assertEqual(data['uri_base'].strip(), silo_base.strip(), 'Silo uri_base is %s not %s' %(data['uri_base'], silo_base)) + #self.failUnless(len(data['datasets'])>0, "No datasets returned") + self.failUnless('datasets' in data, "datasets info for silo not returned") + self.failUnless((type(data['datasets']).__name__ == 'dict'), "Datasets with embargo info not returned for silo") + # Save initial list of datasets + datasetlist = data['datasets'] + # Create a new dataset + self.createSubmissionDataset() + # Read list of datasets, check that new list is original + new dataset + (resp, data) = self.doHTTP_GET( + resource="states/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = data['datasets'] + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist)+1, "One additional dataset") + for ds in datasetlist: self.failUnless(ds in newlist, "Dataset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless((ds in datasetlist) or (ds == "TestSubmission"), "Datset "+ds+" in new list, not in original list") + self.failUnless("TestSubmission" in newlist, "testSubmission in new list") + # Delete new dataset + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # read list of datasets, check result is same as original list + (resp, data) = self.doHTTP_GET( + resource="states/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = data['datasets'] + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist), "Back to original content in silo") + for ds in datasetlist: self.failUnless(ds in newlist, "Datset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless(ds in datasetlist, "Datset "+ds+" in new list, not in original list") + + def testDatasetNotPresent(self): + """Verify dataset is not present - GET /silo_name/dataset_name""" + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", expect_status=404, expect_reason="Not Found") + + def testDatasetCreation(self): + """Create dataset - POST id to /silo_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + def testDatasetRecreation(self): + """Create dataset - POST existing id to /silo_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=409, expect_reason="Conflict: Data package already exists") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + + def testDeleteDataset(self): + """Delete dataset - DELETE /silo_name/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + + def testDatasetNaming(self): + """Create dataset - POST id to /silo_name/datasets. If name is valid, return 201, else return 403""" + names = [("TestSubmission-1", 201, "Created") + ,("TestSubmission_2", 201, "Created") + ,("TestSubmission:3", 201, "Created") + ,("TestSubmission*4", 400, "Bad request. Data package name not valid") + ,("TestSubmission/5", 400, "Bad request. Data package name not valid") + ,("TestSubmission\6", 400, "Bad request. Data package name not valid") + ,("TestSubmission,7", 400, "Bad request. Data package name not valid") + ,("TestSubmission&8", 400, "Bad request. Data package name not valid") + ,("TestSubmission.9", 400, "Bad request. Data package name not valid") + ,("""Test"Submission""", 400, "Bad request. Data package name not valid") + ,("Test'Submission", 400, "Bad request. Data package name not valid") + #,("""Test Submission""", 400, "Bad request. Dataset name not valid") #The name is truncated to Test and dataset is created. This does not happen when using the form + ,("TestSubmission$", 400, "Bad request. Data package name not valid") + ,("T", 400, "Bad request. Data package name not valid") + ] + files =[] + for name, status, reason in names: + fields = [("id", name)] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + #Create a new dataset, check response + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", expect_status=status, expect_reason=reason) + # Access dataset, check response + if status == 201: + LHobtained = urllib.unquote(resp.getheader('Content-Location', None)) + LHexpected = "%sdatasets/%s"%(self._endpointpath, name) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/%s"%name, + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + elif status == 403: + (resp, respdata) = self.doHTTP_GET( + resource="datasets/%s"%name, + expect_status=404, expect_reason="Not Found") + #Delete Datasets + for name, status, reason in names: + if not status == 201: + continue + resp = self.doHTTP_DELETE( + resource="datasets/%s"%name, + expect_status=200, expect_reason="OK") + + def testDatasetStateInformation(self): + """Get state information of dataset - GET /silo_name/states/dataset_name.""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 1, "Initially one version") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['currentversion'], '0', "Current version == 0") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + # date + # version_dates + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + def testEmbargoOnCreation(self): + """Create dataset - POST id to /silo_name""" + #--------------------------------------------------------------- + # Create a new dataset, check response. No embargo information is passed. + self.createSubmissionDataset() + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertTrue((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed=None, embargo_until=True. + self.createSubmissionDataset(embargoed_until=True) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertTrue((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed=None, embargo_until=2012-08-12 + d = '2012-08-12' + self.createSubmissionDataset(embargoed_until=d) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertTrue((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed=True, embargo_until=None. + self.createSubmissionDataset(embargoed=True) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),9,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed?") + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed=True, embargo_until=True + self.createSubmissionDataset(embargoed=True, embargoed_until=True) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed=True, embargo_until=09-08-2012 + d = '09-08-2012' + self.createSubmissionDataset(embargoed=True, embargoed_until=d) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2012-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2012-08-09?") + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed = False. + self.createSubmissionDataset(embargoed=False) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),9,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed?") + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed = False, embargoed_until = True + self.createSubmissionDataset(embargoed=False, embargoed_until=True) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),9,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed?") + #--------------------------------------------------------------- + # Delete dataset, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + #--------------------------------------------------------------- + # Create a new dataset, check response. embargoed = False, embargoed_until = 12 sep 2013 + d = '12 Sep 2013' + self.createSubmissionDataset(embargoed=False, embargoed_until=d) + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),9,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed?") + + + def testFileUpload(self): + """Upload file to dataset - POST file to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + #Access state information + (resp, respdata) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + self.failUnless('Added or updated file testdir.zip' in state['versionlog']['1'], "Version 1 log") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + def testFileUploadtoNewDataset(self): + """Upload file to a new dataset - POST file to /silo_name/datasets/dataset_name""" + #Access state information + (resp, respdata) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=404, expect_reason="Not Found") + # Upload zip file, check response + d = datetime.now() + delta = timedelta(days=365*4) + d2 = d + delta + d2 = d2.isoformat() + fields = [ + ("filename", "testdir.zip") + ,("embargoed", 'true') + ,("embargoed_until", d2) + ] + zipdata = open("testdata/testdir.zip").read() + files = \ + [ ("file", "testdir.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + #Access dataset and check content of version 1 - embargo update + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d2) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents of version 2 - file upload + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(state['files']['1'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + #logger.debug("Versionlog "+str(state['versionlog'])) + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + #self.failUnless('Added or updated file manifest.rdf' in state['versionlog']['1'], "Version 1 log") + self.failUnless('Added or updated file testdir.zip' in state['versionlog']['2'], "Version 2 log") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], d2, "embargoed_until?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + def testFileDelete(self): + """Delete file in dataset - DELETE /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Delete file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check zip file does not exist + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + self.failUnless('Added or updated file testdir.zip' in state['versionlog']['1'], "Version 1 log") + self.failUnless("Deleted file testdir.zip" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + def testFileUpdate(self): + """Update file in dataset - POST file to /silo_name/datasets/dataset_name (x 2)""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response (uploads the file testdir.zip) + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Upload zip file again, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="testdir2.zip", filename="testdir.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + def testGetDatasetByVersion(self): + """Upload files to a dataset - POST file to /silo_name/datasets/dataset_name. Access each of the versions and the files in that version""" + #Definitions + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + #---------Version 0 + # Create a new dataset, check response + self.createSubmissionDataset() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + #---------Version 1 + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #---------Version 2 + # Upload zip file, check response + zipdata2 = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - testdir.zip!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.failUnless("Added or updated file testdir2.zip" in state['versionlog']['2'], "Version 2 log") + #---------Version 3 + # Delete file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.failUnless("Deleted file testdir.zip" in state['versionlog']['3'], "Version 3 log") + #---------Version 4 + # Update zip file, check response + zipdata3 = self.updateSubmissionZipfile(file_to_upload="testrdf4.zip", filename="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.failUnless("Added or updated file testdir2.zip" in state['versionlog']['4'], "Version 4 log") + #=========Access each of the versions + #---------Version 0 + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + #---------Version 1 + # Access and check list of contents of version 1 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 1!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=1", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + #---------Version 2 + # Access and check list of contents of version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 2!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - Version 2!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=2", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 3 + # Access and check list of contents of version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 4 + # Access and check list of contents of version 4 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=4", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=4", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile - Version 4!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=4", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=4", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['versions'],['0', '1', '2', '3', '4'], "Versions") + self.assertEqual(state['currentversion'], '4', "Current version == 4") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testdir2.zip") + self.assertEqual(len(state['files']['3']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['files']['4']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['metadata_files']['4']), 0, "metadata_files of version 4") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(len(state['subdir']['4']), 0, "Subdirectory count for version 4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(state['versionlog']), 5, "Version log for 5 version") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Added or updated file testdir2.zip" in state['versionlog']['2'], "Version 2 log") + self.failUnless("Deleted file testdir.zip" in state['versionlog']['3'], "Version 3 log") + self.failUnless("Added or updated file testdir2.zip" in state['versionlog']['4'], "Version 4 log") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + + # Access and check list of contents of version 5 + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=5", + expect_status=404, expect_reason="Not Found") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=5", + expect_status=404, expect_reason="Not Found") + + def testPostMetadataFile(self): + """POST manifest to dataset - POST manifest.rdf to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="ww1-860b-manifest.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + bibo = "http://purl.org/ontology/bibo/" + geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" + foaf = "http://xmlns.com/foaf/0.1/" + address = "http://schemas.talis.com/2005/address/schema#" + stype = URIRef(oxds+"DataSet") + stype2 = URIRef(bibo+"DocumentPart") + self.assertEqual(len(rdfgraph),42,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1-1123")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"creator"),"Thomas, Edward") in rdfgraph, 'dcterms:creator') + self.failUnless((subj,URIRef(dcterms+"title"),"Two Houses") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"description"),"This manuscript is untitled but entitled 'Two Houses' in Edward Thomas Collected Poems") in rdfgraph, 'dcterms:description') + self.failUnless((subj,URIRef(dcterms+"spatial"),"London") in rdfgraph, 'dcterms:spatial') + self.failUnless((subj,URIRef(dcterms+"format"),"Notebook") in rdfgraph, 'dcterms:format') + self.failUnless((subj,URIRef(dcterms+"medium"),"Paper") in rdfgraph, 'dcterms:medium') + self.failUnless((subj,URIRef(dcterms+"type"),"Poem") in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(bibo+"number"),"13") in rdfgraph, 'bibo:number') + self.failUnless((subj,URIRef(dcterms+"source"),"MS Don d.28 f.13") in rdfgraph, 'dcterms:source') + self.failUnless((subj,URIRef(dcterms+"contributor"),"Everett Sharp") in rdfgraph, 'dcterms:contributor') + self.failUnless((subj,URIRef(dcterms+"identifier"),"ETBODDOND28-13.jpg") in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"rightsHolder"),"Copyright of The Bodleian Library, Oxford University / The Edward Thomas Literary Estate") in rdfgraph, 'dcterms:rightsHolder') + self.failUnless((subj,RDF.value,"51.501") in rdfgraph, 'rdf:value') + #self.failUnless((subj,URIRef(dcterms+"created"),"1915-07-22") in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"type"),URIRef("http://purl.org/dc/dcmitype/StillImage")) in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"spatial"),None) in rdfgraph, 'dcterms:spatial') + self.failUnless((None,URIRef(geo+"lat"),"51.501") in rdfgraph, 'geo:lat') + self.failUnless((None,URIRef(geo+"long"),"-0.1254") in rdfgraph, 'geo:long') + self.failUnless((subj,URIRef(bibo+"owner"),None) in rdfgraph, 'bibo:owner') + self.failUnless((None,RDF.type,URIRef(foaf+"Organization")) in rdfgraph, 'rdf:type') + self.failUnless((None,URIRef(foaf+"name"),"Bodleian Library, University of Oxford") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(address+"streetAddress"),"Western Manuscripts Collections") in rdfgraph, 'address:streetAddress') + self.failUnless((None,URIRef(address+"streetAddress"),"Broad Street") in rdfgraph, 'address:streetAddress') + self.failUnless((None,URIRef(address+"localityName"),"Oxford") in rdfgraph, 'address:localityName') + self.failUnless((None,URIRef(address+"regionName"),"Oxfordshire") in rdfgraph, 'address:regionName') + self.failUnless((None,URIRef(address+"postalCode"),"OX13BG") in rdfgraph, 'address:postalCode') + self.failUnless((None,URIRef(address+"countryName"),"United Kingdom") in rdfgraph, 'address:countryName') + self.failUnless((None,URIRef(foaf+"homepage"),"http://www.bodley.ox.ac.uk/") in rdfgraph, 'foaf:homepage') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + def testMetadataFileUpdate(self): + """POST manifest to dataset - POST manifest.rdf to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + bibo = "http://purl.org/ontology/bibo/" + geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" + foaf = "http://xmlns.com/foaf/0.1/" + address = "http://schemas.talis.com/2005/address/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Update metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="ww1-2862-manifest.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype2 = URIRef(bibo+"Document") + doctext = """She had a name among the children; +
But no one loved though someone owned +
Her, locked her out of doors at bedtime +
And had her kittens duly drowned. +
In Spring, nevertheless, this cat +
Ate blackbirds, thrushes, nightingales, +
And birds of bright voice and plume and flight, +
As well as scraps from neighbours' pails. +
I loathed and hated her for this; +
One speckle on a thrush's breast +
Was worth a million such; and yet +
She lived long, till God gave her rest. +
""" + self.assertEqual(len(rdfgraph),32,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),'A Cat') in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://databank.ora.ox.ac.uk/ww1archives/datasets/ww1-2862")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"creator"),"Thomas, Edward") in rdfgraph, 'dcterms:creator') + self.failUnless((subj,URIRef(dcterms+"type"),"Poem") in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"type"),URIRef("http://purl.org/dc/dcmitype/Text")) in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"rightsHolder"),"Copyright Edward Thomas, 1979, reproduced under licence from Faber and Faber Ltd.") in rdfgraph, 'dcterms:rightsHolder') + self.failUnless((subj,RDF.value,Literal(doctext)) in rdfgraph, 'rdf:value') + self.failUnless((subj,URIRef(dcterms+"source"),"Edward Thomas Collected Poems") in rdfgraph, 'dcterms:source') + #self.failUnless((subj,URIRef(dcterms+"created"),"1979-01-01/1979-12-31") in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(bibo+"editor"),"Thomas, George") in rdfgraph, 'bibo:editor') + self.failUnless((subj,URIRef(bibo+"owner"),None) in rdfgraph, 'bibo:owner') + self.failUnless((None,RDF.type,URIRef(foaf+"Organization")) in rdfgraph, 'rdf:type') + self.failUnless((None,URIRef(foaf+"name"),"ProQuest") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(foaf+"homepage"),"http://lion.chadwyck.co.uk/") in rdfgraph, 'foaf:homepage') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((None,URIRef(foaf+"name"),"Faber and Faber") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(address+"localityName"),"London") in rdfgraph, 'address:localityName') + + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + #logger.debug("Versionlog "+str(state['versionlog'])) + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Updated file manifest.rdf" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Updated file manifest.rdf" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + def testMetadataFileDelete(self): + """Delete manifest in dataset - DELETE /silo_name/datasets/dataset_name/manifest.rdf""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Delete metadata file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + def testPutCreateFile(self): + """PUT file contents to new filename - PUT file contents to /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Put zip file, check response + zipdata = open("testdata/testdir.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testdir.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + def testPutUpdateFile(self): + """PUT file contents to existing filename - PUT file contents to /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir.zip") + # Access content + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Put zip file, check response + zipdata2 = open("testdata/testrdf3.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata2, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf3.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile!") + # Put zip file again, check response + zipdata3 = open("testdata/testdir2.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata3, resource="datasets/TestSubmission/testdir.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 4, "Four versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['versions'][3], '3', "Version 3") + self.assertEqual(state['currentversion'], '3', "Current version == 3") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['files']['3']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Added or updated file testrdf3.zip" in state['versionlog']['2'], "Version 2 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['3'], "Version 3 log") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testrdf3.zip'].keys()), 13, "File stats for testrdf3.zip") + # Access and check zip file content of version 1 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + def testPutMetadataFile(self): + """Add metadata to manifest - PUT metadata to /silo_name/datasets/dataset_name/manifest.rdf""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Put manifest file, check response + zipdata = open("testdata/manifest.rdf").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Update metadata file, check response + zipdata = open("testdata/manifest2.rdf").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"title"),'Test dataset with updated and merged metadata') in rdfgraph, 'dcterms:title') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + #logger.debug("Versionlog "+str(state['versionlog'])) + self.failUnless("Updated file manifest.rdf" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + def testUnicodeMetadataFileUpdate(self): + """POST/PUT manifest to dataset - /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"DataSet") + # POST unicode file 01, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode01.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext1 = None + f = codecs.open('testdata/unicodedata/unicode01.txt', 'r', 'utf-8') + doctext1 = f.read() + f.close() + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"General punctuation") in rdfgraph, 'dcterms:title') + #for s, p, o in rdfgraph.triples((None, RDF.value, None)): + # print s, p, type(o), '\n', o + #print '\n', '-'*50 + #print Literal(doctext1) + #print '\n', '-'*50 + self.failUnless((subj,RDF.value,Literal(doctext1)) in rdfgraph, 'rdf:value') + self.failUnless((subj,URIRef(dcterms+"source"),"http://www.madore.org/~david/misc/unitest/") in rdfgraph, 'dcterms:source') + + # PUT unicode file 02, check response + manidata = open("testdata/unicodedata/unicode02.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext2 = None + f = codecs.open('testdata/unicodedata/unicode02.txt', 'r', 'utf-8') + doctext2 = f.read() + f.close() + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"A table of (some) accents") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext2)) in rdfgraph, 'rdf:value') + + # PUT unicode file 03, check response + manidata = open("testdata/unicodedata/unicode03.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext3 = None + f = codecs.open('testdata/unicodedata/unicode03.txt', 'r', 'utf-8') + doctext3 = f.read() + f.close() + self.assertEqual(len(rdfgraph),16,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Combining diacritics") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext3)) in rdfgraph, 'rdf:value') + + # POST unicode file 04, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode04.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext4 = None + f = codecs.open('testdata/unicodedata/unicode04.txt', 'r', 'utf-8') + doctext4 = f.read() + f.close() + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Various symbols") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext4)) in rdfgraph, 'rdf:value') + + # POST unicode file 05, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode05.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext5 = None + f = codecs.open('testdata/unicodedata/unicode05.txt', 'r', 'utf-8') + doctext5 = f.read() + f.close() + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'5') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in Russian") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext5)) in rdfgraph, 'rdf:value') + + # PUT unicode file 06, check response + manidata = open("testdata/unicodedata/unicode06.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext6 = None + f = codecs.open('testdata/unicodedata/unicode06.txt', 'r', 'utf-8') + doctext6 = f.read() + f.close() + self.assertEqual(len(rdfgraph),19,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in ancient Greek") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext6)) in rdfgraph, 'rdf:value') + + # POST unicode file 07, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode07.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext7 = None + f = codecs.open('testdata/unicodedata/unicode07.txt', 'r', 'utf-8') + doctext7 = f.read() + f.close() + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'7') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in Sanskrit") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext7)) in rdfgraph, 'rdf:value') + + # PUT unicode file 08, check response + manidata = open("testdata/unicodedata/unicode08.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext8 = None + f = codecs.open('testdata/unicodedata/unicode08.txt', 'r', 'utf-8') + doctext8= f.read() + f.close() + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'8') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some Chinese") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext8)) in rdfgraph, 'rdf:value') + + # POST unicode file 09, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode09.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext9 = None + f = codecs.open('testdata/unicodedata/unicode09.txt', 'r', 'utf-8') + doctext9 = f.read() + f.close() + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'9') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"A Tamil name") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext9)) in rdfgraph, 'rdf:value') + + # PUT unicode file 10, check response + manidata = open("testdata/unicodedata/unicode10.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext10 = None + f = codecs.open('testdata/unicodedata/unicode10.txt', 'r', 'utf-8') + doctext10= f.read() + f.close() + self.assertEqual(len(rdfgraph),23,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'10') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some Arabic") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext10)) in rdfgraph, 'rdf:value') + os.remove('response.xml') + + def testDeleteEmbargo(self): + """Delete embargo information - POST embargo_change to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + # Delete embargo, check response + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], "", "Should have no date for embargoed_until") + + def testChangeEmbargo(self): + """Modify embargo information - POST embargo_change, embargo, embargo_until to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertTrue((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #------------------------------------------------- + # Change embargo without embargo_until date - embargoed = True, check response + fields = \ + [ ("embargoed", 'true') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "embargoed_until?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = True + d = datetime.now().isoformat() + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", 'true') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = datetime + d = datetime.now() + delta = timedelta(days=365*4) + d2 = d + delta + d2 = d2.isoformat() + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d2) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], d2, "embargoed_until?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = datetime + d2 = '09 August 2013' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2013-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2013-08-09?") + #------------------------------------------------- + # Change embargo - embargoed_until = true and check response + fields = \ + [ ("embargoed_until", 'true') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2013-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2013-08-09?") + #------------------------------------------------- + # Change embargo - embargoed_until = date and check response + d5 = datetime.now() + delta = timedelta(days=3) + d5 = d5 + delta + d5 = d5.isoformat() + fields = \ + [ ("embargoed_until", d5) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2013-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2013-08-09?") + #------------------------------------------------- + #Delete embargo + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'5') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed until?") + #------------------------------------------------- + #Delete embargo + fields = \ + [ ("embargoed", 'false') + ,("embargoed_until", 'true') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed until?") + #------------------------------------------------- + #Delete embargo + d = datetime.now() + delta = timedelta(days=4) + d3 = d + delta + d3 = d3.isoformat() + fields = \ + [ ("embargoed", 'false') + ,("embargoed_until", d3) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'7') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed until?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = '09 Aug 2013' + d2 = '09 Aug 2013' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'8') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2013-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2013-08-09?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = '09 08 2015' + d2 = '09 08 2015' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'9') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2015-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2015-08-09?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = '09-08-16' + d2 = '09-08-16' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'10') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2016-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2016-08-09?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = '09/08/17' + d2 = '09/08/17' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'11') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2017-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2017-08-09?") + #------------------------------------------------- + #Change embargo - embargoed = true, embargoed_until = 'Aug 09, 2018' + d2 = 'Aug 09, 2018' + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d2) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'12') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue('2018-08-09' in state['metadata']['embargoed_until'], "embargoed_until 2018-08-09?") + #------------------------------------------------- + + def testFileUnpack(self): + """Unpack zip file within dataset - POST zip filename to /silo_name/items/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testdir.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:locense') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], [], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['directory'], "Subdirectory for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Unpacked file testdir.zip. Contents added as version 2" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + + def testSymlinkFileUnpack(self): + """Unpack zip file uploaded in a previous version to a new dataset - POST zip filename to /silo_name/items/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file testdir.zip, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Upload zip file test, check response + zipdata = self.uploadSubmissionZipfile() + # Unpack ZIP file into a new dataset, check response + fields = [ + ("filename", "testdir.zip"), + ("id", "TestSubmission-testdir"), + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + #self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, test-csv.csv and testdir") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Unpacked file testdir.zip. Contents added as version 1" in state['versionlog']['1'], "Version 1 log") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + + def testFileUploadToUnpackedDataset(self): + """Upload a file to an unpacked dataset - POST filename to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Unpack ZIP file into a new dataset, check response + fields = [("filename", "testdir.zip")] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access dataset TestSubmission, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + # Upload zip file to dataset TestSubmission-testdir + fields = \ + [ ("filename", "testdir2.zip") + ] + zipdata = open("testdata/testdir2.zip").read() + files = \ + [ ("file", "testdir2.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset TestSubmission-testdir, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"3") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 4, "Four versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['versions'][3], '3', "Version 3") + self.assertEqual(state['currentversion'], '3', "Current version == 3") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testrdf.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, test-csv.csv and directory") + self.assertEqual(len(state['files']['3']), 4, "List should contain manifest.rdf, test-csv.csv, directory and testdir2.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], [], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['directory'], "Subdirectory for version 2") + self.assertEqual(state['subdir']['3'], ['directory'], "Subdirectory for version 3") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Added or updated file testdir.zip" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Unpacked file testdir.zip. Contents added as version 2" in state['versionlog']['2'], "Version 2 log") + self.failUnless("Added or updated file testdir2.zip" in state['versionlog']['3'], "Version 3 log") + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + def testUpdateUnpackedDataset(self): + """Unpack zip file to an existing dataset - POST zip filename to /silo_name/items/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Upload second zip file, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Unpack ZIP file into a new dataset, check response + fields = [ + ("filename", "testdir.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check response for TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + # Access and check list of contents in TestSubmission-testdir + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef(oxds+"Grouping") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Unpack second ZIP file into dataset TestSubmission-testdir, check response + fields = \ + [ ("filename", "testdir2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph) + #self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + #self.failUnless((URIRef(base+"testdir2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access dataset TestSubmission-testdir, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype1 = URIRef("http://vocab.ox.ac.uk/dataset/schema#DataSet") + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + owl = "http://www.w3.org/2002/07/owl#" + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 4, "List should contain manifest.rdf, directory1, directory2 and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(len(state['subdir']['2']), 2, "Subdirectory for version 2 should be directory1 and directory2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(state['versionlog']), 3, "Three version logs") + #logger.debug("Versionlog "+str(state['versionlog'])) + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Unpacked file testdir.zip. Contents added as version 1" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Unpacked file testdir2.zip. Contents added as version 2" in state['versionlog']['2'], "Version 2 log") + self.failUnless("Updated file manifest.rdf" in state['versionlog']['2'], "Version 2 log") + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['directory1'].keys()), 0, "File stats for directory1") + self.assertEqual(len(parts['directory2'].keys()), 0, "File stats for directory2") + # Access dataset TestSubmission-testdir version 1 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir version 1 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=1", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + # Access and check list of contents in TestSubmission-testdir version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype1) in rdfgraph, 'Testing submission type: '+subj+", "+stype1) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"0") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir version 0 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=0", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + # Access dataset TestSubmission-testdir version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir version 2 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=2", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 4, "List should contain manifest.rdf, directory1, directory2 and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(len(state['subdir']['2']), 2, "Subdirectory for version 2 should be directory1 and directory2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['directory1'].keys()), 0, "File stats for directory1") + self.assertEqual(len(parts['directory2'].keys()), 0, "File stats for directory2") + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + def testFileUploadAndUnpack(self): + """PUT file contents to existing filename - PUT file contents to /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testrdf3.zip") + # Access content + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Put zip file, check response + zipdata2 = open("testdata/testdir.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata2, resource="items/TestSubmission/testrdf3.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check manifest for version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission/testrdf3.zip")) + subj3 = URIRef(self.getManifestUri("datasets/TestSubmission?version=3")) + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #self.failUnless((subj2,URIRef(dcterms+"hasVersion"),subj3) in rdfgraph, 'dcterms:isVersionOf') + # Access dataset version 3, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:locense') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"3") in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 4, "Four versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['versions'][3], '3', "Version 2") + self.assertEqual(state['currentversion'], '3', "Current version == 3") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testrdf3.zip") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf, testrdf3.zip") + self.assertEqual(len(state['files']['3']), 3, "List should contain manifest.rdf, testdir and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['subdir']['3'], ['directory'], "Subdirectory for version 3") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless("Created new data package" in state['versionlog']['0'], "Version 0 log") + self.failUnless("Added or updated file testrdf3.zip" in state['versionlog']['1'], "Version 1 log") + self.failUnless("Added or updated file testrdf3.zip" in state['versionlog']['2'], "Version 2 log") + self.failUnless("Unpacked file testrdf3.zip. Contents added as version 3" in state['versionlog']['3'], "Version 3 log") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + # Access and check zipfile content of version 1 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zipfile content of version 2 + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile!") + # Access and check file content of a resource in version 3 + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + + def testMetadataMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located in unpacked zipfile is munged with existing manifest of the dataset.""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf.zip, check response + fields = [] + zipdata = open("testdata/testrdf.zip").read() + files = \ + [ ("file", "testrdf.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = [ + ("filename", "testrdf.zip"), + ("id", "TestSubmission-testrdf") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf.zip")) in rdfgraph) + #self.failUnless((URIRef(base+"testrdf.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + base = self.getManifestUri("datasets/TestSubmission-testrdf/") + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"Grouping") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + #Get the file arabic.txt + (resp, arabic_data) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf/arabic.txt", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + #print type(arabic_data) + #for s, p, o in rdfgraph.triples((None, URIRef(dcterms+"description"), None)): + # print s, p, type(o), '\n', o + #print '\n', '-'*50 + #print Literal(arabic_data) + #print '\n', '-'*50 + #fr = open('testdata/testrdf/arabic.txt', 'r') + #arabic_data = fr.read() + #fr.close() + #print '\n', '-'*50 + #print Literal(arabic_data) + #print '\n', '-'*50 + #self.failUnless((subj,URIRef(dcterms+"description"),Literal(arabic_data)) in rdfgraph, 'dcterms:description') + # Delete the dataset TestSubmission-testrdf + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf", + expect_status="*", expect_reason="*") + os.remove('response.xml') + + def testMetadataInDirectoryMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within a folder in unpacked zipfile is munged with datsets existing manifest""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf2.zip, check response + fields = [] + zipdata = open("testdata/testrdf2.zip").read() + files = \ + [ ("file", "testrdf2.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in dataset + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"Grouping") + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + + def testReferencedMetadataMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within the unpacked zipfile is munged with datsets existing manifest. + Also, manifest.rdf in the unpacked zipfile, references other metadata files, using the property rdfs:seeAlso. + The metadata from these files are munged.""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf3.zip, check response + fields = [] + zipdata = open("testdata/testrdf3.zip").read() + files = \ + [ ("file", "testrdf3.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf3.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = [ + ("filename", "testrdf3.zip"), + ("id", "TestSubmission-testrdf3") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf3"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + dc = "http://purl.org/dc/elements/1.1/" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph) + #self.failUnless((URIRef(base+"testrdf3.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf3")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf3/testrdf3/directory/hebrew.txt")) + base = self.getManifestUri("datasets/TestSubmission-testrdf3/") + stype = URIRef(oxds+"Grouping") + stype2 = URIRef(oxds+"item") + self.assertEqual(len(rdfgraph),32,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset 3 with updated and merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/1a.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/1b.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/2a.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/3a.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/hebrew.txt")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/2aFiles/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dc+"description"),"file1.a is another file") in rdfgraph, 'dc:description') + self.failUnless((subj,URIRef(dc+"description"),"file1.b is another file") in rdfgraph, 'dc:description') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj2+", "+stype2) + self.failUnless((subj2,URIRef(dcterms+"title"),"Hebrew text") in rdfgraph, 'dcterms:title') + self.failUnless((subj2,URIRef(dcterms+"source"),"http://genizah.bodleian.ox.ac.uk/") in rdfgraph, 'dcterms:source') + #Get the file hebrew.txt + (resp, hebrew_data) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf3/testrdf3/directory/hebrew.txt", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + #self.failUnless((subj2,RDF.value,Literal(hebrew_data)) in rdfgraph, 'rdf:value') + self.failUnless((subj2,RDF.value,None) in rdfgraph, 'rdf:value') + # Delete the dataset TestSubmission-testrdf3 + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf3", + expect_status="*", expect_reason="*") + + def testReferencedMetadataMerging2(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within the unpacked zipfile is munged with datsets existing manifest. + Also, manifest.rdf in the unpacked zipfile, references other metadata files, using the property rdfs:seeAlso. + The metadata from these files are munged. One of the referenced files, references other files, which if they exists are also munged.""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf4.zip, check response + fields = [] + zipdata = open("testdata/testrdf4.zip").read() + files = \ + [ ("file", "testrdf4.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf4.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf4.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission/testrdf4/directory/file1.a")) + subj3 = URIRef(self.getManifestUri("datasets/TestSubmission/testrdf4/directory/file1.b")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + dc = "http://purl.org/dc/elements/1.1/" + stype = URIRef(oxds+"Grouping") + stype2 = URIRef(oxds+"item") + self.assertEqual(len(rdfgraph),29,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.b")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file2.a")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1a.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1b.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/2a.rdf")) in rdfgraph) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/test-csv.csv")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + #self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset 4 with updated and merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"title"),"Test item 2a") in rdfgraph, 'dcterms:title') + #self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("2aFiles")) in rdfgraph, 'dcterms:title') + #for s, p, o in rdfgraph.triples((None, RDF.type, None)): + # print s, p, o, type(o) + self.failUnless((subj2,RDF.type,stype2) in rdfgraph, 'Testing submission type: %s, %s'%(str(subj2), str(stype2))) + self.failUnless((subj2,URIRef(dc+"description"),"This is a archived test item 1a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,URIRef(dcterms+"title"),"Test item 1a") in rdfgraph, 'dcterms:title') + self.failUnless((subj3,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj3+", "+stype2) + self.failUnless((subj3,URIRef(dc+"description"),"This is test item 1b of type file") in rdfgraph, 'dc:description') + self.failUnless((subj3,URIRef(dcterms+"title"),"Test item 1b") in rdfgraph, 'dcterms:title') + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + def testZ1DeleteUserMembership(self): + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access user details, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + membershipExists = False + silo_name = RDFDatabankConfig.endpointpath.strip('/') + if [silo_name, 'submitter'] in data['groups']: + membershipExists = True + if membershipExists: + resp = self.doHTTP_DELETE( + endpointpath=RDFDatabankConfig.endpointpath, + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK") + else: + resp = self.doHTTP_DELETE( + endpointpath=RDFDatabankConfig.endpointpath, + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=400, expect_reason="Bad Request") + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath=RDFDatabankConfig.endpointpath, + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=404, expect_reason="Not Found") + # Access user details, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.failUnless([silo_name, 'submitter'] not in data['groups'], "User membership to silo not deleted") + return + + def testZ2DeleteSilo(self): + """List all silos your account has access to - GET /admin. If the silo 'sandbox' does not exist, create it""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name = RDFDatabankConfig.endpointpath.strip('/') + silolist = data + oldlen = len(silolist) + if silo_name in silolist: + resp = self.doHTTP_DELETE( + endpointpath="/", + resource="%s/admin"%silo_name, + expect_status=200, expect_reason="OK") + lenexpected = oldlen - 1 + else: + resp = self.doHTTP_DELETE( + endpointpath="/", + resource="%s/admin"%silo_name, + expect_status=404, expect_reason="Not Found") + lenexpected = oldlen + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="silos/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newsilolist = data + self.assertEquals(len(newsilolist), lenexpected, "number fo silos do not match") + for s in newsilolist: self.failUnless(s in silolist, "Silo "+s+" in new list, not in original list") + self.failUnless(silo_name not in newsilolist, "Silo '%s' is in new list"%silo_name) + return + + def testZ3DeleteUser(self): + """Create user sandbox_user""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name = RDFDatabankConfig.endpointpath.strip('/') + userExists = False + membershipExists = False + for user in data: + if RDFDatabankConfig.endpointuser in user['user_name']: + userExists = True + if userExists: + # Access user details, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK", expect_type="application/JSON") + if len(data['groups']) > 0: + membershipExists = True + if membershipExists: + resp = self.doHTTP_DELETE( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=403, expect_reason="Forbidden") + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK") + else: + resp = self.doHTTP_DELETE( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=200, expect_reason="OK") + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=404, expect_reason="Not Found") + else: + resp = self.doHTTP_DELETE( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=400, expect_reason="Bad Request") + #Access user details + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="users/%s"%RDFDatabankConfig.endpointuser, + expect_status=404, expect_reason="Not Found") + return + + # Sentinel/placeholder tests + + def testUnits(self): + assert (True) + + def testComponents(self): + assert (True) + + def testIntegration(self): + assert (True) + + def testPending(self): + #Need to have performance tests and analyse performance + #Need to set the permission of file being uploaded + #assert (False), "Pending tests follow" + #TODO: Write tests to POST 'text' to existing dataset + #TODO: Write tests to POST 'text' to new dataset and set embargo info + assert (True) + +# Assemble test suite + +def getTestSuite(select="unit"): + """ + Get test suite + + select is one of the following: + "unit" return suite of unit tests only + "component" return suite of unit and component tests + "all" return suite of unit, component and integration tests + "pending" return suite of pending tests + name a single named test to be run + """ + testdict = { + "unit": + [ "testUnits" + , "test01CreateUser" + , "test02CreateSilo" + , "test03AddUserMembership" + , "testListSilos" + , "testListDatasets" + , "testSiloState" + , "testDatasetNotPresent" + , "testDatasetCreation" + , "testDatasetRecreation" + , "testDeleteDataset" + , "testDatasetNaming" + , "testDatasetStateInformation" + , "testEmbargoOnCreation" + , "testFileUpload" + , "testFileUploadtoNewDataset" + , "testFileDelete" + , "testFileUpdate" + , "testGetDatasetByVersion" + , "testPostMetadataFile" + , "testMetadataFileUpdate" + , "testMetadataFileDelete" + , "testPutCreateFile" + , "testPutUpdateFile" + , "testPutMetadataFile" + , "testUnicodeMetadataFileUpdate" + , "testDeleteEmbargo" + , "testChangeEmbargo" + , "testFileUnpack" + , "testSymlinkFileUnpack" + , "testFileUploadAndUnpack" + , "testMetadataMerging" + , "testMetadataInDirectoryMerging" + , "testFileUploadToUnpackedDataset" + , "testUpdateUnpackedDataset" + , "testReferencedMetadataMerging" + , "testReferencedMetadataMerging2" + , "testZ1DeleteUserMembership" + , "testZ2DeleteSilo" + , "testZ3DeleteUser" + ], + "component": + [ "testComponents" + ], + "integration": + [ "testIntegration" + ], + "pending": + [ "testPending" + ] + } + return TestUtils.getTestSuite(TestSubmission, testdict, select=select) + +if __name__ == "__main__": + TestUtils.runTests("TestSubmission.log", getTestSuite, sys.argv) + +# End. diff --git a/rdfdatabank/tests/TestSubmission_load.py b/rdfdatabank/tests/TestSubmission_load.py new file mode 100644 index 0000000..25a3f31 --- /dev/null +++ b/rdfdatabank/tests/TestSubmission_load.py @@ -0,0 +1,348 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Databank submission test cases +""" + +import os, os.path +from datetime import datetime, timedelta +from dateutil.relativedelta import * +from time import sleep +import sys +import unittest +import logging +import httplib +import urllib +import codecs +from uuid import uuid4 +try: + # Running Python 2.5 with simplejson? + import simplejson as json +except ImportError: + import json + +#My system is running rdflib version 2.4.2. So adding rdflib v3.0 to sys path +#rdflib_path = os.path.join(os.getcwd(), 'rdflib') +#sys.path.insert(0, rdflib_path) +#import rdflib +#from rdflib.namespace import RDF +#from rdflib.graph import Graph +#from rdflib.plugins.memory import Memory +#from rdflib import URIRef +#from rdflib import Literal +#rdflib.plugin.register('sparql',rdflib.query.Processor,'rdfextras.sparql.processor','Processor') +#rdflib.plugin.register('sparql', rdflib.query.Result, +# 'rdfextras.sparql.query', 'SPARQLQueryResult') + +from StringIO import StringIO + +from rdflib import RDF, URIRef, Literal +from rdflib.Graph import ConjunctiveGraph as Graph + +#from time import sleep +#import subprocess + +if __name__ == "__main__": + # For testing: + # add main library directory to python path if running stand-alone + sys.path.append("..") + +#from MiscLib import TestUtils +from testlib import TestUtils +from testlib import SparqlQueryTestCase + +#from RDFDatabankConfigProd import RDFDatabankConfig as RC +from RDFDatabankConfig import RDFDatabankConfig as RC + +RDFDatabankConfig = RC() +logger = logging.getLogger('TestSubmission') + +class TestSubmission(SparqlQueryTestCase.SparqlQueryTestCase): + """ + Test simple dataset submissions to RDFDatabank + """ + def setUp(self): + self.setRequestEndPoint( + endpointhost=RDFDatabankConfig.endpointhost, # Via SSH tunnel + endpointpath=RDFDatabankConfig.endpointpathl) + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointuser, + endpointpass=RDFDatabankConfig.endpointpass) + self.setRequestUriRoot( + manifesturiroot=RDFDatabankConfig.granary_uri_root) + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointuser, + endpointpass=RDFDatabankConfig.endpointpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + return + + def tearDown(self): + return + + # Create empty test submission dataset + def createSubmissionDataset(self, dataset_id='TestSubmission'): + # Create a new dataset, check response + fields = \ + [ ("id", dataset_id) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/%s"%(self._endpointpath, dataset_id) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return + + def uploadSubmissionZipfile(self, dataset_id='TestSubmission', file_to_upload="testdir.zip", filename=None): + # Submit ZIP file, check response + fields = [] + if filename: + fields = \ + [ ("filename", filename) + ] + else: + filename = file_to_upload + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/%s/"%dataset_id, + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/%s/%s"%(self._endpointpath, dataset_id, filename) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return zipdata + + def updateSubmissionZipfile(self, dataset_id='TestSubmission', file_to_upload="testdir.zip", filename=None): + # Submit ZIP file, check response + fields = [] + if filename: + fields = \ + [ ("filename", filename) + ] + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/%s/"%dataset_id, + expect_status=204, expect_reason="No Content") + return zipdata + + # Actual tests follow + def test01CreateSilo(self): + """List all silos your account has access to - GET /admin. If the silo 'sandbox' does not exist, create it""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name = RDFDatabankConfig.endpointpathl.strip('/') + silolist = data + if not silo_name in silolist: + #Create new silo + owner_list = [RDFDatabankConfig.endpointadminuser] + if not RDFDatabankConfig.endpointuser in owner_list: + owner_list.append(RDFDatabankConfig.endpointuser) + owner_list = ",".join(owner_list) + fields = \ + [ ("silo", silo_name), + ("title", "Sandbox silo"), + ("description", "Sandbox silo for testing"), + ("notes", "Created by test"), + ("owners", owner_list), + ("disk_allocation", "100000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, resource="admin/", endpointpath="/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s"%silo_name + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newsilolist = data + self.failUnless(len(newsilolist)>0, "No silos returned") + self.assertEquals(len(newsilolist), len(silolist)+1, "One additional silo should have been returned") + for s in silolist: self.failUnless(s in newsilolist, "Silo "+s+" in original list, not in new list") + self.failUnless(silo_name in newsilolist, "Silo '%s' not in new list"%silo_name) + return + + def testFileUploadBulk(self): + for i in range(0, 50000): + """Upload file to dataset - POST file to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + start = datetime.now() + dataset_id= uuid4().hex + f = open('test_times.log', 'a') + f.write('%s: Creating and uploading file to dataset %s \n'%(start.isoformat(), dataset_id)) + f.close() + self.createSubmissionDataset(dataset_id=dataset_id) + #Access state information + (resp, respdata) = self.doHTTP_GET( + resource="states/%s"%dataset_id, + expect_status=200, expect_reason="OK", expect_type="application/json") + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile(dataset_id=dataset_id, file_to_upload='images.zip', filename='images.zip') + end = datetime.now() + delta = end - start + time_used = delta.days * 86400 + delta.seconds + f = open('test_times.log', 'a') + f.write(' Time taken: %s \n\n'%str(time_used)) + f.close() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/%s"%dataset_id, + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/%s"%dataset_id)) + base = self.getManifestUri("datasets/%s/"%dataset_id) + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"images.zip")) in rdfgraph) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/%s/images.zip"%dataset_id, + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/%s"%dataset_id, + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 12, "States") + self.assertEqual(state['item_id'], dataset_id, "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and images.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointuser, "Created by") + d = (datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + self.failUnless('Created new data package' in state['versionlog']['0'], "Version 0 log") + self.failUnless('Added or updated file images.zip' in state['versionlog']['1'], "Version 1 log") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=%s'%dataset_id].keys()), 13, "File stats for 4=%s"%dataset_id) + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['images.zip'].keys()), 13, "File stats for images.zip") + #sleep(1) + + # Sentinel/placeholder tests + + def testUnits(self): + assert (True) + + def testComponents(self): + assert (True) + + def testIntegration(self): + assert (True) + + def testPending(self): + #Need to have performance tests and analyse performance + #Need to set the permission of file being uploaded + #assert (False), "Pending tests follow" + assert (True) + +# Assemble test suite + +def getTestSuite(select="unit"): + """ + Get test suite + + select is one of the following: + "unit" return suite of unit tests only + "component" return suite of unit and component tests + "all" return suite of unit, component and integration tests + "pending" return suite of pending tests + name a single named test to be run + """ + testdict = { + "unit": + [ "testUnits" + , "test01CreateSilo" + , "testFileUploadBulk" + ], + "component": + [ "testComponents" + ], + "integration": + [ "testIntegration" + ], + "pending": + [ "testPending" + ] + } + return TestUtils.getTestSuite(TestSubmission, testdict, select=select) + +if __name__ == "__main__": + TestUtils.runTests("TestSubmission.log", getTestSuite, sys.argv) + +# End. diff --git a/rdfdatabank/tests/TestSubmission_submitter.py b/rdfdatabank/tests/TestSubmission_submitter.py new file mode 100644 index 0000000..98053cc --- /dev/null +++ b/rdfdatabank/tests/TestSubmission_submitter.py @@ -0,0 +1,8347 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +Copyright (c) 2012 University of Oxford + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, --INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +""" + +""" +Databank submission test cases for user with role submitter. +These tests are for a databank instance with visible metadata +""" +import os, os.path +import datetime +from dateutil.relativedelta import * +import sys +import unittest +import logging +import httplib +import urllib +import codecs +try: + # Running Python 2.5 with simplejson? + import simplejson as json +except ImportError: + import json + +#My system is running rdflib version 2.4.2. So adding rdflib v3.0 to sys path +#rdflib_path = os.path.join(os.getcwd(), 'rdflib') +#sys.path.insert(0, rdflib_path) +#import rdflib + +from StringIO import StringIO + +from rdflib import RDF, URIRef, Literal +from rdflib.Graph import ConjunctiveGraph as Graph + +if __name__ == "__main__": + # For testing: + # add main library directory to python path if running stand-alone + sys.path.append("..") + +#from MiscLib import TestUtils +from testlib import TestUtils +from testlib import SparqlQueryTestCase + +from RDFDatabankConfig import RDFDatabankConfig as RC +RDFDatabankConfig = RC() + +logger = logging.getLogger('TestSubmission') + +class TestSubmission(SparqlQueryTestCase.SparqlQueryTestCase): + """ + Test simple dataset submissions to RDFDatabank + """ + def setUp(self): + self.setRequestEndPoint( + endpointhost=RDFDatabankConfig.endpointhost, # Via SSH tunnel + endpointpath=RDFDatabankConfig.endpointpath) + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + self.setRequestUriRoot( + manifesturiroot=RDFDatabankConfig.granary_uri_root) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + return + + def tearDown(self): + return + + # Create empty test submission dataset + def createSubmissionDataset(self): + d = (datetime.datetime.now() + datetime.timedelta(days=365*4)).isoformat() + # Create a new dataset, check response + fields = \ + [ ("id", "TestSubmission"), + ('embargoed', 'True'), + ('embargoed_until', d) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return d + + def uploadSubmissionZipfile(self, file_to_upload="testdir.zip"): + # Submit ZIP file, check response + fields = [] + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/%s"%(self._endpointpath, file_to_upload) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + return zipdata + + def updateSubmissionZipfile(self, file_to_upload="testdir.zip", filename=None): + # Submit ZIP file, check response + fields = [] + if filename: + fields = \ + [ ("filename", filename) + ] + zipdata = open("testdata/%s"%file_to_upload).read() + files = \ + [ ("file", file_to_upload, zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + return zipdata + + + + # Actual tests follow + def test01CreateSilo(self): + """This test is a part of the testcase setup. So not testing for different users""" + """List all silos your account has access to - GET /admin. If the silo 'sandbox' does not exist, create it""" + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name = RDFDatabankConfig.endpointpath.strip('/') + silolist = data + if not silo_name in silolist: + #Create new silo + #Add owners + owner_list = [ + RDFDatabankConfig.endpointadminuser + ,RDFDatabankConfig.endpointmanageruser + ,RDFDatabankConfig.endpointsubmitteruser + ,RDFDatabankConfig.endpointadminuser2 + ,RDFDatabankConfig.endpointmanageruser2 + ,RDFDatabankConfig.endpointsubmitteruser2 + ] + owner_list = ",".join(owner_list) + fields = \ + [ ("silo", silo_name), + ("title", "Sandbox silo"), + ("description", "Sandbox silo for testing"), + ("notes", "Created by test"), + ("owners", owner_list), + ("disk_allocation", "100000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, resource="admin/", endpointpath="/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s"%silo_name + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newsilolist = data + self.failUnless(len(newsilolist)>0, "No silos returned") + self.assertEquals(len(newsilolist), len(silolist)+1, "One additional silo should have been returned") + for s in silolist: self.failUnless(s in newsilolist, "Silo "+s+" in original list, not in new list") + self.failUnless(silo_name in newsilolist, "Silo '%s' not in new list"%silo_name) + + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + silo_name2 = RDFDatabankConfig.endpointpath2.strip('/') + silolist = data + if not silo_name2 in silolist: + #Create new silo + #Add owners + owner_list = [ + RDFDatabankConfig.endpointadminuser3 + ,RDFDatabankConfig.endpointmanageruser3 + ,RDFDatabankConfig.endpointsubmitteruser3 + ] + owner_list = ",".join(owner_list) + fields = \ + [ ("silo", silo_name2), + ("title", "Sandbox silo 2"), + ("description", "Sandbox silo 2 for testing"), + ("notes", "Created by test"), + ("owners", owner_list), + ("disk_allocation", "100000") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, resource="admin/", endpointpath="/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "/%s"%silo_name2 + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access list silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath="/", + resource="admin/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newsilolist = data + self.failUnless(len(newsilolist)>0, "No silos returned") + self.assertEquals(len(newsilolist), len(silolist)+1, "One additional silo should have been returned") + for s in silolist: self.failUnless(s in newsilolist, "Silo "+s+" in original list, not in new list") + self.failUnless(silo_name2 in newsilolist, "Silo '%s' not in new list"%silo_name2) + return + + + + def testListSilos(self): + """List all silos your account has access to - GET /silo""" + # Access list of silos, check response + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + # check list of silos is not empty + self.failUnless(len(data)>0, "No silos returned") + self.failUnless(RDFDatabankConfig.endpointpath.strip('/') in data, "%s not in silo list"%RDFDatabankConfig.endpointpath.strip('/')) + silolist = data + + # Access list of silos as admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in admin list") + + # Access list of silos as manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in manager list") + + # Access list of silos as submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in submitter 2 list") + + # Access list of silos as general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in general list") + + # Access list of silos as admin3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in admin3 list") + + # Access list of silos as manager3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in manager 3 list") + + # Access list of silos as submitter3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data) = self.doHTTP_GET( + endpointpath=None, + resource="/silos/", + expect_status=200, expect_reason="OK", expect_type="application/JSON") + self.assertEqual(len(data), len(silolist), "Silos returned for submitter and admin are different") + for s in data: self.failUnless(s in silolist, "Silo "+s+" in submitter list, not in submitter 3 list") + + + + def testListDatasets(self): + """List all datasets in a silo - GET /silo_name/datasets""" + # Access list of datasets in the silo as submitter, check response + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Save initial list of datasets + datasetlist = data.keys() + #datasetlist = [] + #for k in data: + # datasetlist.append(k) + #Access as other users and check it is the same as data + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin not equal to list as submitter') + #manager user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager not equal to list as submitter') + #submitter user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as general not equal to list as submitter') + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin3 not equal to list as submitter') + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager3 not equal to list as submitter') + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + + # Create a new dataset + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + self.createSubmissionDataset() + + # Read list of datasets, check that new list is original + new dataset + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = [] + for k in data: + newlist.append(k) + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist)+1, "One additional dataset") + for ds in datasetlist: self.failUnless(ds in newlist, "Dataset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless((ds in datasetlist) or (ds == "TestSubmission"), "Datset "+ds+" in new list, not in original list") + self.failUnless("TestSubmission" in newlist, "testSubmission in new list") + #Access as other users and check it is the same as data + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin not equal to list as submitter') + #manager user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager not equal to list as submitter') + #submitter user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as general not equal to list as submitter') + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin3 not equal to list as submitter') + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager3 not equal to list as submitter') + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + + # Delete new dataset + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # read list of datasets, check result is same as original list + (resp, data) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + newlist = [] + for k in data: + newlist.append(k) + logger.debug("Orig. length "+str(len(datasetlist))+", new length "+str(len(newlist))) + self.assertEquals(len(newlist), len(datasetlist), "Back to original content in silo") + for ds in datasetlist: self.failUnless(ds in newlist, "Datset "+ds+" in original list, not in new list") + for ds in newlist: self.failUnless(ds in datasetlist, "Datset "+ds+" in new list, not in original list") + #Access as other users and check it is the same as data + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin not equal to list as submitter') + #manager user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager not equal to list as submitter') + #submitter user of this silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as general not equal to list as submitter') + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as admin3 not equal to list as submitter') + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as manager3 not equal to list as submitter') + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data2) = self.doHTTP_GET( + resource="datasets/", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data2, data, 'List of silos as submitter not equal to list as submitter') + + + + def testSiloState(self): + """Get state informaton of a silo - GET /silo_name/states""" + # Access state information of silo for submitter, check response + (resp, data) = self.doHTTP_GET(resource="states/", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + #Access state info as other users + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=200, expect_reason="OK", expect_type="application/json") + + #manager user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=200, expect_reason="OK", expect_type="application/json") + + #submitter user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + + + def testDatasetNotPresent(self): + """Verify dataset is not present - GET /silo_name/dataset_name""" + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #Access dataset as other users + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #manager user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #submitter user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #manager user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + #submitter user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, respdata) = self.doHTTP_GET(resource="TestSubmission", + expect_status=404, expect_reason="Not Found") + + + + def testDatasetCreation(self): + """Create dataset - POST id to /silo_name""" + # Create a new dataset as submitter, check response + d = self.createSubmissionDataset() + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointsubmitteruser) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + #Admin user of this silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = \ + [ ("id", "TestSubmission2") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission2"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission2")) + self.assertEqual(len(rdfgraph), 10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointadminuser) in rdfgraph, 'dcterms:mediator') + + #manager user of this silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = \ + [ ("id", "TestSubmission3") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission3"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission3")) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointmanageruser) in rdfgraph, 'dcterms:mediator') + + #General user - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #Admin user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #manager user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #submitter user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission2", + expect_status=200, expect_reason="*") + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission3", + expect_status=200, expect_reason="*") + + + + def testDatasetCreation2(self): + """Create dataset - POST to /silo_name/dataset_name""" + # Create a new dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata)= self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointsubmitteruser) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + #Admin user of this silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + d = (datetime.datetime.now() + datetime.timedelta(days=365*4)).isoformat() + fields = \ + [ ("id", "TestSubmission2"), + ('embargoed', 'True'), + ('embargoed_until', d) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission2", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission2"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission2")) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointadminuser) in rdfgraph, 'dcterms:mediator') + + #manager user of this silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = \ + [ ("id", "TestSubmission3"), + ('embargoed', 'True'), + ('embargoed_until', d) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission3", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission3"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission3")) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointmanageruser) in rdfgraph, 'dcterms:mediator') + + #General user - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission4", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #Admin user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission4", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #manager user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission4", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + #submitter user of another silo - Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + fields = \ + [ ("id", "TestSubmission4") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission4", + expect_status=403, expect_reason="Forbidden") + # Access dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission4", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission2", + expect_status=200, expect_reason="*") + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission3", + expect_status=200, expect_reason="*") + + + + def testDatasetRecreation(self): + """Create dataset - POST existing id to /silo_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=409, expect_reason="Conflict: Dataset Already Exists") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=409, expect_reason="Conflict: Dataset Already Exists") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + + #manager user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=409, expect_reason="Conflict: Dataset Already Exists") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + + #submitter user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=409, expect_reason="Conflict: Dataset Already Exists") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=400, expect_reason="Bad request") + + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=403, expect_reason="Forbidden") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=403, expect_reason="Forbidden") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + #Recreate the dataset, check response + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets", + expect_status=403, expect_reason="Forbidden") + #Recreate the dataset, check response + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + + # Access dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"mediator"),RDFDatabankConfig.endpointsubmitteruser) in rdfgraph, 'dcterms:mediator') + + + + def testDeleteDataset(self): + """Delete dataset - DELETE /silo_name/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Access dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + #Delete dataset by users not permitted to + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=401, expect_reason="Unauthorized") + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #manager user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #submitter user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #Another submitter user of same silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + + # Delete dataset by submitter, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + + # Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + self.createSubmissionDataset() + # Access dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Delete dataset by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + + # Create a new dataset, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + self.createSubmissionDataset() + # Access dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Delete dataset by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK") + # Access dataset, test response indicating non-existent + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=404, expect_reason="Not Found") + + + + def testDatasetNaming(self): + """Create dataset - POST to /silo_name/dataset_name. If name is valid, return 201, else return 403""" + names = [("TestSubmission-1", 201, "Created") + ,("TestSubmission_2", 201, "Created") + ,("TestSubmission:3", 201, "Created") + ,("TestSubmission*4", 403, "Forbidden") + ,("TestSubmission/5", 404, "Not Found") + ,("TestSubmission\6", 403, "Forbidden") + ,("TestSubmission,7", 403, "Forbidden") + ,("TestSubmission&8", 403, "Forbidden") + ,("TestSubmission.9", 403, "Forbidden") + ,("""Test"Submission""", 403, "Forbidden") + ,("Test'Submission", 403, "Forbidden") + #,("""Test Submission""", 403, "Forbidden") #The name is truncated to Test and dataset is created. This does not happen when using the form + ,("TestSubmission$", 403, "Forbidden") + ,("T", 403, "Forbidden") + ] + names = [("TestSubmission-1", 201, "Created") + ,("TestSubmission_2", 201, "Created") + ,("TestSubmission:3", 201, "Created") + ,("TestSubmission*4", 400, "Bad request. Dataset name not valid") + ,("TestSubmission/5", 404, "Not Found") + ,("TestSubmission\6", 400, "Bad request. Dataset name not valid") + ,("TestSubmission,7", 400, "Bad request. Dataset name not valid") + ,("TestSubmission&8", 400, "Bad request. Dataset name not valid") + ,("TestSubmission.9", 400, "Bad request. Dataset name not valid") + ,("""Test"Submission""", 400, "Bad request. Dataset name not valid") + ,("Test'Submission", 400, "Bad request. Dataset name not valid") + #,("""Test Submission""", 403, "Forbidden") #The name is truncated to Test and dataset is created. This does not happen when using the form + ,("TestSubmission$", 400, "Bad request. Dataset name not valid") + ,("T", 400, "Bad request. Dataset name not valid") + ] + fields = [] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + for name, status, reason in names: + #Create a new dataset, check response + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/%s"%name, + expect_status=status, expect_reason=reason) + # Access dataset, check response + if status == 201: + LHobtained = urllib.unquote(resp.getheader('Content-Location', None)) + LHexpected = "%sdatasets/%s"%(self._endpointpath, name) + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/%s"%name, + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + elif status == 403 or status == 400: + (resp, respdata) = self.doHTTP_GET( + resource="datasets/%s"%name, + expect_status=404, expect_reason="Not Found") + #Delete Datasets + for name, status, reason in names: + if not status == 201: + continue + resp = self.doHTTP_DELETE( + resource="datasets/%s"%name, + expect_status=200, expect_reason="OK") + + + + def testDatasetStateInformation(self): + """Get state information of dataset - GET /silo_name/states/dataset_name.""" + # Create a new dataset by submitter, check response + d = self.createSubmissionDataset() + # Access state info + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 1, "Initially one version") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['currentversion'], '0', "Current version == 0") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], d, "Embargoed until?") + # date + # version_dates + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + # Access state info by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data, data2, "State info accesses by admin is different from submitter") + + # Access state info by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + self.assertEqual(data, data2, "State info accesses by manager is different from submitter") + + # Access state info by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + # Access state info by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + # Access state info by admin3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + # Access state info by manager3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + # Access state info by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, data2) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + + + def testFileUpload(self): + """Upload file to dataset - POST file to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + d = self.createSubmissionDataset() + #Access state information + (resp, respdata) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + # Upload zip file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = [] + zipdata = open("testdata/testdir2.zip").read() + files = \ + [ ("file", 'testdir2.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Upload zip file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = [] + zipdata = open("testdata/testrdf.zip").read() + files = \ + [ ("file", 'testrdf.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + #Prepare data to upload + fields = [] + zipdata = open("testdata/testrdf2.zip").read() + files = \ + [ ("file", 'testrdf2.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + + # Upload zip file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + + + def testFileDelete(self): + """Delete file in dataset - DELETE /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + d = self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Delete file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check zip file does not exist + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Delete file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Delete file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Delete file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + + # Delete file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=401, expect_reason="Unauthorized") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + + # Delete file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + + # Delete file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + + # Delete file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file does not exist + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + + + + def testFileUpdate(self): + """Update file in dataset - POST file to /silo_name/datasets/dataset_name (x 2)""" + # Create a new dataset, check response + d = self.createSubmissionDataset() + # Upload zip file, check response (uploads the file testdir.zip) + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content and version + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Upload zip file again, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="testdir2.zip", filename="testdir.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + # Update zip file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = [] + zipdata = open("testdata/testrdf.zip").read() + files = \ + [ ("file", 'testdir.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated") + + # Update zip file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = [] + zipdata = open("testdata/testrdf2.zip").read() + files = \ + [ ("file", 'testdir.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + #Prepare data to upload + fields = [] + zipdata2 = open("testdata/testrdf3.zip").read() + files = \ + [ ("file", 'testdir.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + # Update zip file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + # Update zip file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + # Update zip file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + # Update zip file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + # Update zip file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "zipfile not updated!") + + + + def testGetDatasetByVersionByURI(self): + """Upload files to a dataset - POST file to /silo_name/datasets/dataset_name. + Access each of the versions and the files in that version""" + #Definitions + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + #---------Version 0 + # Create a new dataset, check response + d = self.createSubmissionDataset() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + #---------Version 1 + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #---------Version 2 + # Upload zip file, check response + zipdata2 = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - testdir.zip!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + #---------Version 3 + # Delete file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + #---------Version 4 + # Update zip file, check response + zipdata3 = self.updateSubmissionZipfile(file_to_upload="testrdf4.zip", filename="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + #=========Access each of the versions + #---------Version 0 + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission/version0", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + #---------Version 1 + # Access and check list of contents of version 1 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 1!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission/version1", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + #---------Version 2 + # Access and check list of contents of version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),d) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 2!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - Version 2!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission/version2", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 3 + # Access and check list of contents of version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 4 + # Access and check list of contents of version 4 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version4", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version4", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile - Version 4!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version4", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission/version4", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['versions'],['0', '1', '2', '3', '4'], "Versions") + self.assertEqual(state['currentversion'], '4', "Current version == 4") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testdir2.zip") + self.assertEqual(len(state['files']['3']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['files']['4']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['metadata_files']['4']), 0, "metadata_files of version 4") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(len(state['subdir']['4']), 0, "Subdirectory count for version 4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + # Access and check list of contents of version 5 + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version5", + expect_status=404, expect_reason="Not Found") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version5", + expect_status=404, expect_reason="Not Found") + + #Access version as other users + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=404, expect_reason="Not Found") + + #manager user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=404, expect_reason="Not Found") + + #submitter user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=403, expect_reason="Forbidden") + + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=403, expect_reason="Forbidden") + + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=403, expect_reason="Forbidden") + + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission/version3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip/version3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip/version3", + expect_status=403, expect_reason="Forbidden") + + + + def testGetDatasetByVersionByParameter(self): + """Upload files to a dataset - POST file to /silo_name/datasets/dataset_name. + Access each of the versions and the files in that version""" + #Definitions + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + #---------Version 0 + # Create a new dataset, check response + self.createSubmissionDataset() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + #---------Version 1 + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + #---------Version 2 + # Upload zip file, check response + zipdata2 = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - testdir.zip!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + #---------Version 3 + # Delete file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + #---------Version 4 + # Update zip file, check response + zipdata3 = self.updateSubmissionZipfile(file_to_upload="testrdf4.zip", filename="testdir2.zip") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=404, expect_reason="Not Found") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile2, "Difference between local and remote zipfile - testdir2.zip!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + #=========Access each of the versions + #---------Version 0 + # Access and check list of contents of version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=0", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + #---------Version 1 + # Access and check list of contents of version 1 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 1!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=1", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + #---------Version 2 + # Access and check list of contents of version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile - Version 2!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile - Version 2!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=2", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 3 + # Access and check list of contents of version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + #---------Version 4 + # Access and check list of contents of version 4 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=4", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=4", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile - Version 4!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=4", + expect_status=404, expect_reason="Not Found") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission?version=4", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['versions'],['0', '1', '2', '3', '4'], "Versions") + self.assertEqual(state['currentversion'], '4', "Current version == 4") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testdir2.zip") + self.assertEqual(len(state['files']['3']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['files']['4']), 2, "List should contain manifest.rdf and testdir2.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['metadata_files']['4']), 0, "metadata_files of version 4") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(len(state['subdir']['4']), 0, "Subdirectory count for version 4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + # Access and check list of contents of version 5 + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=5", + expect_status=404, expect_reason="Not Found") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=5", + expect_status=404, expect_reason="Not Found") + + #Access version as other users + #Admin user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=404, expect_reason="Not Found") + + #manager user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile - Version 3!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=404, expect_reason="Not Found") + + #submitter user of this silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=403, expect_reason="Forbidden") + + #General user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + #Admin user of another silo + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=403, expect_reason="Forbidden") + + #manager user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=403, expect_reason="Forbidden") + + #submitter user of another silo + data2 = None + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + #Access dataset for version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Access and check zip file content - under embargo + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip?version=3", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=403, expect_reason="Forbidden") + + + + def testPostMetadataFile(self): + """POST manifest to dataset - POST manifest.rdf to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="ww1-860b-manifest.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + bibo = "http://purl.org/ontology/bibo/" + geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" + foaf = "http://xmlns.com/foaf/0.1/" + address = "http://schemas.talis.com/2005/address/schema#" + stype = URIRef(oxds+"DataSet") + stype2 = URIRef(bibo+"DocumentPart") + self.assertEqual(len(rdfgraph),42,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1-1123")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"creator"),"Thomas, Edward") in rdfgraph, 'dcterms:creator') + self.failUnless((subj,URIRef(dcterms+"title"),"Two Houses") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"description"),"This manuscript is untitled but entitled 'Two Houses' in Edward Thomas Collected Poems") in rdfgraph, 'dcterms:description') + self.failUnless((subj,URIRef(dcterms+"spatial"),"London") in rdfgraph, 'dcterms:spatial') + self.failUnless((subj,URIRef(dcterms+"format"),"Notebook") in rdfgraph, 'dcterms:format') + self.failUnless((subj,URIRef(dcterms+"medium"),"Paper") in rdfgraph, 'dcterms:medium') + self.failUnless((subj,URIRef(dcterms+"type"),"Poem") in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(bibo+"number"),"13") in rdfgraph, 'bibo:number') + self.failUnless((subj,URIRef(dcterms+"source"),"MS Don d.28 f.13") in rdfgraph, 'dcterms:source') + self.failUnless((subj,URIRef(dcterms+"contributor"),"Everett Sharp") in rdfgraph, 'dcterms:contributor') + self.failUnless((subj,URIRef(dcterms+"identifier"),"ETBODDOND28-13.jpg") in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"rightsHolder"),"Copyright of The Bodleian Library, Oxford University / The Edward Thomas Literary Estate") in rdfgraph, 'dcterms:rightsHolder') + self.failUnless((subj,RDF.value,"51.501") in rdfgraph, 'rdf:value') + #self.failUnless((subj,URIRef(dcterms+"created"),"1915-07-22") in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"type"),URIRef("http://purl.org/dc/dcmitype/StillImage")) in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"spatial"),None) in rdfgraph, 'dcterms:spatial') + self.failUnless((None,URIRef(geo+"lat"),"51.501") in rdfgraph, 'geo:lat') + self.failUnless((None,URIRef(geo+"long"),"-0.1254") in rdfgraph, 'geo:long') + self.failUnless((subj,URIRef(bibo+"owner"),None) in rdfgraph, 'bibo:owner') + self.failUnless((None,RDF.type,URIRef(foaf+"Organization")) in rdfgraph, 'rdf:type') + self.failUnless((None,URIRef(foaf+"name"),"Bodleian Library, University of Oxford") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(address+"streetAddress"),"Western Manuscripts Collections") in rdfgraph, 'address:streetAddress') + self.failUnless((None,URIRef(address+"streetAddress"),"Broad Street") in rdfgraph, 'address:streetAddress') + self.failUnless((None,URIRef(address+"localityName"),"Oxford") in rdfgraph, 'address:localityName') + self.failUnless((None,URIRef(address+"regionName"),"Oxfordshire") in rdfgraph, 'address:regionName') + self.failUnless((None,URIRef(address+"postalCode"),"OX13BG") in rdfgraph, 'address:postalCode') + self.failUnless((None,URIRef(address+"countryName"),"United Kingdom") in rdfgraph, 'address:countryName') + self.failUnless((None,URIRef(foaf+"homepage"),"http://www.bodley.ox.ac.uk/") in rdfgraph, 'foaf:homepage') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + # Upload metadata file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = [] + zipdata = open("testdata/manifest-admin.rdf").read() + files = \ + [ ("file", 'manifest.rdf', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),44,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"description"),"Changes made by admin") in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + + # Upload metadata file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = [] + zipdata = open("testdata/manifest-manager.rdf").read() + files = \ + [ ("file", 'manifest.rdf', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=204, expect_reason="No Content") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"description"),"Changes made by manager") in rdfgraph, 'dcterms:rights') + + #Prepare data for upload + fields = [] + zipdata = open("testdata/manifest-general.rdf").read() + files = \ + [ ("file", 'manifest.rdf', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + # Update metadata file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + + # Update metadata file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + + # Update metadata file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + + # Update metadata file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + + # Update metadata file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),45,'Graph length %i' %len(rdfgraph)) + + + + def testMetadataFileUpdate(self): + """POST manifest to dataset - POST manifest.rdf to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + bibo = "http://purl.org/ontology/bibo/" + geo = "http://www.w3.org/2003/01/geo/wgs84_pos#" + foaf = "http://xmlns.com/foaf/0.1/" + address = "http://schemas.talis.com/2005/address/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Update metadata file, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="ww1-2862-manifest.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype2 = URIRef(bibo+"Document") + doctext = """
She had a name among the children; +
But no one loved though someone owned +
Her, locked her out of doors at bedtime +
And had her kittens duly drowned. +
In Spring, nevertheless, this cat +
Ate blackbirds, thrushes, nightingales, +
And birds of bright voice and plume and flight, +
As well as scraps from neighbours' pails. +
I loathed and hated her for this; +
One speckle on a thrush's breast +
Was worth a million such; and yet +
She lived long, till God gave her rest. +
""" + self.assertEqual(len(rdfgraph),32,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),'A Cat') in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://databank.ora.ox.ac.uk/ww1archives/datasets/ww1-2862")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"isPartOf"),URIRef("https://databank.ora.ox.ac.uk/ww1archives/datasets/ww1")) in rdfgraph, 'dcterms:isPartOf') + self.failUnless((subj,URIRef(dcterms+"creator"),"Thomas, Edward") in rdfgraph, 'dcterms:creator') + self.failUnless((subj,URIRef(dcterms+"type"),"Poem") in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"type"),URIRef("http://purl.org/dc/dcmitype/Text")) in rdfgraph, 'dcterms:type') + self.failUnless((subj,URIRef(dcterms+"rightsHolder"),"Copyright Edward Thomas, 1979, reproduced under licence from Faber and Faber Ltd.") in rdfgraph, 'dcterms:rightsHolder') + self.failUnless((subj,RDF.value,Literal(doctext)) in rdfgraph, 'rdf:value') + self.failUnless((subj,URIRef(dcterms+"source"),"Edward Thomas Collected Poems") in rdfgraph, 'dcterms:source') + #self.failUnless((subj,URIRef(dcterms+"created"),"1979-01-01/1979-12-31") in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(bibo+"editor"),"Thomas, George") in rdfgraph, 'bibo:editor') + self.failUnless((subj,URIRef(bibo+"owner"),None) in rdfgraph, 'bibo:owner') + self.failUnless((None,RDF.type,URIRef(foaf+"Organization")) in rdfgraph, 'rdf:type') + self.failUnless((None,URIRef(foaf+"name"),"ProQuest") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(foaf+"homepage"),"http://lion.chadwyck.co.uk/") in rdfgraph, 'foaf:homepage') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((None,URIRef(foaf+"name"),"Faber and Faber") in rdfgraph, 'foaf:name') + self.failUnless((None,URIRef(address+"localityName"),"London") in rdfgraph, 'address:localityName') + + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + + + def testMetadataFileDelete(self): + """Delete manifest in dataset - DELETE /silo_name/datasets/dataset_name/manifest.rdf""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Delete metadata file, check response + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + dcterms = "http://purl.org/dc/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=401, expect_reason="Unauthorized") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + # Delete metadata file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'0') in rdfgraph, 'oxds:currentVersion') + + + + def testPutCreateFile(self): + """PUT file contents to new filename - PUT file contents to /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Put zip file, check response + zipdata = open("testdata/testdir.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testdir.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + + # Put zip file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + zipdata = open("testdata/testdir2.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testdir2.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testdir2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Put zip file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + zipdata = open("testdata/testrdf.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf.zip")) in rdfgraph, 'ore:aggregates testrdf.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + zipdata = open("testdata/testrdf2.zip").read() + + # Put file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.assertFalse((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'testrdf2.zip has been aggregated') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + # Put file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf2.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.assertFalse((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'testrdf2.zip has been aggregated') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + # Put file by admin user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.assertFalse((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'testrdf2.zip has been aggregated') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + # Put file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.assertFalse((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'testrdf2.zip has been aggregated') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + # Put file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf2.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.assertFalse((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'testrdf2.zip has been aggregated') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + + + def testPutUpdateFile(self): + """PUT file contents to existing filename - PUT file contents to /silo_name/datasets/dataset_name/file_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir.zip") + # Access content + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + # Put zip file - create, check response + zipdata2 = open("testdata/testrdf3.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata2, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=201, expect_reason="Created", expect_type="text/plain") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf3.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile2, "Difference between local and remote zipfile!") + + # Put zip file - update testrdf3, check response + zipdata3 = open("testdata/testrdf2.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata3, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph, 'ore:aggregates testrdf3.zip') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + f = open('/tmp/testrdf3.zip', 'wb') + f.write(zipfile2) + f.close() + self.assertEqual(zipdata3, zipfile2, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 4, "Four versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['versions'][3], '3', "Version 3") + self.assertEqual(state['currentversion'], '3', "Current version == 3") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['files']['3']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testrdf3.zip'].keys()), 13, "File stats for testrdf3.zip") + + # Put zip file - update testdir, check response + zipdata4 = open("testdata/testdir2.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata4, resource="datasets/TestSubmission/testdir.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph, 'ore:aggregates testrdf3.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata4, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile2, "Difference between local and remote zipfile!") + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['versions'][3], '3', "Version 3") + self.assertEqual(state['versions'][4], '4', "Version 4") + self.assertEqual(state['currentversion'], '4', "Current version == 4") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(state['files']['0'], ['manifest.rdf'], "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 2, "List should contain manifest.rdf and testdir.zip") + self.assertEqual(len(state['files']['2']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['files']['3']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['files']['4']), 3, "List should contain manifest.rdf, testdir.zip and testrdf3.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['metadata_files']['4']), 0, "metadata_files of version 4") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(len(state['subdir']['3']), 0, "Subdirectory count for version 3") + self.assertEqual(len(state['subdir']['4']), 0, "Subdirectory count for version 4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testdir.zip'].keys()), 13, "File stats for testdir.zip") + self.assertEqual(len(parts['testrdf3.zip'].keys()), 13, "File stats for testrdf3.zip") + + # Put zip file by admin - update testrdf3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + zipdata5 = open("testdata/testrdf.zip").read() + (resp, respdata) = self.doHTTP_PUT(zipdata5, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph, 'ore:aggregates testrdf3.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'5') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata4, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Difference between local and remote zipfile!") + + # Put zip file by manager - update testrdf3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/testdir.zip", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph, 'ore:aggregates testrdf3.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Difference between local and remote zipfile!") + + # Put zip file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, respdata) = self.doHTTP_PUT(zipdata2, resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Zipfile has been updated by submitter of another dataset!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Zipfile has been updated by submitter of another dataset!") + + # Put zip file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, respdata) = self.doHTTP_PUT(zipdata3, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Zipfile has been updated by general user!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Zipfile has been updated by general user!") + + # Put zip file by admin 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata2, resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Zipfile has been updated by admin of another dataset!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Zipfile has been updated by admin of another dataset!") + + # Put zip file by manager 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata3, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Zipfile has been updated by manager of another dataset!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Zipfile has been updated by manager of another dataset!") + + # Put zip file by submitter 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, respdata) = self.doHTTP_PUT(zipdata3, resource="datasets/TestSubmission/testrdf3.zip", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Zipfile has been updated by submitter of another dataset!") + (resp, zipfile2) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile2, "Zipfile has been updated by submitter of another dataset!") + + # Access and check zip file content of version 1 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=1", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content of version 2 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=2", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata2, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content of version 3 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=3", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content of version 4 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=4", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata4, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=4", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata3, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content of version 5 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=5", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata4, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=5", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content of version 6 + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip?version=6", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testrdf3.zip?version=6", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata5, zipfile, "Difference between local and remote zipfile!") + + + + def testPutMetadataFile(self): + """Add metadata to manifest - PUT metadata to /silo_name/datasets/dataset_name/manifest.rdf""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Put manifest file, check response + zipdata = open("testdata/manifest.rdf").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Update metadata file, check response + zipdata = open("testdata/manifest2.rdf").read() + (resp, respdata) = self.doHTTP_PUT(zipdata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"title"),'Test dataset with updated and merged metadata') in rdfgraph, 'dcterms:title') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['2']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['subdir']['0']), 0, "Subdirectory count for version 0") + self.assertEqual(len(state['subdir']['1']), 0, "Subdirectory count for version 1") + self.assertEqual(len(state['subdir']['2']), 0, "Subdirectory count for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission'].keys()), 13, "File stats for 4=TestSubmission") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + # Put metadata file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + metadataa = open("testdata/manifest-admin.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadataa, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"description"),"Changes made by admin") in rdfgraph, 'description by admin') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + + # Put metadata file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + metadatam = open("testdata/manifest-manager.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatam, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(dcterms+"description"),"Changes made by manager") in rdfgraph, 'description by manager') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + + # Put metadata file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + metadatas = open("testdata/manifest-submitter.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatas, resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.assertFalse((subj,URIRef(dcterms+"description"),'Changes made by submitter') in rdfgraph, 'description by submitter of another dataset') + + # Put metadata file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + metadatag = open("testdata/manifest-general.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatag, resource="datasets/TestSubmission/manifest.rdf", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.assertFalse((subj,URIRef(dcterms+"description"),'Changes made by general user') in rdfgraph, 'description by general user') + + # Put metadata file by admin 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + metadatag = open("testdata/manifest-general.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatag, resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.assertFalse((subj,URIRef(dcterms+"description"),'Changes made by general user') in rdfgraph, 'description by admin user') + + # Put metadata file by manager 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + metadatag = open("testdata/manifest-general.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatag, resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.assertFalse((subj,URIRef(dcterms+"description"),'Changes made by general user') in rdfgraph, 'description by manager of another silo') + + # Put metadata file by submitter 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + metadatag = open("testdata/manifest-general.rdf").read() + (resp, respdata) = self.doHTTP_PUT(metadatag, resource="datasets/TestSubmission/manifest.rdf", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + # Access and check list of contents + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.assertFalse((subj,URIRef(dcterms+"description"),'Changes made by general user') in rdfgraph, 'description by submitter of another dataset') + + + + def testUnicodeMetadataFileUpdate(self): + """POST/PUT manifest to dataset - /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"DataSet") + # POST unicode file 01, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode01.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext1 = None + f = codecs.open('testdata/unicodedata/unicode01.txt', 'r', 'utf-8') + doctext1 = f.read() + f.close() + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:piblisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"title"),"General punctuation") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext1)) in rdfgraph, 'rdf:value') + self.failUnless((subj,URIRef(dcterms+"source"),"http://www.madore.org/~david/misc/unitest/") in rdfgraph, 'dcterms:source') + + # PUT unicode file 02, check response + manidata = open("testdata/unicodedata/unicode02.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext2 = None + f = codecs.open('testdata/unicodedata/unicode02.txt', 'r', 'utf-8') + doctext2 = f.read() + f.close() + self.assertEqual(len(rdfgraph),15,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"A table of (some) accents") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext2)) in rdfgraph, 'rdf:value') + + # PUT unicode file 03, check response + manidata = open("testdata/unicodedata/unicode03.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext3 = None + f = codecs.open('testdata/unicodedata/unicode03.txt', 'r', 'utf-8') + doctext3 = f.read() + f.close() + self.assertEqual(len(rdfgraph),16,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Combining diacritics") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext3)) in rdfgraph, 'rdf:value') + + # POST unicode file 04, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode04.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext4 = None + f = codecs.open('testdata/unicodedata/unicode04.txt', 'r', 'utf-8') + doctext4 = f.read() + f.close() + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Various symbols") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext4)) in rdfgraph, 'rdf:value') + + # POST unicode file 05, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode05.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext5 = None + f = codecs.open('testdata/unicodedata/unicode05.txt', 'r', 'utf-8') + doctext5 = f.read() + f.close() + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'5') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in Russian") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext5)) in rdfgraph, 'rdf:value') + + # PUT unicode file 06, check response + manidata = open("testdata/unicodedata/unicode06.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext6 = None + f = codecs.open('testdata/unicodedata/unicode06.txt', 'r', 'utf-8') + doctext6 = f.read() + f.close() + self.assertEqual(len(rdfgraph),19,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in ancient Greek") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext6)) in rdfgraph, 'rdf:value') + + # POST unicode file 07, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode07.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext7 = None + f = codecs.open('testdata/unicodedata/unicode07.txt', 'r', 'utf-8') + doctext7 = f.read() + f.close() + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'7') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some verses in Sanskrit") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext7)) in rdfgraph, 'rdf:value') + + # PUT unicode file 08, check response + manidata = open("testdata/unicodedata/unicode08.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext8 = None + f = codecs.open('testdata/unicodedata/unicode08.txt', 'r', 'utf-8') + doctext8= f.read() + f.close() + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'8') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some Chinese") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext8)) in rdfgraph, 'rdf:value') + + # POST unicode file 09, check response + zipdata = self.updateSubmissionZipfile(file_to_upload="unicodedata/unicode09.xml", filename="manifest.rdf") + # Access and check list of contents + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext9 = None + f = codecs.open('testdata/unicodedata/unicode09.txt', 'r', 'utf-8') + doctext9 = f.read() + f.close() + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'9') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"A Tamil name") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext9)) in rdfgraph, 'rdf:value') + + # PUT unicode file 10, check response + manidata = open("testdata/unicodedata/unicode10.xml").read() + (resp, respdata) = self.doHTTP_PUT(manidata, resource="datasets/TestSubmission/manifest.rdf", + expect_status=204, expect_reason="No Content", expect_type="text/plain") + #Access state information and check + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + doctext10 = None + f = codecs.open('testdata/unicodedata/unicode10.txt', 'r', 'utf-8') + doctext10= f.read() + f.close() + self.assertEqual(len(rdfgraph),23,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,URIRef(oxds+"currentVersion"),'10') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Some Arabic") in rdfgraph, 'dcterms:title') + self.failUnless((subj,RDF.value,Literal(doctext10)) in rdfgraph, 'rdf:value') + os.remove('response.xml') + + + + def testChangeEmbargo(self): + """Change embargo information - POST embargo_change to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + #self.createSubmissionDataset() + fields = \ + [ ("id", "TestSubmission") + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + ore = "http://www.openarchives.org/ore/terms/" + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + d = (datetime.datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir.zip") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + # Access and check zip file content by submitter + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check zip file content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check zip file content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check zip file content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check zip file content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + + # Delete embargo, check response + embargoed_until_date = datetime.datetime.now().isoformat() + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + fields = \ + [ ("embargoed", 'false') + ,("embargoed_until", embargoed_until_date) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.assertFalse((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'2') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], "", "Should have no date for embargoed_until") + # Access and check zip file content by submitter + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check zip file content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Change embargo by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + d1 = (datetime.datetime.now() + datetime.timedelta(days=365*10)).isoformat() + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d1) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'3') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d1 in state['metadata']['embargoed_until'], "embargoed_until date?") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + + # Change embargo by submitter, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + d = (datetime.datetime.now() + datetime.timedelta(days=10)).isoformat() + fields = \ + [ ("embargoed", 'true') + ,("embargoed_until", d) + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + # Access and check zip file content + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + + # Change embargo by submitter 2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + + # Change embargo by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + + # Change embargo by admin user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + + # Change embargo by maanger user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + + # Change embargo by submitter user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=403, expect_reason="Forbidden") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),12,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'4') in rdfgraph, 'oxds:currentVersion') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.failUnless(d in state['metadata']['embargoed_until'], "embargoed_until date?") + + # Delete embargo by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + d = (datetime.datetime.now() + datetime.timedelta(days=365*70)).isoformat() + fields = \ + [ ("embargoed", 'false') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'False') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'5') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], False, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], "", "Should have no date for embargoed_until") + # Access and check zip file content by submitter + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Change embargo by submitter, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + #d = (datetime.datetime.now() + datetime.timedelta(days=365*70)).isoformat() + fields = \ + [ ("embargoed", 'true') + ] + files =[] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission", + expect_status=204, expect_reason="Updated") + #Access dataset and check content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + dcterms = "http://purl.org/dc/terms/" + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'6') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + #Access state information and check + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(state['metadata']['embargoed_until'], '', "Embargoed?") + # Access and check zip file content by submitter + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by admin + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by manager + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + # Access and check content by submitter2 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by general user + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check content by admin user3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by manager 3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + # Access and check content by submitter3 + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),11,'Graph length %i' %len(rdfgraph)) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission/testdir.zip", + expect_status=403, expect_reason="Forbidden", expect_type="application/zip") + + + + def testFileUnpack(self): + """Unpack zip file to a new dataset - POST zip filename to /silo_name/items/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file + zipdata = self.uploadSubmissionZipfile() + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + zipdata = self.uploadSubmissionZipfile(file_to_upload="testrdf.zip") + zipdata = self.uploadSubmissionZipfile(file_to_upload="testrdf2.zip") + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testdir.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),16,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testrdf.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),subj2) in rdfgraph, 'ore:aggregates testrdf.zip') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, testdir and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + d = (datetime.datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + + # Unpack ZIP file into a new dataset by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = \ + [ ("filename", "testdir2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir2"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testdir2")) + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((URIRef(base+"testdir2.zip"),URIRef(dcterms+"hasVersion"),subj2) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir2")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir2/") + owl = "http://www.w3.org/2002/07/owl#" + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph, 'ore:aggregates directory1') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph, 'ore:aggregates file1.c') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph, 'ore:aggregates directory2') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph, 'ore:aggregates file2.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir2/directory1/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir2/directory1/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + # Access and check list of contents in TestSubmission as submitter + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testdir2")) + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((URIRef(base+"testdir2.zip"),URIRef(dcterms+"hasVersion"),subj2) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir2")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir2/") + owl = "http://www.w3.org/2002/07/owl#" + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph, 'ore:aggregates directory1') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph, 'ore:aggregates file1.c') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph, 'ore:aggregates directory2') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph, 'ore:aggregates file2.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir2/directory1/file1.b", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + # Unpack ZIP file into a new dataset by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = \ + [ ("filename", "testrdf.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((URIRef(base+"testrdf.zip"),URIRef(dcterms+"hasVersion"),subj2) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testrdf/") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph, 'ore:aggregates arabic.txt') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + (resp, arabic_data) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf/arabic.txt", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + #self.failUnless((subj,URIRef(dcterms+"description"),arabic_data) in rdfgraph, 'dcterms:description') + self.failUnless((subj,URIRef(dcterms+"description"),None) in rdfgraph, 'dcterms:description') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testrdf/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + # Access and check list of contents in TestSubmission as submitter + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((URIRef(base+"testrdf.zip"),URIRef(dcterms+"hasVersion"),subj2) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testrdf/") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph, 'ore:aggregates arabic.txt') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf/directory/file1.b", + expect_status=403, expect_reason="Forbidden", expect_type="text/plain") + + # Unpack ZIP file into a new dataset by submiter 2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into a new dataset by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into a new dataset by admin user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into a new dataset by manager user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into a new dataset by submitter user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Delete the dataset TestSubmission-testdir + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir2", + expect_status="*", expect_reason="*") + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf", + expect_status="*", expect_reason="*") + + + + def testSymlinkFileUnpack(self): + """Unpack zip file uploaded in a previous version to a new dataset - POST zip filename to /silo_name/items/dataset_name""" + #NOTE: I do not need this test as the test above does test unpacking of a file uploaded in a previous version. + # In any case, certainly do not need to expand this test to cover the different users + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file testdir.zip, check response + zipdata = self.uploadSubmissionZipfile() + # Upload zip file testdir2, check response + zipdata = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testdir.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),14,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 2, "Two versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['currentversion'], '1', "Current version == 1") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, test-csv.csv and testdir") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + d = (datetime.datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + + + + def testFileUploadToUnpackedDataset(self): + """Upload a file to an unpacked dataset - POST filename to /silo_name/datasets/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip file, check response + zipdata = self.uploadSubmissionZipfile() + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testdir.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + # Access new dataset TestSubmission-testdir, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Upload zip file to dataset TestSubmission-testdir + fields = \ + [ ("filename", "testdir2.zip") + ] + zipdata0 = open("testdata/testdir2.zip").read() + files = \ + [ ("file", "testdir2.zip", zipdata0, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir/testdir2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access dataset TestSubmission-testdir, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, test-csv.csv and directory") + self.assertEqual(len(state['files']['2']), 4, "List should contain manifest.rdf, test-csv.csv, directory and testdir2.zip") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['directory'], "Subdirectory for version 2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + d = (datetime.datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['testdir2.zip'].keys()), 13, "File stats for testdir2.zip") + + # Upload zip file by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = [] + zipdata = open("testdata/testrdf.zip").read() + files = \ + [ ("file", 'testrdf.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir/testrdf.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + # Upload zip file by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = [] + zipdata = open("testdata/testrdf2.zip").read() + files = \ + [ ("file", 'testrdf2.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir/testrdf2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata, zipfile, "Difference between local and remote zipfile!") + + #Prepare data to upload + fields = [] + zipdata = open("testdata/testrdf3.zip").read() + files = \ + [ ("file", 'testrdf3.zip', zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + + # Upload zip file by submitter2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf3.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf3.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by admin user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf3.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by manager user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf3.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Upload zip file by submitter user 3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission-testdir/", + expect_status=403, expect_reason="Forbidden") + # Access and check zip file content + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testrdf3.zip", + expect_status=404, expect_reason="Not Found", expect_type="application/zip") + + # Access and check zip file content of testdir2.zip + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, zipfile) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/testdir2.zip", + expect_status=200, expect_reason="OK", expect_type="application/zip") + self.assertEqual(zipdata0, zipfile, "Difference between local and remote zipfile!") + + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + + + def testUpdateUnpackedDataset(self): + """Update a dataset by unpacking a zip file to an existing dataset - POST zip filename to /silo_name/items/dataset_name""" + # Create a new dataset, check response + self.createSubmissionDataset() + # Upload zip files + zipdata1 = self.uploadSubmissionZipfile() + zipdata2 = self.uploadSubmissionZipfile(file_to_upload="testrdf4.zip") + zipdata3 = self.uploadSubmissionZipfile(file_to_upload="testdir2.zip") + zipdata4 = self.uploadSubmissionZipfile(file_to_upload="testrdf.zip") + zipdata5 = self.uploadSubmissionZipfile(file_to_upload="testrdf2.zip") + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testdir.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testdir"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access and check response for TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + # Access and check list of contents in TestSubmission-testdir + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + # Unpack second ZIP file into dataset TestSubmission-testdir, check response + fields = \ + [ ("filename", "testrdf4.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access and check list of contents in TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),18,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf.zip")) in rdfgraph, 'ore:aggregates testrdf.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'ore:aggregates testrdf2.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4.zip")) in rdfgraph, 'ore:aggregates testrdf4.zip') + self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((URIRef(base+"testrdf4.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access dataset TestSubmission-testdir, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testdir/testrdf4/directory/file1.a")) + subj3 = URIRef(self.getManifestUri("datasets/TestSubmission-testdir/testrdf4/directory/file1.b")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + stype1 = URIRef("http://vocab.ox.ac.uk/dataset/schema#DataSet") + stype2 = URIRef(oxds+"item") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + owl = "http://www.w3.org/2002/07/owl#" + dc = "http://purl.org/dc/elements/1.1/" + self.assertEqual(len(rdfgraph),29,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4")) in rdfgraph, 'ore:aggregates testrdf4') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1a.rdf")) in rdfgraph, 'ore:aggregates 1a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1b.rdf")) in rdfgraph, 'ore:aggregates 1b.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/2a.rdf")) in rdfgraph, 'ore:aggregates 2a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + #self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset 4 with updated and merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"title"),"Test item 2a") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + #self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("2aFiles")) in rdfgraph, 'dcterms:title') + self.failUnless((subj2,RDF.type,stype2) in rdfgraph, 'Testing submission type: %s, %s'%(str(subj2), str(stype2))) + self.failUnless((subj2,URIRef(dc+"description"),"This is a archived test item 1a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,URIRef(dcterms+"title"),"Test item 1a") in rdfgraph, 'dcterms:title') + self.failUnless((subj3,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj3+", "+stype2) + self.failUnless((subj3,URIRef(dc+"description"),"This is test item 1b of type file") in rdfgraph, 'dc:description') + self.failUnless((subj3,URIRef(dcterms+"title"),"Test item 1b") in rdfgraph, 'dcterms:title') + + #Access state information of TestSubmission-testdir + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 3, "Three versions") + self.assertEqual(state['versions'][0], '0', "Version 0") + self.assertEqual(state['versions'][1], '1', "Version 1") + self.assertEqual(state['versions'][2], '2', "Version 2") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf, testrdf4") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['testrdf4'], "Subdirectory for version 2 should be directory") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + d = (datetime.datetime.now() + relativedelta(years=+70)).isoformat() + d = d.split('T')[0] + self.assertTrue(d in state['metadata']['embargoed_until'], "embargoed_until %s?"%d) + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testrdf4'].keys()), 0, "File stats for directory") + + # Unpack third ZIP file into dataset by admin, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser, + endpointpass=RDFDatabankConfig.endpointadminpass) + fields = \ + [ ("filename", "testdir2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + self.assertEqual(len(rdfgraph),19,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir.zip")) in rdfgraph, 'ore:aggregates testdir.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testdir2.zip")) in rdfgraph, 'ore:aggregates testdir2.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf.zip")) in rdfgraph, 'ore:aggregates testrdf.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'ore:aggregates testrdf2.zip') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4.zip")) in rdfgraph, 'ore:aggregates testrdf4.zip') + self.failUnless((URIRef(base+"testdir.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((URIRef(base+"testrdf4.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((URIRef(base+"testdir2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access updated dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + owl = "http://www.w3.org/2002/07/owl#" + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph, 'ore:aggregates directory1') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph, 'ore:aggregates file1.c') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph, 'ore:aggregates directory2') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph, 'ore:aggregates file2.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"3") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory1/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir2/directory1/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + + # Unpack fourth ZIP file into dataset by manager, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser, + endpointpass=RDFDatabankConfig.endpointmanagerpass) + fields = \ + [ ("filename", "testrdf.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=204, expect_reason="No Content") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.failUnless((URIRef(base+"testrdf.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access updated dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph, 'ore:aggregates arabic.txt') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"description"),None) in rdfgraph, 'dcterms:description') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory/file1.b", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testrdf/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + + # Unpack fifth ZIP file into dataset by submiter 2, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser2, + endpointpass=RDFDatabankConfig.endpointsubmitterpass2) + fields = \ + [ ("filename", "testrdf2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into dataset by general user, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointgeneraluser, + endpointpass=RDFDatabankConfig.endpointgeneralpass) + fields = \ + [ ("filename", "testrdf2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=401, expect_reason="Unauthorized", expect_type="text/plain") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into dataset by admin user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointadminuser3, + endpointpass=RDFDatabankConfig.endpointadminpass3) + fields = \ + [ ("filename", "testrdf2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into dataset by manager user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointmanageruser3, + endpointpass=RDFDatabankConfig.endpointmanagerpass3) + fields = \ + [ ("filename", "testrdf2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Unpack ZIP file into dataset by submitter user3, check response + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser3, + endpointpass=RDFDatabankConfig.endpointsubmitterpass3) + fields = \ + [ ("filename", "testrdf2.zip"), + ("id", "TestSubmission-testdir") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=403, expect_reason="Forbidden") + # Access and check list of contents in TestSubmission + self.setRequestUserPass( + endpointuser=RDFDatabankConfig.endpointsubmitteruser, + endpointpass=RDFDatabankConfig.endpointsubmitterpass) + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + base = self.getManifestUri("datasets/TestSubmission/") + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),20,'Graph length %i' %len(rdfgraph)) + self.assertFalse((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion testrdf2.zip') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"5") in rdfgraph, 'oxds:currentVersion') + # Access new dataset, check response + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Access and check list of contents in TestSubmission-testdir version 0 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=0", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype = URIRef(oxds+"DataSet") + stype2 = URIRef(oxds+"Grouping") + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),10,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"0") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir version 0 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=0", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 3, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + + # Access dataset TestSubmission-testdir version 1 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/version1", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + self.assertEqual(len(rdfgraph),17,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates tfile2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"1") in rdfgraph, 'oxds:currentVersion') + #Access state information of TestSubmission-testdir version 1 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir/version1", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(len(parts.keys()), 5, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + + # Access dataset TestSubmission-testdir version 2 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/version2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + stype3 = URIRef(oxds+"item") + subj2 = URIRef(base+"testrdf4/directory/file1.a") + subj3 = URIRef(base+"testrdf4/directory/file1.b") + self.assertEqual(len(rdfgraph),29,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj+", "+stype2) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4")) in rdfgraph, 'ore:aggregates testrdf4') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1a.rdf")) in rdfgraph, 'ore:aggregates 1a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1b.rdf")) in rdfgraph, 'ore:aggregates 1b.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/2a.rdf")) in rdfgraph, 'ore:aggregates 2a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + self.failUnless((subj,URIRef(dcterms+"title"),"Test item 2a") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"2") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj2,RDF.type,stype3) in rdfgraph, 'Testing submission type: %s, %s'%(str(subj2), str(stype3))) + self.failUnless((subj2,URIRef(dc+"description"),"This is a archived test item 1a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,URIRef(dcterms+"title"),"Test item 1a") in rdfgraph, 'dcterms:title') + self.failUnless((subj3,RDF.type,stype3) in rdfgraph, 'Testing submission type: '+subj3+", "+stype3) + self.failUnless((subj3,URIRef(dc+"description"),"This is test item 1b of type file") in rdfgraph, 'dc:description') + self.failUnless((subj3,URIRef(dcterms+"title"),"Test item 1b") in rdfgraph, 'dcterms:title') + #Access state information of TestSubmission-testdir version 2 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir/version2", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['currentversion'], '2', "Current version == 2") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf, testrdf4") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['testrdf4'], "Subdirectory for version 2 should be testrdf4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 4, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['testrdf4'].keys()), 0, "File stats for directory1") + + # Access dataset TestSubmission-testdir version 3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + owl = "http://www.w3.org/2002/07/owl#" + self.assertEqual(len(rdfgraph),22,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1")) in rdfgraph, 'ore:aggregates directory1') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory1/file1.c")) in rdfgraph, 'ore:aggregates file1.c') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2")) in rdfgraph, 'ore:aggregates directory2') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory2/file2.b")) in rdfgraph, 'ore:aggregates file2.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"3") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testdir2/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory1/file1.b?version=3", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testdir2/directory1/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir version 3 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=3", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['currentversion'], '3', "Current version == 3") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf, testrdf4") + self.assertEqual(len(state['files']['3']), 4, "List should contain manifest.rdf, directory1, directory2 and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['testrdf4'], "Subdirectory for version 2 should be testrdf4") + self.assertEqual(len(state['subdir']['3']), 2, "Subdirectory for version 2 should be directory1 and directory2") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['directory1'].keys()), 0, "File stats for directory1") + self.assertEqual(len(parts['directory2'].keys()), 0, "File stats for directory1") + + # Access dataset TestSubmission-testdir version 4 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=4", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testdir")) + stype = URIRef("http://vocab.ox.ac.uk/dataset/schema#Grouping") + base = self.getManifestUri("datasets/TestSubmission-testdir/") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph, 'ore:aggregates arabic.txt') + self.failUnless((subj,URIRef(oxds+"currentVersion"),"4") in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"description"),None) in rdfgraph, 'dcterms:description') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + # Access and check content of a resource + (resp, filedata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir/directory/file1.b?version=4", + expect_status=200, expect_reason="OK", expect_type="text/plain") + checkdata = open("testdata/testrdf/directory/file1.b").read() + self.assertEqual(filedata, checkdata, "Difference between local and remote data!") + #Access state information of TestSubmission-testdir version 4 + (resp, data) = self.doHTTP_GET( + resource="states/TestSubmission-testdir?version=4", + expect_status=200, expect_reason="OK", expect_type="application/json") + state = data['state'] + parts = data['parts'] + self.assertEqual(len(state.keys()), 11, "States") + self.assertEqual(state['item_id'], "TestSubmission-testdir", "Submission item identifier") + self.assertEqual(len(state['versions']), 5, "Five versions") + self.assertEqual(state['currentversion'], '4', "Current version == 4") + self.assertEqual(state['rdffileformat'], 'xml', "RDF file type") + self.assertEqual(state['rdffilename'], 'manifest.rdf', "RDF file name") + self.assertEqual(len(state['files']['0']), 1, "List should contain just manifest.rdf") + self.assertEqual(len(state['files']['1']), 3, "List should contain manifest.rdf, directory and test-csv.csv") + self.assertEqual(len(state['files']['2']), 2, "List should contain manifest.rdf, testrdf4") + self.assertEqual(len(state['files']['3']), 4, "List should contain manifest.rdf, directory1, directory2 and test-csv.csv") + self.assertEqual(len(state['files']['4']), 4, "List should contain manifest.rdf, directory, arabic.txt and test-csv.csv") + self.assertEqual(len(state['metadata_files']['0']), 0, "metadata_files of version 0") + self.assertEqual(len(state['metadata_files']['1']), 0, "metadata_files of version 1") + self.assertEqual(len(state['metadata_files']['2']), 0, "metadata_files of version 2") + self.assertEqual(len(state['metadata_files']['3']), 0, "metadata_files of version 3") + self.assertEqual(len(state['metadata_files']['4']), 0, "metadata_files of version 4") + self.assertEqual(state['subdir']['0'], [], "Subdirectory count for version 0") + self.assertEqual(state['subdir']['1'], ['directory'], "Subdirectory for version 1") + self.assertEqual(state['subdir']['2'], ['testrdf4'], "Subdirectory for version 2 should be testrdf4") + self.assertEqual(len(state['subdir']['3']), 2, "Subdirectory for version 2 should be directory1 and directory2") + self.assertEqual(state['subdir']['4'], ['directory'], "Subdirectory for version 4") + self.assertEqual(state['metadata']['createdby'], RDFDatabankConfig.endpointsubmitteruser, "Created by") + self.assertEqual(state['metadata']['embargoed'], True, "Embargoed?") + self.assertEqual(len(parts.keys()), 6, "Parts") + self.assertEqual(len(parts['4=TestSubmission-testdir'].keys()), 13, "File stats for 4=TestSubmission-testdir") + self.assertEqual(len(parts['manifest.rdf'].keys()), 13, "File stats for manifest.rdf") + self.assertEqual(len(parts['test-csv.csv'].keys()), 13, "File stats for test-csv.csv") + self.assertEqual(len(parts['arabic.txt'].keys()), 13, "File stats for arabic.txt") + self.assertEqual(len(parts['directory'].keys()), 0, "File stats for directory") + + # Access dataset TestSubmission-testdir version 5 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testdir?version=5", + expect_status=404, expect_reason="Not Found", expect_type="application/rdf+xml") + + # Delete the dataset TestSubmission-testdir + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testdir", + expect_status="*", expect_reason="*") + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + + + def testMetadataMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located in unpacked zipfile is munged with existing manifest of the dataset.""" + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf", + expect_status="*", expect_reason="*") + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf.zip, check response + fields = [] + zipdata = open("testdata/testrdf.zip").read() + files = \ + [ ("file", "testrdf.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf.zip")) in rdfgraph, 'ore:aggregates testrdf.zip') + self.failUnless((URIRef(base+"testrdf.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf")) + base = self.getManifestUri("datasets/TestSubmission-testrdf/") + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"Grouping") + self.assertEqual(len(rdfgraph),21,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"arabic.txt")) in rdfgraph, 'ore:aggregates arabic.txt') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + #Get the file arabic.txt + (resp, arabic_data) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf/arabic.txt", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + #self.failUnless((subj,URIRef(dcterms+"description"),Literal(arabic_data)) in rdfgraph, 'dcterms:description') + # Delete the dataset TestSubmission-testrdf + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf", + expect_status="*", expect_reason="*") + os.remove('response.xml') + + + + def testMetadataInDirectoryMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within a folder in unpacked zipfile is munged with datsets existing manifest""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf2.zip, check response + fields = [] + zipdata = open("testdata/testrdf2.zip").read() + files = \ + [ ("file", "testrdf2.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf2.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf2.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf2"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2.zip")) in rdfgraph, 'ore:aggregates testrdf2.zip') + self.failUnless((URIRef(base+"testrdf2.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf2", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf2")) + base = self.getManifestUri("datasets/TestSubmission-testrdf2/") + owl = "http://www.w3.org/2002/07/owl#" + stype = URIRef(oxds+"Grouping") + self.assertEqual(len(rdfgraph),20, 'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/testrdf/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset with merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2")) in rdfgraph, 'ore:aggregates testrdf2') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf2/test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + # Delete the dataset TestSubmission-testrdf2 + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf2", + expect_status="*", expect_reason="*") + + + + def testReferencedMetadataMerging(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within the unpacked zipfile is munged with datsets existing manifest. + Also, manifest.rdf in the unpacked zipfile, references other metadata files, using the property rdfs:seeAlso. + The metadata from these files are munged.""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf3.zip, check response + fields = [] + zipdata = open("testdata/testrdf3.zip").read() + files = \ + [ ("file", "testrdf3.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf3.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf3.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf3"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + owl = "http://www.w3.org/2002/07/owl#" + dc = "http://purl.org/dc/elements/1.1/" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3.zip")) in rdfgraph, 'ore:aggregates testrdf3.zip') + self.failUnless((URIRef(base+"testrdf3.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf3 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf3", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + fr = open('response.xml', 'w') + fr.write(rdfdata) + fr.close() + rdfgraph = Graph() + rdfgraph.parse('response.xml', format='xml') + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf3")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf3/testrdf3/directory/hebrew.txt")) + base = self.getManifestUri("datasets/TestSubmission-testrdf3/") + stype = URIRef(oxds+"Grouping") + stype2 = URIRef(oxds+"item") + self.assertEqual(len(rdfgraph),32,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset 3 with updated and merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3")) in rdfgraph, 'ore:aggregates testrdf3') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/1a.rdf")) in rdfgraph, 'ore:aggregates 1a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/1b.rdf")) in rdfgraph, 'ore:aggregates 1b.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/2a.rdf")) in rdfgraph, 'ore:aggregates 2a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/3a.rdf")) in rdfgraph, 'ore:aggregates 3a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/directory/hebrew.txt")) in rdfgraph, 'ore:aggregates hebrew.txt') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf3/test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),'True') in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("http://example.org/2aFiles/")) in rdfgraph, 'owl:sameAs') + self.failUnless((subj,URIRef(dc+"description"),"file1.a is another file") in rdfgraph, 'dc:description') + self.failUnless((subj,URIRef(dc+"description"),"file1.b is another file") in rdfgraph, 'dc:description') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj2+", "+stype2) + self.failUnless((subj2,URIRef(dcterms+"title"),"Hebrew text") in rdfgraph, 'dcterms:title') + self.failUnless((subj2,URIRef(dcterms+"source"),"http://genizah.bodleian.ox.ac.uk/") in rdfgraph, 'dcterms:source') + #Get the file hebrew.txt + (resp, hebrew_data) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf3/testrdf3/directory/hebrew.txt", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + #self.failUnless((subj2,RDF.value,Literal(hebrew_data)) in rdfgraph, 'rdf:value') + # Delete the dataset TestSubmission-testrdf3 + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf3", + expect_status="*", expect_reason="*") + + + + def testReferencedMetadataMerging2(self): + """POST zipfile to /silo_name/items/dataset_name. Unpack zip file to a dataset. + manifest.rdf located within the unpacked zipfile is munged with datsets existing manifest. + Also, manifest.rdf in the unpacked zipfile, references other metadata files, using the property rdfs:seeAlso. + The metadata from these files are munged. One of the referenced files, references other files, which if they exists are also munged.""" + + # Create a new dataset, check response + self.createSubmissionDataset() + # Submit ZIP file testdata/testrdf4.zip, check response + fields = [] + zipdata = open("testdata/testrdf4.zip").read() + files = \ + [ ("file", "testrdf4.zip", zipdata, "application/zip") + ] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="datasets/TestSubmission/", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission/testrdf4.zip"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Unpack ZIP file into a new dataset, check response + fields = \ + [ ("filename", "testrdf4.zip") + ] + files = [] + (reqtype, reqdata) = SparqlQueryTestCase.encode_multipart_formdata(fields, files) + (resp,respdata) = self.doHTTP_POST( + reqdata, reqtype, + resource="items/TestSubmission", + expect_status=201, expect_reason="Created") + LHobtained = resp.getheader('Content-Location', None) + LHexpected = "%sdatasets/TestSubmission-testrdf4"%self._endpointpath + self.assertEquals(LHobtained, LHexpected, 'Content-Location not correct') + # Access parent dataset, check response + (resp, respdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/json") + # Access and check list of contents in parent dataset - TestSubmission + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission")) + base = self.getManifestUri("datasets/TestSubmission/") + dcterms = "http://purl.org/dc/terms/" + ore = "http://www.openarchives.org/ore/terms/" + oxds = "http://vocab.ox.ac.uk/dataset/schema#" + stype = URIRef(oxds+"DataSet") + self.assertEqual(len(rdfgraph),13,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4.zip")) in rdfgraph, 'ore:aggregates testrdf4.zip') + self.failUnless((URIRef(base+"testrdf4.zip"),URIRef(dcterms+"hasVersion"),None) in rdfgraph, 'dcterms:hasVersion') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + # Access and check list of contents in child dataset - TestSubmission-testrdf4 + (resp, rdfdata) = self.doHTTP_GET( + resource="datasets/TestSubmission-testrdf4", + expect_status=200, expect_reason="OK", expect_type="application/rdf+xml") + rdfgraph = Graph() + rdfstream = StringIO(rdfdata) + rdfgraph.parse(rdfstream) + subj = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf4")) + subj2 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf4/testrdf4/directory/file1.a")) + subj3 = URIRef(self.getManifestUri("datasets/TestSubmission-testrdf4/testrdf4/directory/file1.b")) + base = self.getManifestUri("datasets/TestSubmission-testrdf4/") + owl = "http://www.w3.org/2002/07/owl#" + dc = "http://purl.org/dc/elements/1.1/" + stype = URIRef(oxds+"Grouping") + stype2 = URIRef(oxds+"item") + self.assertEqual(len(rdfgraph),29,'Graph length %i' %len(rdfgraph)) + self.failUnless((subj,RDF.type,stype) in rdfgraph, 'Testing submission type: '+subj+", "+stype) + self.failUnless((subj,URIRef(dcterms+"modified"),None) in rdfgraph, 'dcterms:modified') + self.failUnless((subj,URIRef(dcterms+"isVersionOf"),None) in rdfgraph, 'dcterms:isVersionOf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4")) in rdfgraph, 'ore:aggregates testrdf4') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory")) in rdfgraph, 'ore:aggregates directory') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.a")) in rdfgraph, 'ore:aggregates file1.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file1.b")) in rdfgraph, 'ore:aggregates file1.b') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/file2.a")) in rdfgraph, 'ore:aggregates file2.a') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1a.rdf")) in rdfgraph, 'ore:aggregates 1a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/1b.rdf")) in rdfgraph, 'ore:aggregates 1b.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/directory/2a.rdf")) in rdfgraph, 'ore:aggregates 2a.rdf') + self.failUnless((subj,URIRef(ore+"aggregates"),URIRef(base+"testrdf4/test-csv.csv")) in rdfgraph, 'ore:aggregates test-csv.csv') + self.failUnless((subj,URIRef(dcterms+"identifier"),None) in rdfgraph, 'dcterms:identifier') + self.failUnless((subj,URIRef(dcterms+"mediator"),None) in rdfgraph, 'dcterms:mediator') + self.failUnless((subj,URIRef(dcterms+"rights"),None) in rdfgraph, 'dcterms:rights') + self.failUnless((subj,URIRef(dcterms+"license"),None) in rdfgraph, 'dcterms:license') + self.failUnless((subj,URIRef(dcterms+"publisher"),None) in rdfgraph, 'dcterms:publisher') + self.failUnless((subj,URIRef(oxds+"isEmbargoed"),None) in rdfgraph, 'oxds:isEmbargoed') + self.failUnless((subj,URIRef(oxds+"embargoedUntil"),None) in rdfgraph, 'oxds:embargoedUntil') + self.failUnless((subj,URIRef(dcterms+"created"),None) in rdfgraph, 'dcterms:created') + self.failUnless((subj,URIRef(oxds+"currentVersion"),'1') in rdfgraph, 'oxds:currentVersion') + self.failUnless((subj,URIRef(dc+"description"),"This is a archived test item 2a ") in rdfgraph, 'dc:description') + #self.failUnless((subj,URIRef(dcterms+"title"),"Test dataset 4 with updated and merged metadata") in rdfgraph, 'dcterms:title') + self.failUnless((subj,URIRef(dcterms+"title"),"Test item 2a") in rdfgraph, 'dcterms:title') + + #self.failUnless((subj,URIRef(owl+"sameAs"),URIRef("2aFiles")) in rdfgraph, 'dcterms:title') + self.failUnless((subj2,RDF.type,stype2) in rdfgraph, 'Testing submission type: %s, %s'%(str(subj2), str(stype2))) + self.failUnless((subj2,URIRef(dc+"description"),"This is a archived test item 1a ") in rdfgraph, 'dc:description') + self.failUnless((subj2,URIRef(dcterms+"title"),"Test item 1a") in rdfgraph, 'dcterms:title') + + self.failUnless((subj3,RDF.type,stype2) in rdfgraph, 'Testing submission type: '+subj3+", "+stype2) + self.failUnless((subj3,URIRef(dc+"description"),"This is test item 1b of type file") in rdfgraph, 'dc:description') + self.failUnless((subj3,URIRef(dcterms+"title"),"Test item 1b") in rdfgraph, 'dcterms:title') + + # Delete the dataset TestSubmission-testrdf4 + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission-testrdf4", + expect_status="*", expect_reason="*") + + # Delete the dataset TestSubmission + resp = self.doHTTP_DELETE( + resource="datasets/TestSubmission", + expect_status="*", expect_reason="*") + + # Sentinel/placeholder tests + + def testUnits(self): + assert (True) + + def testComponents(self): + assert (True) + + def testIntegration(self): + assert (True) + + def testPending(self): + #Need to have performance tests and analyse performance + #Need to set the permission of file being uploaded + #assert (False), "Pending tests follow" + assert (True) + +# Assemble test suite + +def getTestSuite(select="unit"): + """ + Get test suite + + select is one of the following: + "unit" return suite of unit tests only + "component" return suite of unit and component tests + "all" return suite of unit, component and integration tests + "pending" return suite of pending tests + name a single named test to be run + """ + testdict = { + "unit": + [ "testUnits" + , "test01CreateSilo" + , "testListSilos" + , "testListDatasets" + , "testSiloState" + , "testDatasetNotPresent" + , "testDatasetCreation" + , "testDatasetCreation2" + , "testDatasetRecreation" + , "testDeleteDataset" + , "testDatasetNaming" + , "testDatasetStateInformation" + , "testFileUpload" + , "testFileDelete" + , "testFileUpdate" + #, "testGetDatasetByVersionByURI" + , "testGetDatasetByVersionByParameter" + , "testPostMetadataFile" + , "testMetadataFileUpdate" + , "testMetadataFileDelete" + , "testPutCreateFile" + , "testPutUpdateFile" + , "testPutMetadataFile" + , "testUnicodeMetadataFileUpdate" + , "testChangeEmbargo" + , "testFileUnpack" + , "testSymlinkFileUnpack" + , "testMetadataMerging" + , "testMetadataInDirectoryMerging" + , "testFileUploadToUnpackedDataset" + , "testUpdateUnpackedDataset" + , "testReferencedMetadataMerging" + , "testReferencedMetadataMerging2" + ], + "component": + [ "testComponents" + ], + "integration": + [ "testIntegration" + ], + "pending": + [ "testPending" + ] + } + return TestUtils.getTestSuite(TestSubmission, testdict, select=select) + +if __name__ == "__main__": + TestUtils.runTests("TestSubmission.log", getTestSuite, sys.argv) + +# End. diff --git a/rdfdatabank/tests/__init__.py b/rdfdatabank/tests/__init__.py index d51f6f2..e69de29 100644 --- a/rdfdatabank/tests/__init__.py +++ b/rdfdatabank/tests/__init__.py @@ -1,36 +0,0 @@ -"""Pylons application test package - -This package assumes the Pylons environment is already loaded, such as -when this script is imported from the `nosetests --with-pylons=test.ini` -command. - -This module initializes the application via ``websetup`` (`paster -setup-app`) and provides the base testing objects. -""" -from unittest import TestCase - -from paste.deploy import loadapp -from paste.script.appinstall import SetupCommand -from pylons import config, url -from routes.util import URLGenerator -from webtest import TestApp - -import pylons.test - -__all__ = ['environ', 'url', 'TestController'] - -# Invoke websetup with the current config file -SetupCommand('setup-app').run([config['__file__']]) - -environ = {} - -class TestController(TestCase): - - def __init__(self, *args, **kwargs): - if pylons.test.pylonsapp: - wsgiapp = pylons.test.pylonsapp - else: - wsgiapp = loadapp('config:%s' % config['__file__']) - self.app = TestApp(wsgiapp) - url._push_object(URLGenerator(config['routes.map'], environ)) - TestCase.__init__(self, *args, **kwargs) diff --git a/rdfdatabank/tests/functional/test_objects.py b/rdfdatabank/tests/functional/test_objects.py deleted file mode 100644 index 50f357c..0000000 --- a/rdfdatabank/tests/functional/test_objects.py +++ /dev/null @@ -1,7 +0,0 @@ -from rdfdatabank.tests import * - -class TestObjectsController(TestController): - - def test_index(self): - response = self.app.get(url(controller='objects', action='index')) - # Test response... diff --git a/rdfdatabank/tests/functional/test_packages.py b/rdfdatabank/tests/functional/test_packages.py deleted file mode 100644 index 432ad20..0000000 --- a/rdfdatabank/tests/functional/test_packages.py +++ /dev/null @@ -1,7 +0,0 @@ -from rdfdatabank.tests import * - -class TestPackagesController(TestController): - - def test_index(self): - response = self.app.get(url(controller='packages', action='index')) - # Test response... diff --git a/rdfdatabank/tests/pylons_init.py b/rdfdatabank/tests/pylons_init.py new file mode 100644 index 0000000..d51f6f2 --- /dev/null +++ b/rdfdatabank/tests/pylons_init.py @@ -0,0 +1,36 @@ +"""Pylons application test package + +This package assumes the Pylons environment is already loaded, such as +when this script is imported from the `nosetests --with-pylons=test.ini` +command. + +This module initializes the application via ``websetup`` (`paster +setup-app`) and provides the base testing objects. +""" +from unittest import TestCase + +from paste.deploy import loadapp +from paste.script.appinstall import SetupCommand +from pylons import config, url +from routes.util import URLGenerator +from webtest import TestApp + +import pylons.test + +__all__ = ['environ', 'url', 'TestController'] + +# Invoke websetup with the current config file +SetupCommand('setup-app').run([config['__file__']]) + +environ = {} + +class TestController(TestCase): + + def __init__(self, *args, **kwargs): + if pylons.test.pylonsapp: + wsgiapp = pylons.test.pylonsapp + else: + wsgiapp = loadapp('config:%s' % config['__file__']) + self.app = TestApp(wsgiapp) + url._push_object(URLGenerator(config['routes.map'], environ)) + TestCase.__init__(self, *args, **kwargs) diff --git a/rdfdatabank/tests/testdata/images.zip b/rdfdatabank/tests/testdata/images.zip new file mode 100755 index 0000000..9f40c71 Binary files /dev/null and b/rdfdatabank/tests/testdata/images.zip differ diff --git a/rdfdatabank/tests/testdata/manifest-admin.rdf b/rdfdatabank/tests/testdata/manifest-admin.rdf new file mode 100644 index 0000000..4e2eb7d --- /dev/null +++ b/rdfdatabank/tests/testdata/manifest-admin.rdf @@ -0,0 +1,9 @@ +
ثمت مسايل Øنين ÙÙŠ Øادي عشر شهر جمادى الاخر سنه سبع وثمانين وسبعمايه بخط ألعَبد الÙَقير ألراجي عÙÙˆ رَبه يعقوب عبد اللّه بن ابى المÙرجا الاسرايلي غÙر اللّه Ù„ÙŽÙ‡ امين والØمد للّه رب العالمي +
واذا كان البول معتدلًا ÙÙŠ قوامه مايلًا الي لون النار Ùعلي ماذا يدل اذا كان معه Ø«ÙÙ„ÙŒ راسبٌ +
ما السبب الذي له صار البول الاØمر التانى والبول الاسود لا يكون معهما للبول قوام معتدل +
الثÙÙ„ الراسب ÙÙŠ البول متي يكون جيدًا Ù…Øمودًا ومتي يكون رديًا مذمومًا +
اذا كان ÙÙŠ البول دم ÙˆÙ‚ÙŠØ Ùعلي ما ذا يدل +
بماذا ÙŠÙرق بين Ø§Ù„Ù‚ÙŠØ Ø§Ù„Ø¯ÙŠ يخرج من الكليتين والمثانه وبين Ø§Ù„Ù‚ÙŠØ Ø§Ù„Ø¯ÙŠ يخرج من الاعضآء]] \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/testrdf/directory/file1.a b/rdfdatabank/tests/testdata/testrdf/directory/file1.a new file mode 100644 index 0000000..dc86f56 --- /dev/null +++ b/rdfdatabank/tests/testdata/testrdf/directory/file1.a @@ -0,0 +1 @@ +file1.a \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/testrdf/directory/file1.b b/rdfdatabank/tests/testdata/testrdf/directory/file1.b new file mode 100644 index 0000000..e8e8839 --- /dev/null +++ b/rdfdatabank/tests/testdata/testrdf/directory/file1.b @@ -0,0 +1 @@ +file1.b \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/testrdf/directory/file2.a b/rdfdatabank/tests/testdata/testrdf/directory/file2.a new file mode 100644 index 0000000..fab6798 --- /dev/null +++ b/rdfdatabank/tests/testdata/testrdf/directory/file2.a @@ -0,0 +1 @@ +file2.a \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/testrdf/manifest.rdf b/rdfdatabank/tests/testdata/testrdf/manifest.rdf new file mode 100644 index 0000000..194f07e --- /dev/null +++ b/rdfdatabank/tests/testdata/testrdf/manifest.rdf @@ -0,0 +1,16 @@ +
ריש ×ž×ª×™×‘×ª× ×‘×¡×•×¨× ×œ× ×§×‘×™×œ×• ×ž×™× ×™×” ×פילו בחייה +
ו×תכ××œ×”× ×¢×œ×™ קלה ×פה×× ××œ× ×ס פר×ית ×ן ×כתצר גמל ×ž× ×™×§×¨×‘ מן וגוה וגוב ×ל×ומ×ן ×לכפיפה ו×לתקילה ××¢× ×™ שבועת ד××•×¨×™×ª× +
×× ×‘×’×¤×• ×™×‘× ×‘×’×¤×• ×™×¦× ×›×œ×•Ì‡ יחידי × ×›× ×¡ יחידי ×™×¦× ×•×›×Ÿ ×”×•× ×ומר תמכור עמך +
×ž×ª× ×™Ì‡ ×‘× ×” בית חדש ×•×§× ×” ×›×œ×™× ×—×“×©×™× ×ומר ×©×”×—×™×™× ×• וכול̇ זו השמועה משובשת ×”×™× ×‘× ×•×¡×—×ות ×בל ×× ×• × ×¡×—× ×•×” מן ×”× ×•×¡×—× ×©×‘××” מבבל ובן סידורה \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/testrdf3/manifest.rdf b/rdfdatabank/tests/testdata/testrdf3/manifest.rdf new file mode 100644 index 0000000..8753721 --- /dev/null +++ b/rdfdatabank/tests/testdata/testrdf3/manifest.rdf @@ -0,0 +1,14 @@ +
+En français la convention est « d'utiliser les guillemets français doubles pour les citations, et “ les guillemets anglais doubles †ou bien ‹ les guillemets français simples › pour les citations imbriquées. » +
+Auf Deutsch ist die Vereinbarung »umgekehrte zweifache Anführungszeichen für die Zitate zu benutzen, sogar ›einfache Anführungszeichen‹ für die verschachtelte Zitate«; diese Anführungszeichen „dürfen auch solche ‚englische‘ Anführungszeichen sein.“ +
+The en-dash is used between numbers such as in: 1685–1750 (J. S. Bach). It is longer than the hyphen (as in “en-dashâ€, or, more properly, “en-dashâ€) but shorter than the em-dash, which is used — like this — as a sort of parenthesis. Neither should be confused with the horizontal bar which is used to introduce quotation in some cases.
+― Like this?
+― Right.
+The ellipsis is… well, it just is. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode01.xml b/rdfdatabank/tests/testdata/unicodedata/unicode01.xml new file mode 100644 index 0000000..237f4d7 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode01.xml @@ -0,0 +1,22 @@ + +
+Base Grave Acute Circumflex Tilde Diaeresis Macron Breve Ogonek Dot Double acute Caron Double grave Inverted breve
+a à á â ã ä Ä Äƒ Ä… ȧ X ÇŽ È Èƒ
+e è é ê ẽ ë ē ĕ ę ė X ě ȅ ȇ
+i ì à î Ä© ï Ä« Ä Ä¯ i X Ç È‰ È‹
+o ò ó ô õ ö Å Å Ç« ȯ Å‘ Ç’ È È
+u ù ú û ũ ü ū Šų X ű ǔ ȕ ȗ
+y ỳ ý ŷ ỹ ÿ ȳ X X ẠX X X X
+
+Note that the three characters “LATIN SMALL LETTER A WITH DOT ABOVEâ€, “LATIN SMALL LETTER O WITH DOT ABOVE†and “LATIN SMALL LETTER Y WITH MACRON†were not present in version 2.0 of the Unicode standard. So it is quite understandable if you do not see the corresponding entries. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode02.xml b/rdfdatabank/tests/testdata/unicodedata/unicode02.xml new file mode 100644 index 0000000..d14e5fa --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode02.xml @@ -0,0 +1,22 @@ + +
+aÌ€=à ; eÌ=é; iÌ‚=î (not the same as ı̂ but may be graphically identical); õ=õ; uÌ„=Å« (whereas u¯ is two different symbols); ă=ă; ė=Ä— (also note i̇ should be essentially i); ï=ï (whereas i̇̈ has three dots on the i); aÌŠ=Ã¥ (not to be confused with a° (read “a degreesâ€) nor aËš); oÌ‹=Å‘; cÌŒ=Ä +ç=ç; bÌ£=ḅ; ḏ=Ḡ(this is supposedly different from dÌ but may be graphically identical); eÌ=ḙ +ǖ=ǖ=Ç– (not the same as ṻ which has the diaeresis on top of the macron); ǡ=ǡ=Ç¡ +ǭ=Ç«Ì„=Ç (also ǭ but the latter is not so canonical); oÌ·Ì=øÌ=Ç¿ (not so sure about this one) \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode03.xml b/rdfdatabank/tests/testdata/unicodedata/unicode03.xml new file mode 100644 index 0000000..53c3684 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode03.xml @@ -0,0 +1,18 @@ + +
+Sym. English name Latin name Latin genitive α star
+♈ The Ram Aries Arietis Hamal
+♉ The Bull Taurus Tauri Aldebaran
+♊ The Twins Gemini Geminorum Castor
+♋ The Crab Cancer Cancri Acubens
+♌ The Lion Leo Leonis Regulus
+â™ The Virgin Virgo Virginis Spica
+♎ The Scales Libra Libræ Zumen el Genubi
+â™ The Scorpion Scorpius Scorpii Antares
+â™ The Archer Sagittarius Sagittarii Rubkat
+♑ The Sea Goat Capricornus Capricorni Giedi
+â™’ The Water Bearer Aquarius Aquarii Sadalmelik
+♓ The Fishes Pisces Piscium El Rischa
+
+The following table should show a chessboard, with a pictorial representation of the pieces:
+ A B C D E F G H
+8 ♜ ♞ ♠♛ ♚ ♠♞ ♜
+7 ♟ ♟ ♟ ♟ ♟ ♟ ♟ ♟
+6
+5
+4
+3
+2 â™™ â™™ â™™ â™™ â™™ â™™ â™™ â™™
+1 ♖ ♘ ♗ ♕ ♔ ♗ ♘ ♖
+
+Here is a snowflake: â„. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode04.xml b/rdfdatabank/tests/testdata/unicodedata/unicode04.xml new file mode 100644 index 0000000..47be766 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode04.xml @@ -0,0 +1,39 @@ + +
+
+ По оживлённым берегам
+ Громады Ñтройные теÑнÑÑ‚ÑÑ
+ Дворцов и башен; корабли
+ Толпой Ñо вÑех концов земли
+ К богатым приÑтанÑм ÑтремÑÑ‚ÑÑ;
+
+Here is a transcription of it:
+
+ Po oživlënnym beregam
+ Gromady strojnye tesnâtsâ
+ Dvorcov i bašen; korabli
+ Tolpoj so vseh koncov zemli
+ K bogatym pristanâm stremâtsâ;
+
+A rough translation might be:
+
+ Along the animated banks [of the Neva] / the shapely masses press / of palaces and towers; ships / in crowd from all corners of the Earth / rush toward its rich quays. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode05.xml b/rdfdatabank/tests/testdata/unicodedata/unicode05.xml new file mode 100644 index 0000000..9c62fd3 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode05.xml @@ -0,0 +1,31 @@ + +
+
+ Ἰοὺ ἰού· Ï„á½° πάντʼ ἂν á¼Î¾á½µÎºÎ¿Î¹ σαφῆ.
+ á½® φῶς, τελευταῖόν σε Ï€ÏοσÏλέψαιμι νῦν,
+ ὅστις πέφασμαι φύς τʼ ἀφʼ ὧν οὠχÏῆν, ξὺν οἷς τʼ
+ οὠχÏῆν á½Î¼Î¹Î»á¿¶Î½, οὕς Ï„á½³ μʼ οá½Îº ἔδει κτανών.
+
+Here is the transcription of it:
+
+ Iou iou; ta pant' an exēkoi saphē.
+ ÅŒ phÅs, teleutaion se prosblepsaimi nun,
+ hostis pephasmai phus t' aph' hÅn ou khrÄ“n, xun hois t'
+ ou khrÄ“n homilÅn, hous te m' ouk edei ktanÅn.
+
+A rough translation might be:
+
+ Alas! All would become clear. / O light, may I see you for the last time, / I who was born of these of which it is a crime to be born, who live with these / which which it is a crime to live, and who killed these whom I must not kill. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode06.xml b/rdfdatabank/tests/testdata/unicodedata/unicode06.xml new file mode 100644 index 0000000..d6da5ac --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode06.xml @@ -0,0 +1,29 @@ + +
+
+ पशà¥à¤ªà¤¤à¤¿à¤°à¤ªà¤¿ तानà¥à¤¯à¤¹à¤¾à¤¨à¤¿ कृचà¥à¤›à¥à¤°à¤¾à¤¦à¥
+ अगमयददà¥à¤°à¤¿à¤¸à¥à¤¤à¤¾à¤¸à¤®à¤¾à¤—मोतà¥à¤•à¤ƒ ।
+ कमपरमवशं न विपà¥à¤°à¤•à¥à¤°à¥à¤¯à¥à¤°à¥
+ विà¤à¥à¤®à¤ªà¤¿ तं यदमी सà¥à¤ªà¥ƒà¤¶à¤¨à¥à¤¤à¤¿ à¤à¤¾à¤µà¤¾à¤ƒ ॥
+
+And here is the transcription of it:
+
+ PaÅ›upatirapi tÄnyahÄni ká¹›cchrÄd
+ agamayadadrisutÄsamÄgamotkaḥ;
+ kamaparamavaśaṃ na viprakuryur
+ vibhumapi taṃ yadamÄ« spṛśanti bhÄvÄḥ?
+
+A rough translation might be:
+
+ And Paśupati passed those days with hardship, / eager for union with the daughter of the mountain. / Which other powerless [creature] would they not torment, / such emotions, when they affect even the powerful [Śiva]? \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode07.xml b/rdfdatabank/tests/testdata/unicodedata/unicode07.xml new file mode 100644 index 0000000..cd7a87c --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode07.xml @@ -0,0 +1,29 @@ + +
+
+ å曰：「å¸è€Œæ™‚習之，ä¸äº¦èªªä¹Žï¼Ÿæœ‰æœ‹è‡ªé 方來，ä¸äº¦æ¨‚乎？
+ 人ä¸çŸ¥è€Œä¸æ…，ä¸äº¦å›å乎？ã€
+
+ 有å曰：「其為人也å弟，而好犯上者，鮮矣；
+ ä¸å¥½çŠ¯ä¸Šï¼Œè€Œå¥½ä½œäº‚者，未之有也。å›å務本，本立而é“生。
+ å弟也者，其為ä»ä¹‹æœ¬èˆ‡ï¼ã€
+
+And here is the transcription of it:
+
+ ZÇ yuÄ“: “Xué ér shÄ« xà zhÄ«, bú yì yuè hÅ«? YoÇ” péng zì yÇ”an fÄnglái, bú yì lè hÅ«? Rén bù zhÄ«, ér bú yùn, bú yì jÅ«nzÇ hÅ«?â€
+
+ YóuzÇ yuÄ“: “Qà wèi rén yÄ› xià odì, ér hà ofà nshà ngzhÄ›, xiÄn yÇ; bú hà o fà nshà ng, ér hà ozuòluà nzhÄ›, wèi zhÄ« yóu yÄ›. JÅ«nzÇ wù bÄ›n, bÄ›n lì ér dà o shÄ“ng. Xià odì yé zhÄ›, qà wèi rén zhÄ« bén yÇ”!â€
+
+A rough translation might be:
+
+ The Master [Confucius] said: “To study and to practice, it is is a joy, isn't it? When friends come from afar, it is a pleasure, isn't it? If one remains unknown and isn't hurt, isn't one an honorable man?â€
+
+ Master You said: “Few of the men who act well filially and fraternally are also fond of offending their superiors; men who are not fond of offending their superiors, but who like to cause trouble, such do not exist. The honorable man concerns himself with the foundations. Once the foundations are established, the Way is born. Is not acting well filially and fraternally the foundation of humanity?†\ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode08.xml b/rdfdatabank/tests/testdata/unicodedata/unicode08.xml new file mode 100644 index 0000000..05a4e60 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode08.xml @@ -0,0 +1,32 @@ + +
+
+ ஸà¯à®±à¯€à®©à®¿à®µà®¾à®¸ ராமானà¯à®œà®©à¯ à®à®¯à®™à¯à®•à®¾à®°à¯
+
+And here is a transcription of it:
+
+ SṟīṉivÄsa RÄmÄṉujaṉ Aiyaá¹…kÄr
+
+Here there can be no translation, of course, since this is a proper noun. But I note that the mathematician in question (1887–1920) is typically named “Srinivasa Ramanujan Iyengar†in English. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode09.xml b/rdfdatabank/tests/testdata/unicodedata/unicode09.xml new file mode 100644 index 0000000..7a7ea6d --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode09.xml @@ -0,0 +1,21 @@ + +
+ + بÙسْم٠ٱللّٰه٠ٱلرَّØْمـَبن٠ٱلرَّØÙيم٠+
+ ٱلْØَمْد٠لÙلّٰه٠رَبّ٠ٱلْعَالَمÙينَ +
+ ٱلرَّØْمـَبن٠ٱلرَّØÙيم٠+
+ مَـالÙك٠يَوْم٠ٱلدّÙين٠+
+ Ø¥Ùيَّاكَ نَعْبÙد٠وَإÙيَّاكَ نَسْتَعÙين٠+
+ ٱهْدÙنَــــا ٱلصّÙرَاطَ ٱلمÙسْتَقÙيمَ +
+ صÙرَاطَ ٱلَّذÙينَ أَنعَمْتَ عَلَيهÙمْ غَير٠ٱلمَغضÙوب٠عَلَيهÙمْ وَلاَ ٱلضَّالّÙينَ +
+And here is a transcription of it:
+
+ bismi ăl-la'hi ăr-raḥma'ni ăr-raḥiymi
+
+ ăl-ḥamdu li-lla'hi rabbi ăl-`a'lamiyna
+
+ ăr-raḥma'ni ăr-raḥiymi
+
+ ma'liki yawmi ăd-diyni
+
+ 'iyya'ka na`budu wa-'iyya'ka nasta`iynu
+
+ Ähdina' ăṣ-á¹£ira'á¹a ăl-mustaqiyma
+
+ á¹£ira'á¹a ăllaá¸iyna 'an`amta `alayhim Ä¡ayri ăl-maÄ¡á¸uwbi `alayhim wala' ăá¸-á¸a'lliyna
+
+A rough translation might be:
+
+ In the name of God, the beneficient, the merciful.
+
+ Praise be to God, lord of the worlds.
+
+ The beneficient, the merciful.
+
+ Master of the day of judgment.
+
+ Thee do we worship, and Thine aid we seek.
+
+ Lead us on the right path.
+
+ The path of those on whom Thou hast bestowed favors. Not of those who have earned Thy wrath, nor of those who go astray. \ No newline at end of file diff --git a/rdfdatabank/tests/testdata/unicodedata/unicode10.xml b/rdfdatabank/tests/testdata/unicodedata/unicode10.xml new file mode 100644 index 0000000..b5bc9d1 --- /dev/null +++ b/rdfdatabank/tests/testdata/unicodedata/unicode10.xml @@ -0,0 +1,58 @@ + +