# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1267721371 -3600
# Node ID d3ea940e2b0c5709b0a178d957a732c587bf2970
# Parent  686419cd2dff1cb2a5f86009df65cb2b3adb6bfb# Parent  d5bd706e900583154c6cc73ba63567d1fbe97a8e
merge

diff -r d5bd706e9005 -r d3ea940e2b0c server/schemaserial.py
--- a/server/schemaserial.py	Thu Mar 04 16:58:40 2010 +0100
+++ b/server/schemaserial.py	Thu Mar 04 17:49:31 2010 +0100
@@ -223,8 +223,9 @@
         pb = ProgressBar(pb_size, title=_title)
     else:
         pb = None
-    # serialize all entity types, assuring CWEType is serialized first
-    groupmap = group_mapping(cursor)
+    groupmap = group_mapping(cursor, interactive=False)
+    # serialize all entity types, assuring CWEType is serialized first for proper
+    # is / is_instance_of insertion
     eschemas.remove(schema.eschema('CWEType'))
     eschemas.insert(0, schema.eschema('CWEType'))
     for eschema in eschemas:
@@ -245,7 +246,7 @@
             if pb is not None:
                 pb.update()
             continue
-        for rql, kwargs in rschema2rql(rschema, groupmap):
+        for rql, kwargs in rschema2rql(rschema, groupmap=groupmap):
             execute(rql, kwargs, build_descr=False)
         if pb is not None:
             pb.update()