Changeset 12005 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Timestamp:

20 Nov 2014, 05:40:52 (10 years ago)

Author:

Henrik Bettermann

Message:

Implement document_id generator. Ensure that document_ids remain unique during import.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/documents

Files:

• container.py (modified) (1 diff)
• document.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (1 diff)
• utils.py (added)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/container.py

@@ -30 +30 @@
     grok.provides(IDocumentsContainer)
 
-    def __init__(self):
-        super(DocumentsContainer, self).__init__()
-        return
 
     def addDocument(self, document):

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py

@@ -30 +30 @@
 from waeup.ikoba.interfaces import IIkobaUtils, IObjectHistory
 from waeup.ikoba.interfaces import MessageFactory as _
-from waeup.ikoba.documents.interfaces import IDocument, IDocument
 from waeup.ikoba.utils.helpers import attrs_to_fields, get_current_principal
 from waeup.ikoba.utils.logger import Logger
+from waeup.ikoba.documents.interfaces import IDocument, IDocument
+from waeup.ikoba.documents.utils import generate_document_id
 
 class Document(grok.Container, Logger):
@@ -51 +52 @@
         return
 
+    #def __init__(self):
+    #    super(Document, self).__init__()
+    #    timestamp = ("%d" % int(time()*10000))[1:]
+    #    self.document_id = "d%s" % timestamp
+     #   return
+
     def __init__(self):
         super(Document, self).__init__()
-        timestamp = ("%d" % int(time()*10000))[1:]
-        self.document_id = "d%s" % timestamp
+        # The site doesn't exist in unit tests
+        try:
+            self.document_id = generate_document_id()
+        except AttributeError:
+            self.document_id = u'd123'
         return
 

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/interfaces.py

@@ -35 +35 @@
     """
 
+    def addDocument(document):
+        """Add a document.
+        """
+
 class IDocument(IIkobaObject):
     """A base representation of documents.

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/tests.py

@@ -61 +61 @@
         self.assertEqual(container[document_id], document)
         self.assertRaises(TypeError, container.addDocument, object())
+        self.assertEqual(document_id, 'd123')
         return