Bug fixes.

Author: Robert Liebowitz

dvn_client/src/dataverse.py

@@ -46,6 +46,9 @@ def add_study(self, study):
 
     def delete_study(self, study):
         depositReceipt = self.connection.swordConnection.delete(study.editUri)
+        study.lastDepositReceipt = depositReceipt
+
+        # todo: Is this used? Should it be? Other ways to handle this?
         study.isDeleted = True
 
     # Note: Functionality removed

dvn_client/src/example/dvn_example.py

@@ -62,13 +62,13 @@ def main():
 
         # clean up the test dataverse
         # dv.delete_all_studies()
-        print "RELEASED:", dv.is_released()
+        # print "RELEASED:", dv.is_released()
 
+        # s = dv.get_studies()[0]
         # s = Study(EXAMPLE_DICT)
-        # print dv.get_studies()
-        s = Study(EXAMPLE_FILE)
+        # s = Study(EXAMPLE_FILE)
         # dv.add_study(s)
-        print s
+        # print s
 
         # print s.get_entry()
 

dvn_client/src/study.py

@@ -24,7 +24,7 @@ def __init__(self, *args, **kwargs):
         # adds dict to keyword arguments
         kwargs = dict(args[0].items() + kwargs.items()) if args and isinstance(args[0], dict) else kwargs
 
-        # deposit receipt is added when Dataverse.addStudy() is called on this study
+        # deposit receipt is added when Dataverse.add_study() is called on this study
         self.lastDepositReceipt = None
 
         # sets fields from kwargs
@@ -82,7 +82,7 @@ def from_entry_element(cls, entry_element, hostDataverse=None):
                                                attributeValue="edit-media",
                                                numberOfElements=1)
 
-        edit_media_link = edit_media_link_element.get("href") if edit_media_link_element else None
+        edit_media_link = edit_media_link_element.get("href") if edit_media_link_element is not None else None
 
         return cls(title=title_element.text,
                    id=id_element.text,
@@ -216,4 +216,5 @@ def _refresh(self, deposit_receipt=None):
             self.editUri = deposit_receipt.edit
             self.editMediaUri = deposit_receipt.edit_media
             self.statementUri = deposit_receipt.atom_statement_iri
+            self.lastDepositReceipt = deposit_receipt
         self.entry = sword2.Entry(atomEntryXml=self.get_entry())

dvn_client/src/test/dvn_test.py

@@ -17,6 +17,7 @@
 from dvn_client.src.study import Study
 from dvn_client.src.connection import DvnConnection
 from dvn_client.src.example.config import DEFAULT_USERNAME, DEFAULT_CERT, DEFAULT_HOST, DEFAULT_PASSWORD
+from dvn_client.src.test.tests import PIC_OF_CAT, PICS_OF_CATS_STUDY, INGEST_FILES, ATOM_STUDY
 
 class TestStudyOperations(unittest.TestCase):
     @classmethod

dvn_client/src/test/tests.py

@@ -11,9 +11,9 @@
     "abstract" : "In this study we prove that there can be pictures of cats passed through the intertubes.",
 }
 
-INGEST_FILES = "../resources/sword_ingest.zip"
-PIC_OF_CAT = "../resources/cat.jpg"
+INGEST_FILES = "dvn_client/resources/sword_ingest.zip"
+PIC_OF_CAT = "dvn_client/resources/cat.jpg"
 
-ATOM_STUDY = "../resources/atom-entry-study.xml"
-ATOM_STUDY_2 = "../resources/atom-entry-study2.xml"
+ATOM_STUDY = "dvn_client/resources/atom-entry-study.xml"
+ATOM_STUDY_2 = "dvn_client/resources/atom-entry-study2.xml"
 

dvn_client/src/utils.py

@@ -17,7 +17,7 @@ def get_elements(rootElement, tag=None, namespace=None, attribute=None, attribut
     if namespace == None:
         namespace = rootElement.nsmap[None]
     #namespace = 'http://www.w3.org/1999/xhtml'
-    
+
     if not tag:
         xpath = "*"
     elif namespace == "":