# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1267721487 -3600
# Node ID f531742e85f4a32124774ae7dbed2f3a63460c2b
# Parent  d3ea940e2b0c5709b0a178d957a732c587bf2970# Parent  fa2297d6542ad088982cada49c57ebb102d692ef
merge

diff -r fa2297d6542a -r f531742e85f4 server/schemaserial.py
--- a/server/schemaserial.py	Thu Mar 04 17:50:17 2010 +0100
+++ b/server/schemaserial.py	Thu Mar 04 17:51:27 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()