+
+
+
+
+
+
+ ${self.body()}
+
+ info on project goes here goes here...
+ +Background
+ + +Documentation
+ + +-
+
- Databank features + + + + +
- Architecture of Databank + +
- How and why to add user metadata + +
- User roles supported in Databank + +
- Databank Embargo Policies: Accessing data within Databank + +
- DOIs for data packages: Publishing the Data in Databank + +
- +
Admin Interface - ${c.silo_name}
-% if c.silo_name: -Admin ${c.silo_name}
-% if c.message: -${c.message}
-% endif --
Delete this silo - NO UNDO!
--% endif -<%include file="/silo_metadata.html"/> -
-<%include file="/alter_silo.html"/> -
- +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +
Admin Interface - ${c.silo_name}
+% if c.silo_name: +Admin ${c.silo_name}
+% if c.message: + +% endif ++ +
+% endif +
Silo metadata
+<%include file="/silo_metadata.html"/> ++
Update silo metadata
+<%include file="/alter_silo.html"/> ++ diff --git a/rdfdatabank/templates/admin_user.html b/rdfdatabank/templates/admin_user.html index 182e637..7e3c178 100644 --- a/rdfdatabank/templates/admin_user.html +++ b/rdfdatabank/templates/admin_user.html @@ -1,37 +1,38 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -
Silo ${c.silo_name}
-User info for ${c.username}
-% if c.message: -${c.message}
-% endif -%if c.user: - -% endif --<%include file="/update_user.html"/> +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +
Silo ${c.silo_name}
+User info for ${c.username}
+% if c.message: +${c.message}
+% endif +%if c.user: + +% endif ++
Update user information
+<%include file="/update_user.html"/> diff --git a/rdfdatabank/templates/admin_users.html b/rdfdatabank/templates/admin_users.html index 7db49d8..fff3cc7 100644 --- a/rdfdatabank/templates/admin_users.html +++ b/rdfdatabank/templates/admin_users.html @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -Users - ${c.silo_name}
-Users in ${c.silo_name}
-% if c.message: -${c.message}
-% endif --% if c.users: -
-
- % for o in c.users:
-
- ${o} - % endfor -
-<%include file="/register_new_user.html"/> +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +
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 f83250d..8d06f3a 100644 --- a/rdfdatabank/templates/alter_silo.html +++ b/rdfdatabank/templates/alter_silo.html @@ -1,23 +1,23 @@ -# -*- coding: utf-8 -*- -Alter Silo
--
- +# -*- coding: utf-8 -*- ++
+ diff --git a/rdfdatabank/templates/api.html b/rdfdatabank/templates/api.html index a740db5..b8da929 100644 --- a/rdfdatabank/templates/api.html +++ b/rdfdatabank/templates/api.html @@ -1,15 +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}"/>
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ To learn more about Databank visit the Databank wiki
-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
index 2a8a0a5..ebedd08 100644
--- a/rdfdatabank/templates/atom_results.html
+++ b/rdfdatabank/templates/atom_results.html
@@ -1,2 +1,2 @@
-
-${c.atom}
+
+${c.atom}
diff --git a/rdfdatabank/templates/base.html b/rdfdatabank/templates/base.html
index 88c7d63..4f344e2 100644
--- a/rdfdatabank/templates/base.html
+++ b/rdfdatabank/templates/base.html
@@ -1,99 +1,197 @@
-# -*- coding: utf-8 -*-
-
-
-
-
- ${ h.stylesheet_link( '/static/style.css' ) }
- ${ h.javascript_link( '/static/jquery.js' ) }
- ${self.head_tags()}
-
-
-
- To learn more about Databank visit the Databank wiki
+
-
-
-
+# -*- 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")
- if user_logged_in:
- c.user_logged_in_name = user_logged_in['repoze.who.userid']
- current_url = request.environ.get('PATH_INFO')
- %>
-
-
- % if c.id: - % if c.path: -
-
- - % if c.id: - % if c.path: -
Subdirectory ${c.id}/${c.path}
-Root directory: ${c.id}
- % else: -Root directory of ${c.id}
- % endif - % endif - ${self.body()} -
+
+ <%include file="/header.html"/>
+
+ <%
+ user_logged_in = request.environ.get("repoze.who.identity")
+ if user_logged_in:
+ c.user_logged_in_name = user_logged_in['repoze.who.userid']
+ current_url = request.environ.get('PATH_INFO')
+ %>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rdfdatabank/templates/create_doi.html b/rdfdatabank/templates/create_doi.html
index aa972d8..f98db20 100644
--- a/rdfdatabank/templates/create_doi.html
+++ b/rdfdatabank/templates/create_doi.html
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/create_new_item.html b/rdfdatabank/templates/create_new_item.html
index b020d30..c8cd06a 100644
--- a/rdfdatabank/templates/create_new_item.html
+++ b/rdfdatabank/templates/create_new_item.html
@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/create_new_silo.html b/rdfdatabank/templates/create_new_silo.html
index 0e481db..5bc61a8 100644
--- a/rdfdatabank/templates/create_new_silo.html
+++ b/rdfdatabank/templates/create_new_silo.html
@@ -1,15 +1,18 @@
-# -*- coding: utf-8 -*-
-
+
+
+
+
+
+
+
+
+
+
+ Create new Silo
--
- +# -*- coding: utf-8 -*- +
+
diff --git a/rdfdatabank/templates/datasetview.html b/rdfdatabank/templates/datasetview.html
index 3e40b18..f75559d 100644
--- a/rdfdatabank/templates/datasetview.html
+++ b/rdfdatabank/templates/datasetview.html
@@ -1,114 +1,217 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
-
- Create new Silo
+ + +Dataset ${c.id}
- - -% if c.embargos: -Embargo Information
-% if c.embargos[c.current][0] not in ['False', 'false', 0, False]: -Embargoed: True
-Embargoed until: ${c.embargos[c.current][1]}
-% else: -Embargoed: False
-% endif -% endif - - -% if c.editor: -
- % if c.view == 'editor':
- Editor view
- % else:
- User view
- % endif
- % if c.version:
-
Change view : - Editor | - User - % else: -
Change view : - Editor | - User - % endif -
-% endif
-
-Change view : - Editor | - User - % else: -
Change view : - Editor | - User - % endif -
-% if c.version:
-
-
-
-
-% if c.editor:
- Information for version ${c.version} of the dataset
-% endif - - - -% if c.show_files: - % if c.editor: - <%include file="/part_list.html"/> - % else: - <%include file="/part_list_display.html"/> - % endif -% endif - - -% if c.readme_text: -<%include file="/readme_section.html"/> -% endif - - --
-
- Item's RDF Manifest (Accept: most RDF mimetypes): -
${c.manifest_pretty}
-
-
- % if c.view == 'editor':
-
-% endif
-
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+
+ -
-
-
- Change Embargo -
-
- <%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.
-
-
- - Add metadata to the RDF Manifest: -
- <%include file="/rdf_manifest_form.html"/> -
List of item unpack endpoints:
--
- % for zf in c.zipfiles:
- <%
- c.zipfile = zf
- c.newid = c.zipfiles[zf]
- %>
-
- <%include file="/files_unpack.html"/> - % endfor -
Dataset ${c.id}
+% if c.version: +Version ${c.version}
+% elif c.versions: +Version ${c.versions[-1]}
+% endif + +% if c.editor: +
+
+% endif
+
+
+Editorial functions
+ + + + + + + + + + % if c.zipfiles: + + % endif +
View state information
Update access policy
Add metadata
Upload file
Delete dataset
Unpack zip files
+% 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: + % for i in range(1, len(c.versions)-1): + % if c.version and c.versions[i] == c.version: + ${c.versions[i]} | + % else: + ${c.versions[i]} | + % endif + % endfor + % if c.version: + % if c.version == c.versions[-1]: + ${c.versions[-1]} + % else: + ${c.versions[-1]} + % endif + % else: + ${c.versions[-1]} + % endif +
+% endif +
+
+
+% if c.embargos:
+
diff --git a/rdfdatabank/templates/datasetview_version.html b/rdfdatabank/templates/datasetview_version.html
index 6e18250..f7b645c 100644
--- a/rdfdatabank/templates/datasetview_version.html
+++ b/rdfdatabank/templates/datasetview_version.html
@@ -1,49 +1,49 @@
-# -*- 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]:
+ <% c.emb = c.embargos[c.current] %>
+ % 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 ${c.emb[1]}. 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
+
Dataset ${c.id}
- -
-
-
-
-% if c.editor or c.embargos[c.current][0] in ['False', 'false', 0, False]:
-<%include file="/part_list_display.html"/>
-% endif
-
-
-% if c.readme_text:
-<%include file="/readme_section.html"/>
-% endif
-
-
-Item's RDF Manifest (Accept: most RDF mimetypes):
-
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+
+ -
-% if c.embargos:
-
- Embargo Information -% if c.embargos[c.current][0] not in ['False', 'false', 0, False]: -
- Embargoed: True -
- Embargoed until: ${c.embargos[c.current][1]} -% else: -
- Embargoed: False -% endif -% endif -
${c.manifest_pretty}Dataset ${c.id}
+ +
+
+
+
+% if c.editor or c.embargos[c.current][0] in ['False', 'false', 0, False]:
+<%include file="/part_list_display.html"/>
+% endif
+
+
+% if c.readme_text:
+<%include file="/readme_section.html"/>
+% endif
+
+
+Item's RDF Manifest (Accept: most RDF mimetypes):
+
diff --git a/rdfdatabank/templates/delete_item.html b/rdfdatabank/templates/delete_item.html
index b020d30..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
index 89447d6..ea96f5a 100644
--- a/rdfdatabank/templates/doiview.html
+++ b/rdfdatabank/templates/doiview.html
@@ -1,43 +1,43 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
- -
+% if c.embargos:
+
- Embargo Information +% if c.embargos[c.current][0] not in ['False', 'false', 0, False]: +
- Embargoed: True +
- Embargoed until: ${c.embargos[c.current][1]} +% else: +
- Embargoed: False +% endif +% endif +
${c.manifest_pretty}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 dataset
--
- % 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
-
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ 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 dataset
+-
+ % 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 e32d2b2..7b4c55b 100644
--- a/rdfdatabank/templates/embargo_form.html
+++ b/rdfdatabank/templates/embargo_form.html
@@ -1,27 +1,37 @@
-# -*- coding: utf-8 -*-
-
+# -*- coding: utf-8 -*-
+
diff --git a/rdfdatabank/templates/file_upload.html b/rdfdatabank/templates/file_upload.html
index 89f25d4..3c5324a 100644
--- a/rdfdatabank/templates/file_upload.html
+++ b/rdfdatabank/templates/file_upload.html
@@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
-Add File to ${c.id}
-- diff --git a/rdfdatabank/templates/files_unpack.html b/rdfdatabank/templates/files_unpack.html index 7e57eb5..9430ea5 100644 --- a/rdfdatabank/templates/files_unpack.html +++ b/rdfdatabank/templates/files_unpack.html @@ -1,18 +1,20 @@ -# -*- coding: utf-8 -*- -% if c.zipfile: - -%endif +# -*- coding: utf-8 -*- +% if c.zipfile: + +%endif diff --git a/rdfdatabank/templates/files_unpack2.html b/rdfdatabank/templates/files_unpack2.html index a3798d5..799de04 100644 --- a/rdfdatabank/templates/files_unpack2.html +++ b/rdfdatabank/templates/files_unpack2.html @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- -% if c.zipfile: - -%endif +# -*- coding: utf-8 -*- +% if c.zipfile: + +%endif diff --git a/rdfdatabank/templates/footer.html b/rdfdatabank/templates/footer.html index d3c2e9f..70b9c3c 100644 --- a/rdfdatabank/templates/footer.html +++ b/rdfdatabank/templates/footer.html @@ -1,3 +1,11 @@ -# -*- coding: utf-8 -*- -
Copyright resides with the noted authors/creators of the works held here, unless otherwise noted.
- +# -*- coding: utf-8 -*- + +
+
diff --git a/rdfdatabank/templates/header.html b/rdfdatabank/templates/header.html
index 1915c80..0ae526e 100644
--- a/rdfdatabank/templates/header.html
+++ b/rdfdatabank/templates/header.html
@@ -1,5 +1,11 @@
# -*- coding: utf-8 -*-
-Copyright resides with the noted authors/creators of the works held here, unless otherwise noted.
+ +
-
+<%
+from pylons import app_globals as ag
+%>
+
+
diff --git a/rdfdatabank/templates/home-dev.html b/rdfdatabank/templates/home-dev.html
deleted file mode 100644
index 9d9b580..0000000
--- a/rdfdatabank/templates/home-dev.html
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
-
+<%
+from pylons import app_globals as ag
+%>
+ DataBank + %if ag.api_version: + ${ag.api_version} + % endif +
<%include file="/search_form.html"/> -Databank
-The purpose of DataBank is to provide a pilot version of a robust and efficient system for the safe storage of and open access to (where appropriate) research data. Content could be described as data produced as a result of academic research.. Items might comprise files such as spreadsheets, databases, audio files and images (still and moving). Numerical or other data might be raw data or the data may have been manipulated or processed in some way.
- -DataBank is not intended to store large-scale data sets such as grid data or other vast data sets. Neither is it intended to replace national, subject or other established data collections. It is envisaged that the future role of DataBank will be to provide a secure and accessible store of small to medium-sized files which have no other option for similar safe storage.
- -Please note DataBank is a pilot system and still under development.
- -Users should adhere to the terms and conditions stated for each item.
- -Browse Data packages
- -- -
How to use Databank
- -The admin credentials used in this demo instance of Databank are
username: admin
Password: test
Databank documentation
--
-
- Databank features - -
- Architecture of Databank -
- How and why to add user metadata -
- User roles supported in Databank -
- Databank Embargo Policies: Accessing data within Databank -
- DOIs for data packages: Publishing the Data in Databank -
Using the Databank API
-Data can be submitted into Databank by using the Databank API. The API provides a restful web interface to all of Databank's features. -
- - -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
- - Get in touch with the developers of Databank - -diff --git a/rdfdatabank/templates/home-prod.html b/rdfdatabank/templates/home-prod.html deleted file mode 100644 index 0c3a0cf..0000000 --- a/rdfdatabank/templates/home-prod.html +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -
Databank
-Oxford DataBank is a small collection of non-bibliographic works created by Oxford researchers. The purpose of DataBank is to provide a pilot version of a robust and efficient system for the safe storage of and open access to (where appropriate) Oxford research data. Content could be described as .data produced as a result of academic research.. Items might comprise files such as spreadsheets, databases, audio files and images (still and moving). Numerical or other data might be raw data or the data may have been manipulated or processed in some way.
- -DataBank is not intended to store large-scale data sets such as grid data or other vast data sets. Neither is it intended to replace national, subject or other established data collections. It is envisaged that the future role of DataBank will be to provide a secure and accessible store of small to medium-sized files which have no other option for similar safe storage. The role of DataBank will be clarified as Oxford University works towards a solution for the storage of and access to its research data. Please note DataBank is a pilot system and still under development.
- -Users should adhere to the terms and conditions stated for each item.
- - diff --git a/rdfdatabank/templates/home.html b/rdfdatabank/templates/home.html index 9d9b580..976a170 100644 --- a/rdfdatabank/templates/home.html +++ b/rdfdatabank/templates/home.html @@ -1,53 +1,48 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -Databank
-The purpose of DataBank is to provide a pilot version of a robust and efficient system for the safe storage of and open access to (where appropriate) research data. Content could be described as data produced as a result of academic research.. Items might comprise files such as spreadsheets, databases, audio files and images (still and moving). Numerical or other data might be raw data or the data may have been manipulated or processed in some way.
- -DataBank is not intended to store large-scale data sets such as grid data or other vast data sets. Neither is it intended to replace national, subject or other established data collections. It is envisaged that the future role of DataBank will be to provide a secure and accessible store of small to medium-sized files which have no other option for similar safe storage.
- -Please note DataBank is a pilot system and still under development.
- -Users should adhere to the terms and conditions stated for each item.
- -Browse Data packages
- -- -
How to use Databank
- -The admin credentials used in this demo instance of Databank are
username: admin
Password: test
Databank documentation
--
-
- Databank features - -
- Architecture of Databank -
- How and why to add user metadata -
- User roles supported in Databank -
- Databank Embargo Policies: Accessing data within Databank -
- DOIs for data packages: Publishing the Data in Databank -
Using the Databank API
-Data can be submitted into Databank by using the Databank API. The API provides a restful web interface to all of Databank's features. -
- - -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
- - Get in touch with the developers of Databank - -+# -*- 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 has a simple restful api and uses a rdf-enhanced pair tree store which can be used by other data services to archive data in Databank, as is used by DataStage
+DataBank is a pilot system, still under devlopment.
+We are a part of the Dataflow project
+How to use Databank
+ +The admin credentials used in this demo instance of Databank are
username: admin
Password: test
Using the Databank API
+ +Data can be submitted into Databank by using the Databank API. The API provides a restful web interface to all of Databank's features. +
+ +-
+
- Databank API documentation + +
- Test coverage of databank + +
- Using the API - example code in Python +
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
+ + Get in touch with the developers of Databank + diff --git a/rdfdatabank/templates/item_file_upload.html b/rdfdatabank/templates/item_file_upload.html index 6570d54..748f059 100644 --- a/rdfdatabank/templates/item_file_upload.html +++ b/rdfdatabank/templates/item_file_upload.html @@ -1,9 +1,10 @@ -# -*- coding: utf-8 -*- -Add File to ${c.id}/${c.path}
--
- +# -*- coding: utf-8 -*- + diff --git a/rdfdatabank/templates/items_api.html b/rdfdatabank/templates/items_api.html index 79691ec..7505239 100644 --- a/rdfdatabank/templates/items_api.html +++ b/rdfdatabank/templates/items_api.html @@ -1,160 +1,160 @@ -# -*- coding: utf-8 -*- -
-
+# -*- coding: utf-8 -*-
+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 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
-
+
diff --git a/rdfdatabank/templates/itemview.html b/rdfdatabank/templates/itemview.html
index 81ed617..0353e64 100644
--- a/rdfdatabank/templates/itemview.html
+++ b/rdfdatabank/templates/itemview.html
@@ -1,58 +1,123 @@
-# -*- 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
+Dataset ${c.id}
- - -% if c.editor: -
- % if c.view == 'editor':
- Editor view
- % else:
- User view
- % endif
- % if c.version:
-
Change view : - Editor | - User - % else: -
Change view : - Editor | - User - % endif -
-% endif
-
-Change view : - Editor | - User - % else: -
Change view : - Editor | - User - % endif -
-
-% if c.readme_text:
-<%include file="/readme_section.html"/>
-% endif
-
-
-% if c.parts:
- % if c.show_files:
- % if c.editor:
- <%include file="/part_list.html"/>
- % else:
- <%include file="/part_list_display.html"/>
- % endif
- % else:
-
-
-
-% if c.editor and c.view == 'editor':
- You do not have permission to view these files
- % endif -% else: -There are no files or folders in this path
-% endif -
-
- <%include file="/item_file_upload.html"/>
-
-% endif
-
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+ Dataset ${c.id}
+% if c.version: +Version ${c.version}
+% elif c.versions: +Version ${c.versions[-1]}
+% endif + + +% if c.editor: +
+
+% endif
+
+
+Editorial functions
+ + +
+% 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: + % for i in range(1, len(c.versions)-1): + % if c.version and c.versions[i] == c.version: + ${c.versions[i]} | + % else: + ${c.versions[i]} | + % endif + % endfor + % if c.version: + % if c.version == c.versions[-1]: + ${c.versions[-1]} + % else: + ${c.versions[-1]} + % endif + % else: + ${c.versions[-1]} + % endif +
+% 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/itemview_version.html b/rdfdatabank/templates/itemview_version.html
index f2f45a7..379f229 100644
--- a/rdfdatabank/templates/itemview_version.html
+++ b/rdfdatabank/templates/itemview_version.html
@@ -1,11 +1,11 @@
-# -*- 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_datasets.html b/rdfdatabank/templates/list_of_datasets.html index e28b1b1..6c17a94 100644 --- a/rdfdatabank/templates/list_of_datasets.html +++ b/rdfdatabank/templates/list_of_datasets.html @@ -1,22 +1,35 @@ -# -*- coding: utf-8 -*- -% if c.silo_name: -Datasets:
--
-<%
-n = len(c.items)
-%>
-
-
- ${item}
-
- Delete dataset -<% -c.current = item -%> -
- <%include file="/embargo_form.html"/> -
-% endfor
-
Number of Datasets: ${n}
-% for item in sorted(c.items): -Datasets:
+-
+<%
+n = len(c.items)
+%>
+
- - ${item} - % if c.editor: - - % endif - -% endfor -
- ${silo} + % endfor +
- ${zf} :
-View |
-Download
-<%include file="/files_unpack2.html"/>
-
-% endfor
- - ${zf} :
+View |
+Download
+<%include file="/files_unpack2.html"/>
+
+% endfor
+
Number of Datasets: ${n}
+% if n > 0: +| + | +% if c.embargos and item in c.embargos and c.embargos[item]: + <% c.emb = c.embargos[item] %> + % 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 ${c.emb[1]} + % else: + Data package is embargoed indefinitely + % endif + % else: + Data package is openly accessible + % endif +% else: + Data package is openly accessible +% endif + | +
Datasets:
--
-% for item in sorted(c.embargos.keys()):
- <%
- silo_name_joined = "_".join(c.silo_name.split("."))
- item_joined = "_".join(item.split(":"))
- itemid = "%s_%s"%(silo_name_joined, item_joined)
- %>
-
List of Silos
-% if c.silos: -Number of silos: ${n}
- -% endif +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +List of Silos
+% if c.silos: +Number of silos: ${n}
+
+
+% endif
diff --git a/rdfdatabank/templates/list_of_zipfiles.html b/rdfdatabank/templates/list_of_zipfiles.html
index ad461f2..ad8e775 100644
--- a/rdfdatabank/templates/list_of_zipfiles.html
+++ b/rdfdatabank/templates/list_of_zipfiles.html
@@ -1,21 +1,21 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-<%def name="head_tags()">
- -
+ % for silo in c.silos:
+
List of package unpack endpoints
--
-% for zf in c.zipfiles:
-<%
-c.zipfile = zf
-c.newid = c.zipfiles[zf]
-%>
-
List of package unpack endpoints
+-
+% for zf in c.zipfiles:
+<%
+c.zipfile = zf
+c.newid = c.zipfiles[zf]
+%>
+
-
${session.get('login_flash') | n}
-
- <% - del session['login_flash'] - session.save() - %> - % endif - - -<%inherit file="/base.html" /> -
Login
-${self.flash()} --
+
${session.get('login_flash') | n}
+
+ <% + del session['login_flash'] + session.save() + %> + % endif + + +<%inherit file="/base.html" /> +
Login
+${self.flash()} ++
+ diff --git a/rdfdatabank/templates/logout.html b/rdfdatabank/templates/logout.html index 70a68ff..7b71542 100644 --- a/rdfdatabank/templates/logout.html +++ b/rdfdatabank/templates/logout.html @@ -1,14 +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
-- +# -*- 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/part_list.html b/rdfdatabank/templates/part_list.html index 57bcebc..df7b85e 100644 --- a/rdfdatabank/templates/part_list.html +++ b/rdfdatabank/templates/part_list.html @@ -1,35 +1,39 @@ -% if c.parts: -
-
-<%
-if c.path:
- subpath = "/%s" % c.path
-else:
- subpath = ""
-%>
-% if c.version:
-% for part in c.parts:
-% if not part.startswith('3=') and not part.startswith('4='):
-% if type(c.parts).__name__ == 'dict' and c.parts[part]:
-
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} -% else: -
- ${part} -% endif -% endif -% endfor -% else: -% for part in c.parts: -% if not part.startswith('3=') and not part.startswith('4='): -% if type(c.parts).__name__ == 'dict' and c.parts[part]: -
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} - (remove) -% else: -
- ${part} - (remove) -% endif -% endif -% endfor -% endif - - - -
-
+<%
+if c.path:
+ subpath = "/%s" % c.path
+else:
+ subpath = ""
+
+if c.version and c.versions and c.version == c.versions[-1]:
+ c.latest = True
+else:
+ c.latest= False
+%>
+% if c.version and not c.latest:
+% for part in c.parts:
+% if not part.startswith('3=') and not part.startswith('4='):
+% if type(c.parts).__name__ == 'dict' and c.parts[part]:
+
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} +% else: +
- ${part} +% endif +% endif +% endfor +% else: +% for part in c.parts: +% if not part.startswith('3=') and not part.startswith('4='): +% if type(c.parts).__name__ == 'dict' and c.parts[part]: +
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} - (remove) +% else: +
- ${part} - (remove) +% endif +% endif +% endfor +% endif + + + +
-
- <%
- if c.path:
- subpath = "/%s" % c.path
- else:
- subpath = ""
- if c.version:
- ver = "/version%s" % c.version
- else:
- ver = ""
- %>
-
- % for part in c.parts:
- % if not part.startswith('3=') and not part.startswith('4='):
- % if type(c.parts).__name__ == 'dict' and c.parts[part]:
-
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} - % else: -
- ${part} - % endif - % endif - % endfor -
-
+ <%
+ if c.path:
+ subpath = "/%s" % c.path
+ else:
+ subpath = ""
+ if c.version:
+ ver = "?version=%s" % c.version
+ else:
+ ver = ""
+ %>
+
+ % for part in c.parts:
+ % if not part.startswith('3=') and not part.startswith('4='):
+ % if type(c.parts).__name__ == 'dict' and c.parts[part]:
+
- ${part} ${h.bytes_to_english(c.parts[part].st_size)} + % else: +
- ${part} + % 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 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 |
+ % for v in c.metadata['aggregates']:
+ % if isinstance(v, URIRef):
+ ${v} + % else: + ${v} + % endif + % endfor + |
-
- +# -*- 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
index 351d5a5..ec034d9 100644
--- a/rdfdatabank/templates/register_new_user.html
+++ b/rdfdatabank/templates/register_new_user.html
@@ -1,25 +1,25 @@
-# -*- coding: utf-8 -*-
-
+${c.readme_text}
+
+Create new user
--
- +# -*- coding: utf-8 -*- ++
+ diff --git a/rdfdatabank/templates/search.html b/rdfdatabank/templates/search.html index 49cfe76..0da2436 100644 --- a/rdfdatabank/templates/search.html +++ b/rdfdatabank/templates/search.html @@ -1,168 +1,168 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> - -<%def name="head_tags()"> -
- <%include file="/search_response_display.html"/>
-
-
-
-<% count = 0 %>
-
-
-
-
-
-
-
-
-
-% if not c.docs:
-
-% endif
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+
+<%def name="head_tags()">
+
-
-## Current search was here
-
-% 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 -
+ <%include file="/search_response_display.html"/>
+
+
+
+<% count = 0 %>
+
+
+
+
+
+
+
+
+
+% if not c.docs:
+
+% endif
diff --git a/rdfdatabank/templates/search_advanced.html b/rdfdatabank/templates/search_advanced.html
index 24d5943..80447ea 100644
--- a/rdfdatabank/templates/search_advanced.html
+++ b/rdfdatabank/templates/search_advanced.html
@@ -1,153 +1,153 @@
-# -*- coding: utf-8 -*-
-<%inherit file="/base.html" />
-
-<%def name="head_tags()">
-
+
+## Current search was here
+
+% 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 +
-<% count = 0 %>
-
-
-
-
-
-
-
-
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+
+<%def name="head_tags()">
+
-% 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 -
+<% count = 0 %>
+
+
+
+
+
+
+
+
diff --git a/rdfdatabank/templates/search_form.html b/rdfdatabank/templates/search_form.html
index 0ef5dab..cb3cd2d 100644
--- a/rdfdatabank/templates/search_form.html
+++ b/rdfdatabank/templates/search_form.html
@@ -3,9 +3,9 @@
diff --git a/rdfdatabank/templates/search_response_display.html b/rdfdatabank/templates/search_response_display.html
index 3631d33..9422398 100644
--- a/rdfdatabank/templates/search_response_display.html
+++ b/rdfdatabank/templates/search_response_display.html
@@ -1,551 +1,551 @@
-##=============================================================================
-<%def name="pagination()">
- % if len(c.permissible_offsets) > 0:
-
+% 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 +
- <%
- 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
-
-
-
-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
-
-
-% endif
-
-##=============================================================================
-% if not c.numFound:
-
-% if c.q and c.chosen_facets:
-The following query resulted in no macthes.
-% else:
-query = ${c.q}
-% 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: - AND ${c.field_names[facet]} = ${item}
-% endfor -% endfor -
-% elif c.q:
-Your query ${c.q} resulted in no matches.
-% else:
-Your query resulted in no matches.
-% endif
--% 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: - AND ${c.field_names[facet]} = ${item}
-% endfor -% endfor -
-##-----------------------------------------------------------------------------
-## Current search
-
-##-----------------------------------------------------------------------------
-
-
-##-----------------------------------------------------------------------------
-${self.pagination()}
-${self.sortoptions()}
-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 != "*:*": - -% 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} | -
-% if c.numFound:
-
-% endif
-% endif
-
-${self.numresultspp("itemsppt")}
-
-
-##-----------------------------------------------------------------------------
-% if c.docs and c.add_facet:
-
-% endif
-##-----------------------------------------------------------------------------
-% if c.docs:
-
-${ c.numFound} records found.
-
-% endif
-
-% if c.docs:
-Showing results ${c.start+1} to
-% if (c.start+c.rows) > c.numFound:
-${c.numFound}
-% else:
-${c.start+c.rows}
This page'
CSV
JSON
-${c.docs[doc_index]['id']}
-
-% for field in c.chosen_fields:
-% if field in c.docs[doc_index] and field not in ['silo', 'id']:
-<%
-lbl = field
-if field in c.field_names:
- lbl = c.field_names[field]
-%>
-
-% endif
-% endfor
-## -----
-
-
-% endfor
-% endif
-##-----------------------------------------------------------------------------
-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) and c.truncate and len(txt) > c.truncate:
-${ txt[:c.truncate] |n} ... [truncated at ${c.truncate} characters in length]
-% elif isinstance(txt, int) or isinstance(txt, bool):
-${str(txt)}
-% elif isinstance(txt, dict):
-"It is a dict"
-% else:
-${txt |n}
-% endif
-% endfor
-% elif isinstance(c.docs[doc_index][field], dict):
-"It is a dict"
-% elif isinstance(c.docs[doc_index][field], basestring) and c.truncate and len(c.docs[doc_index][field]) > c.truncate:
-${ c.docs[doc_index][field][:c.truncate] |n} ... [truncated at ${c.truncate} characters in length]
-% 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
-
-${self.pagination()}
-${self.sortoptions()}
-
-##-----------------------------------------------------------------------------
-
-
-% if c.numFound:
-
-% endif
-% endif
-
-${self.numresultspp("itemsppb")}
-
-
-##-----------------------------------------------------------------------------
-
-% endif
-
-
+##=============================================================================
+<%def name="pagination()">
+ % if len(c.permissible_offsets) > 0:
+
-${ c.numFound} records found.
-
-% endif
-
-% if c.docs:
-Showing results ${c.start+1} to
-% if (c.start+c.rows) > c.numFound:
-${c.numFound}
-% else:
-${c.start+c.rows}
+ <%
+ 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
+
+
+
+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
+
+
+% endif
+
+##=============================================================================
+% if not c.numFound:
+
+% if c.q and c.chosen_facets:
+The following query resulted in no macthes.
+% else:
+query = ${c.q}
+% 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: + AND ${c.field_names[facet]} = ${item}
+% endfor +% endfor +
+% elif c.q:
+Your query ${c.q} resulted in no matches.
+% else:
+Your query resulted in no matches.
+% endif
++% 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: + AND ${c.field_names[facet]} = ${item}
+% endfor +% endfor +
+##-----------------------------------------------------------------------------
+## Current search
+
+##-----------------------------------------------------------------------------
+
+
+##-----------------------------------------------------------------------------
+${self.pagination()}
+${self.sortoptions()}
+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 != "*:*": + +% 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} | +
+% if c.numFound:
+
+% endif
+% endif
+
+${self.numresultspp("itemsppt")}
+
+
+##-----------------------------------------------------------------------------
+% if c.docs and c.add_facet:
+
+% endif
+##-----------------------------------------------------------------------------
+% if c.docs:
+
+${ c.numFound} records found.
+
+% endif
+
+% if c.docs:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}
This page'
CSV
JSON
+${c.docs[doc_index]['id']}
+
+% for field in c.chosen_fields:
+% if field in c.docs[doc_index] and field not in ['silo', 'id']:
+<%
+lbl = field
+if field in c.field_names:
+ lbl = c.field_names[field]
+%>
+
+% endif
+% endfor
+## -----
+
+
+% endfor
+% endif
+##-----------------------------------------------------------------------------
+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) and c.truncate and len(txt) > c.truncate:
+${ txt[:c.truncate] |n} ... [truncated at ${c.truncate} characters in length]
+% elif isinstance(txt, int) or isinstance(txt, bool):
+${str(txt)}
+% elif isinstance(txt, dict):
+"It is a dict"
+% else:
+${txt |n}
+% endif
+% endfor
+% elif isinstance(c.docs[doc_index][field], dict):
+"It is a dict"
+% elif isinstance(c.docs[doc_index][field], basestring) and c.truncate and len(c.docs[doc_index][field]) > c.truncate:
+${ c.docs[doc_index][field][:c.truncate] |n} ... [truncated at ${c.truncate} characters in length]
+% 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
+
+${self.pagination()}
+${self.sortoptions()}
+
+##-----------------------------------------------------------------------------
+
+
+% if c.numFound:
+
+% endif
+% endif
+
+${self.numresultspp("itemsppb")}
+
+
+##-----------------------------------------------------------------------------
+
+% 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()">
+
+${ c.numFound} records found.
+
+% endif
+
+% if c.docs:
+Showing results ${c.start+1} to
+% if (c.start+c.rows) > c.numFound:
+${c.numFound}
+% else:
+${c.start+c.rows}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 8a3029f..369c352 100644 --- a/rdfdatabank/templates/silo_admin.html +++ b/rdfdatabank/templates/silo_admin.html @@ -1,15 +1,15 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -Admin Interface - List of Silos
-% if c.granary_list: - 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
index c1861f8..ed5bb7d 100644
--- a/rdfdatabank/templates/silo_metadata.html
+++ b/rdfdatabank/templates/silo_metadata.html
@@ -1,34 +1,33 @@
-# -*- coding: utf-8 -*-
-
Silo Metadata
--
- +# -*- coding: utf-8 -*- ++
+ diff --git a/rdfdatabank/templates/siloview.html b/rdfdatabank/templates/siloview.html index ee9e945..b64417b 100644 --- a/rdfdatabank/templates/siloview.html +++ b/rdfdatabank/templates/siloview.html @@ -1,15 +1,15 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -List of Datasets in Silo ${c.silo_name}
-% else: -List of Datasets in Silo
-% endif -<%include file="list_of_datasets.html"/> -% if c.editor: -Create new empty dataset:
- <%include file="create_new_item.html"/> -% endif +# -*- coding: utf-8 -*- +<%inherit file="/base.html" /> +<%def name="head_tags()"> +List of Datasets in Silo ${c.silo_name}
+% else: +List of Datasets in Silo
+% endif +<%include file="list_of_datasets.html"/> +% if c.editor: +Create new empty dataset:
+ <%include file="create_new_item.html"/> +% endif diff --git a/rdfdatabank/templates/update_user.html b/rdfdatabank/templates/update_user.html index c2c846f..76e37c7 100644 --- a/rdfdatabank/templates/update_user.html +++ b/rdfdatabank/templates/update_user.html @@ -1,72 +1,73 @@ -# -*- coding: utf-8 -*- -Update user information
-- -
- +# -*- coding: utf-8 -*- ++ +
+ diff --git a/rdfdatabank/templates/zipfilesubitemview.html b/rdfdatabank/templates/zipfilesubitemview.html index 2e1ee5f..208574b 100644 --- a/rdfdatabank/templates/zipfilesubitemview.html +++ b/rdfdatabank/templates/zipfilesubitemview.html @@ -1,9 +1,9 @@ -# -*- coding: utf-8 -*- -<%inherit file="/base.html" /> -<%def name="head_tags()"> -Contents of zipfile ${c.path}/${c.subpath}
-TO BE DONE
-% endif +# -*- 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 index bc2453f..3c4ce86 100644 --- a/rdfdatabank/templates/zipfileview.html +++ b/rdfdatabank/templates/zipfileview.html @@ -1,19 +1,19 @@ -# -*- 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])} )
-
- % endfor
-
There are no contents avaialble
- % endif -% endif +# -*- 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])} )
+
+ % endfor
+
There are no contents avaialble
+ % endif +% endif diff --git a/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py b/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py index 38d9841..7e9be8a 100644 --- a/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py +++ b/rdfdatabank/tests/RDFDatabankConfig-Jenkins.py @@ -1,25 +1,49 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# $Id: $ """ -Define configuration for RDFDatabank testing +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. +""" -$Rev: $ +""" +Define configuration for RDFDatabank testing """ class RDFDatabankConfig: granary_uri_root="http://dataflow-jenkins.bodleian.ox.ac.uk" - - # Access to local test VM + + # Access to local VM endpointhost="localhost:5000" - #endpointpath="/sandbox/" - endpointpath="/test/" - endpointpath2="/test2/" + 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" @@ -53,6 +77,6 @@ class RDFDatabankConfig: #Access credentials for generic user endpointgeneraluser = "" - endpointgeneralpass = "" + endpointgeneralpass = "" # End. diff --git a/rdfdatabank/tests/RDFDatabankConfig.py b/rdfdatabank/tests/RDFDatabankConfig.py index 6134a43..1d6c5e9 100644 --- a/rdfdatabank/tests/RDFDatabankConfig.py +++ b/rdfdatabank/tests/RDFDatabankConfig.py @@ -1,11 +1,30 @@ #!/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: -# $Id: $ +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 -$Rev: $ +""" +Define configuration for RDFDatabank testing """ class RDFDatabankConfig: @@ -14,8 +33,8 @@ class RDFDatabankConfig: # Access via IP address endpointhost="localhost" - endpointpath="/test/" - endpointpath2="/test2/" + endpointpath="/sandbox/" + endpointpath2="/sandbox2/" endpointuser="sandbox_user" endpointpass="sandbox" @@ -52,6 +71,8 @@ class RDFDatabankConfig: #Access credentials for generic user endpointgeneraluser = "" - endpointgeneralpass = "" + 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 index fb06fe3..88e03aa 100644 --- a/rdfdatabank/tests/TestAdmin.py +++ b/rdfdatabank/tests/TestAdmin.py @@ -1,11 +1,32 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -# $Id: $ """ -Databank submission test cases +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. +""" -$Rev: $ """ +Databank submission test cases +""" + import os, os.path from datetime import datetime, timedelta import sys diff --git a/rdfdatabank/tests/TestSubmission.py b/rdfdatabank/tests/TestSubmission.py index 8a2750c..6b3128f 100644 --- a/rdfdatabank/tests/TestSubmission.py +++ b/rdfdatabank/tests/TestSubmission.py @@ -1,12 +1,32 @@ #!/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: -# $Id: $ +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 -$Rev: $ """ +Databank submission test cases +""" + import os, os.path from datetime import datetime, timedelta from dateutil.relativedelta import * diff --git a/rdfdatabank/tests/TestSubmission_load.py b/rdfdatabank/tests/TestSubmission_load.py index 5a9b726..5f9832d 100644 --- a/rdfdatabank/tests/TestSubmission_load.py +++ b/rdfdatabank/tests/TestSubmission_load.py @@ -1,12 +1,32 @@ #!/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: -# $Id: $ +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 -$Rev: $ """ +Databank submission test cases +""" + import os, os.path from datetime import datetime, timedelta from time import sleep diff --git a/rdfdatabank/tests/TestSubmission_submitter.py b/rdfdatabank/tests/TestSubmission_submitter.py index 0087dcd..c89a5c3 100644 --- a/rdfdatabank/tests/TestSubmission_submitter.py +++ b/rdfdatabank/tests/TestSubmission_submitter.py @@ -1,12 +1,31 @@ #!/usr/bin/python -# $Id: $ # -*- 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 - -$Rev: $ """ import os, os.path import datetime diff --git a/rdfdatabank/tests/rdflib3/__init__.py b/rdfdatabank/tests/rdflib3/__init__.py deleted file mode 100644 index 4f48f18..0000000 --- a/rdfdatabank/tests/rdflib3/__init__.py +++ /dev/null @@ -1,76 +0,0 @@ -"""\ -A pure Python package providing the core RDF constructs. - -The packages is intended to provide the core RDF types and interfaces -for working with RDF. The package defines a plugin interface for -parsers, stores, and serializers that other packages can use to -implement parsers, stores, and serializers that will plug into the -rdflib package. - -The primary interface `rdflib` exposes to work with RDF is -`rdflib.graph.Graph`. - -A tiny example: - - >>> import rdflib - - >>> g = rdflib.Graph() - >>> result = g.parse("http://eikeon.com/foaf.rdf") - - >>> print "graph has %s statements." % len(g) - graph has 34 statements. - >>> - >>> for s, p, o in g: - ... if (s, p, o) not in g: - ... raise Exception("It better be!") - - >>> s = g.serialize(format='n3') - -""" -__docformat__ = "restructuredtext en" - -__version__ = "3.0.0" -__date__ = "2010/05/13" - -__all__ = [ - 'URIRef', - 'BNode', - 'Literal', - 'Variable', - - 'Namespace', - - 'Graph', - 'ConjunctiveGraph', - - 'RDF', - 'RDFS', - 'OWL', - 'XSD', - - 'util', - ] - -import sys -# generator expressions require 2.4 -assert sys.version_info >= (2, 4, 0), "rdflib requires Python 2.4 or higher" -del sys - -import logging -_LOGGER = logging.getLogger("rdflib") -_LOGGER.info("version: %s" % __version__) - - -from rdflib.term import URIRef, BNode, Literal, Variable - -from rdflib.namespace import Namespace - -from rdflib.graph import Graph, ConjunctiveGraph - -from rdflib.namespace import RDF, RDFS, OWL, XSD - -from rdflib import plugin -from rdflib import query - -from rdflib import util - diff --git a/rdfdatabank/tests/rdflib3/collection.py b/rdfdatabank/tests/rdflib3/collection.py deleted file mode 100644 index 94693a3..0000000 --- a/rdfdatabank/tests/rdflib3/collection.py +++ /dev/null @@ -1,258 +0,0 @@ -from rdflib.namespace import RDF -from rdflib.term import BNode -from rdflib.term import Literal -from rdflib.graph import Graph - -class Collection(object): - """ - See 3.3.5 Emulating container types: http://docs.python.org/ref/sequence-types.html#l2h-232 - - >>> from rdflib.graph import Graph - >>> listName = BNode() - >>> g = Graph('IOMemory') - >>> listItem1 = BNode() - >>> listItem2 = BNode() - >>> g.add((listName,RDF.first,Literal(1))) - >>> g.add((listName,RDF.rest,listItem1)) - >>> g.add((listItem1,RDF.first,Literal(2))) - >>> g.add((listItem1,RDF.rest,listItem2)) - >>> g.add((listItem2,RDF.rest,RDF.nil)) - >>> g.add((listItem2,RDF.first,Literal(3))) - >>> c=Collection(g,listName) - >>> print list(c) - [rdflib.term.Literal(u'1', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer')), rdflib.term.Literal(u'2', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer')), rdflib.term.Literal(u'3', datatype=rdflib.term.URIRef('http://www.w3.org/2001/XMLSchema#integer'))] - >>> 1 in c - True - >>> len(c) - 3 - >>> c._get_container(1) == listItem1 - True - >>> c.index(Literal(2)) == 1 - True - """ - def __init__(self, graph, uri, seq=[]): - self.graph = graph - self.uri = uri or BNode() - for item in seq: - self.append(item) - - def n3(self): - """ - >>> from rdflib.graph import Graph - >>> listName = BNode() - >>> g = Graph('IOMemory') - >>> listItem1 = BNode() - >>> listItem2 = BNode() - >>> g.add((listName,RDF.first,Literal(1))) - >>> g.add((listName,RDF.rest,listItem1)) - >>> g.add((listItem1,RDF.first,Literal(2))) - >>> g.add((listItem1,RDF.rest,listItem2)) - >>> g.add((listItem2,RDF.rest,RDF.nil)) - >>> g.add((listItem2,RDF.first,Literal(3))) - >>> c=Collection(g,listName) - >>> print c.n3() - ( "1"^^