From 336f0e40a43a5a7f7dc6511417b839ce8a06ec2a Mon Sep 17 00:00:00 2001
From: Julien Thewys <jth@openerp.com>
Date: Fri, 2 Apr 2010 10:08:55 +0200
Subject: [PATCH] [REF] Cleanup of delete tag.

bzr revid: jth@openerp.com-20100402080855-8pvhqcspi9mhojpa
---
 bin/import_xml.rng       | 6 ++++--
 bin/tools/yaml_import.py | 8 ++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bin/import_xml.rng b/bin/import_xml.rng
index e637d42f123..c852d421e17 100644
--- a/bin/import_xml.rng
+++ b/bin/import_xml.rng
@@ -148,8 +148,10 @@
     <rng:define name="delete">
         <rng:element name="delete">
             <rng:attribute name="model" />
-            <rng:optional><rng:attribute name="id" /> </rng:optional>
-            <rng:optional><rng:attribute name="search" /></rng:optional>
+                <rng:choice>
+                    <rng:attribute name="id" />
+                    <rng:attribute name="search" />
+                </rng:choice>
             </rng:element>
     </rng:define>
 
diff --git a/bin/tools/yaml_import.py b/bin/tools/yaml_import.py
index 8fe1d634764..0a5d8d7e09b 100644
--- a/bin/tools/yaml_import.py
+++ b/bin/tools/yaml_import.py
@@ -535,14 +535,10 @@ class YamlInterpreter(object):
         # TODO add remove ir.model.data
 
     def process_delete(self, node):
-        ids = []
         if len(node.search):
             ids = self.pool.get(node.model).search(self.cr, self.uid, eval(node.search, self.eval_context))
-        if len(node.id):
-            try:
-                ids.append(self.get_id(node.id))
-            except:
-                pass
+        else:
+            ids = [self.get_id(node.id)]
         if len(ids):
             self.pool.get(node.model).unlink(self.cr, self.uid, ids)
             self.pool.get('ir.model.data')._unlink(self.cr, self.uid, node.model, ids, direct=True)