Added test code fro creating test user and adding user membership

add_user.py

@@ -0,0 +1,19 @@
+from rdfdatabank.lib.auth_entry import add_user, add_user_groups
+import sys
+
+if __name__ == "__main__":
+    username = sys.argv[1]
+    password = sys.argv[2]
+    email = sys.argv[3]
+    user_details = {
+        'username':u'%s'%username,
+        'password':u"%s"%password,
+        'name':u'Databank Administrator',
+        'email':u"%s"%email
+    }
+    add_user(user_details)
+
+    groups = []
+    groups.append(('*', 'administrator'))
+    add_user_groups(groups)
+

persisted_state.json

@@ -0,0 +1 @@
+{}

rdfdatabank.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rdfdatabank
-Version: 0.2
+Version: 0.3
 Summary: RDF-enhanced, pairtree-backed storage API
 Home-page: https://github.com/dataflow/RDFDatabank
 Author: Anusha Ranganathan, Ben O'Steen

rdfdatabank/controllers/admin.py

@@ -382,25 +382,15 @@ def siloview(self, silo):
             # and then remove the silo
             todelete_silo = ag.granary.get_rdf_silo(silo)
             for item in todelete_silo.list_items():
-<<<<<<< HEAD
-                ag.b.deletion(silo, item, ident=ident['repoze.who.userid'])
-
-            ag.granary.delete_silo(silo)
-
-            ag.b.silo_deletion(silo, ident=ident['repoze.who.userid'])
-=======
                 try:
                     ag.b.deletion(silo_name, item, ident=ident['repoze.who.userid'])
                 except:
                     pass
-
             ag.granary.delete_silo(silo_name)
             try:
                 ag.b.silo_deletion(silo_name, ident=ident['repoze.who.userid'])
             except:
                 pass
-
->>>>>>> 01f8f90b4121355bfcab059dcda276272fa6475b
             try:
                 del ag.granary.state[silo]
             except:

rdfdatabank/controllers/sword.py

@@ -0,0 +1,2 @@
+from sss.pylons_sword_controller import SwordController
+__controller__ = "SwordController"

rdfdatabank/templates/error.html

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+<%inherit file="/base.html" />
+<%def name="head_tags()">
+  <title> Error </title>
+</%def>
+<div class="httperrortitle">
+<p>Oops!</p>
+</div>
+<div class="httperrorcode">
+<h1>${c.code}</h1>
+</div>
+<div class="httperror">
+<h3>${c.status}</h3>
+<p>${c.message}</p>
+</div>