Changeset 8330

Timestamp:

3 May 2012, 07:25:34 (13 years ago)

Author:

Henrik Bettermann

Message:

When using catalogs existing objects must not necessarily be in the same container.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• students/studylevel.py (modified) (1 diff)
• utils/batching.py (modified) (1 diff)
• utils/batching.txt (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/batchprocessing.txt

@@ -488 +488 @@
     >>> print open(pending_file).read()
     title_prefix,code,title,--ERRORS--
-    faculty,FAC1,Faculty 1,This object already exists in the same container. Skipping.
+    faculty,FAC1,Faculty 1,This object already exists. Skipping.
 
     >>> finished_file = dc_path + '/finished/newfaculties_zope.mgr.create.finished.csv'

main/waeup.kofa/trunk/src/waeup/kofa/students/studylevel.py

@@ -22 +22 @@
 import grok
 from zope.component.interfaces import IFactory
+from zope.interface import implementedBy
 from waeup.kofa.students.interfaces import (
     IStudentStudyLevel, IStudentNavigation, ICourseTicket)

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.py

@@ -322 +322 @@
                     self.writeFailedRow(
                         failed_writer, string_row,
-                        "This object already exists in the same container. "
-                        "Skipping.")
+                        "This object already exists. Skipping.")
                     continue
                 obj = self.callFactory()

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.txt

@@ -323 +323 @@
     >>> print open(result[3]).read()
     owner,name,taxpayer,dinoports,--ERRORS--
-    Barney,Barneys Home,1,2,This object already exists in the same container. Skipping.
-    Wilma,Wilmas Asylum,1,1,This object already exists in the same container. Skipping.
-    Fred,Freds Dinoburgers,0,10,This object already exists in the same container. Skipping.
-    Joey,Joeys Drive-in,0,110,This object already exists in the same container. Skipping.
+    Barney,Barneys Home,1,2,This object already exists. Skipping.
+    Wilma,Wilmas Asylum,1,1,This object already exists. Skipping.
+    Fred,Freds Dinoburgers,0,10,This object already exists. Skipping.
+    Joey,Joeys Drive-in,0,110,This object already exists. Skipping.
 
 This way we can correct the faulty entries and afterwards retry without
@@ -364 +364 @@
     >>> print open(result[3], 'rb').read()
     name,dinoports,--ERRORS--
-    Barneys Home,2,This object already exists in the same container. Skipping.
-    Wilmas Asylum,1,This object already exists in the same container. Skipping.
-    Freds Dinoburgers,10,This object already exists in the same container. Skipping.
-    Joeys Drive-in,110,This object already exists in the same container. Skipping.
+    Barneys Home,2,This object already exists. Skipping.
+    Wilmas Asylum,1,This object already exists. Skipping.
+    Freds Dinoburgers,10,This object already exists. Skipping.
+    Joeys Drive-in,110,This object already exists. Skipping.