# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1337085885 -7200
# Node ID 79534887943ed69eb541ebf980e2fa67a8966d1b
# Parent  41461b2e9854c4f3a021bbec79aa16a84f474ca8
[datafeed] fix/finish cleanup started by auc in 8393:c25b96ae4f8a: parser.process prototytpe is (url, raise_on_error=False). Drop partialcommit argument which were never specified

diff -r 41461b2e9854 -r 79534887943e server/sources/datafeed.py
--- a/server/sources/datafeed.py	Tue May 15 14:43:30 2012 +0200
+++ b/server/sources/datafeed.py	Tue May 15 14:44:45 2012 +0200
@@ -350,7 +350,7 @@
             self.sourceuris.pop(str(uri), None)
         return session.entity_from_eid(eid, etype)
 
-    def process(self, url, partialcommit=True):
+    def process(self, url, raise_on_error=False):
         """main callback: process the url"""
         raise NotImplementedError
 
@@ -391,7 +391,7 @@
 
 class DataFeedXMLParser(DataFeedParser):
 
-    def process(self, url, raise_on_error=False, partialcommit=True):
+    def process(self, url, raise_on_error=False):
         """IDataFeedParser main entry point"""
         try:
             parsed = self.parse(url)
@@ -413,21 +413,18 @@
         for args in parsed:
             try:
                 self.process_item(*args)
-                if partialcommit:
-                    # commit+set_cnxset instead of commit(free_cnxset=False) to let
-                    # other a chance to get our connections set
-                    commit()
-                    set_cnxset()
+                # commit+set_cnxset instead of commit(free_cnxset=False) to let
+                # other a chance to get our connections set
+                commit()
+                set_cnxset()
             except ValidationError, exc:
                 if raise_on_error:
                     raise
-                if partialcommit:
-                    self.source.error('Skipping %s because of validation error %s' % (args, exc))
-                    rollback()
-                    set_cnxset()
-                    error = True
-                else:
-                    raise
+                self.source.error('Skipping %s because of validation error %s'
+                                  % (args, exc))
+                rollback()
+                set_cnxset()
+                error = True
         return error
 
     def parse(self, url):
diff -r 41461b2e9854 -r 79534887943e sobjects/cwxmlparser.py
--- a/sobjects/cwxmlparser.py	Tue May 15 14:43:30 2012 +0200
+++ b/sobjects/cwxmlparser.py	Tue May 15 14:44:45 2012 +0200
@@ -183,11 +183,11 @@
 
     # import handling ##########################################################
 
-    def process(self, url, raise_on_error=False, partialcommit=True):
+    def process(self, url, raise_on_error=False):
         """IDataFeedParser main entry point"""
         if url.startswith('http'): # XXX similar loose test as in parse of sources.datafeed
             url = self.complete_url(url)
-        super(CWEntityXMLParser, self).process(url, raise_on_error, partialcommit)
+        super(CWEntityXMLParser, self).process(url, raise_on_error)
 
     def parse_etree(self, parent):
         for node in list(parent):
diff -r 41461b2e9854 -r 79534887943e sobjects/ldapparser.py
--- a/sobjects/ldapparser.py	Tue May 15 14:43:30 2012 +0200
+++ b/sobjects/ldapparser.py	Tue May 15 14:44:45 2012 +0200
@@ -35,7 +35,7 @@
     # attributes of the cw user
     non_attribute_keys = set(('email',))
 
-    def process(self, url, partialcommit=True):
+    def process(self, url, raise_on_error=False):
         """IDataFeedParser main entry point"""
         source = self.source
         searchstr = '(&%s)' % ''.join(source.base_filters)