allow duplicate struct names (in different document types)

1 files changed, 54 insertions, 82 deletions

diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg
index f74ce87e6cb..9a73664ac86 100644
--- a/config-model/src/test/derived/types/documentmanager.cfg
+++ b/config-model/src/test/derived/types/documentmanager.cfg
@@ -73,62 +73,50 @@ doctype[].fieldsets{[document]}.fields[] "structfield"
 doctype[].fieldsets{[document]}.fields[] "tagfield"
 doctype[].arraytype[].idx 10017
 doctype[].arraytype[].elementtype 10007
-doctype[].arraytype[].idx 10024
-doctype[].arraytype[].elementtype 10023
+doctype[].arraytype[].idx 10022
+doctype[].arraytype[].elementtype 10021
+doctype[].arraytype[].idx 10029
+doctype[].arraytype[].elementtype 10030
+doctype[].arraytype[].idx 10030
+doctype[].arraytype[].elementtype 10031
 doctype[].arraytype[].idx 10031
-doctype[].arraytype[].elementtype 10007
+doctype[].arraytype[].elementtype 10012
 doctype[].arraytype[].idx 10032
-doctype[].arraytype[].elementtype 10033
+doctype[].arraytype[].elementtype 10023
 doctype[].arraytype[].idx 10033
 doctype[].arraytype[].elementtype 10034
-doctype[].arraytype[].idx 10034
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10035
-doctype[].arraytype[].elementtype 10036
-doctype[].arraytype[].idx 10037
-doctype[].arraytype[].elementtype 10038
-doctype[].arraytype[].idx 10039
-doctype[].arraytype[].elementtype 10040
-doctype[].arraytype[].idx 10040
-doctype[].arraytype[].elementtype 10012
-doctype[].arraytype[].idx 10042
+doctype[].arraytype[].idx 10036
 doctype[].arraytype[].elementtype 10003
-doctype[].arraytype[].idx 10045
-doctype[].arraytype[].elementtype 10041
-doctype[].maptype[].idx 10025
+doctype[].arraytype[].idx 10038
+doctype[].arraytype[].elementtype 10035
+doctype[].maptype[].idx 10023
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10012
-doctype[].maptype[].idx 10026
+doctype[].maptype[].idx 10024
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10007
-doctype[].maptype[].idx 10027
+doctype[].maptype[].idx 10025
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10005
-doctype[].maptype[].idx 10028
+doctype[].maptype[].idx 10026
 doctype[].maptype[].keytype 10007
 doctype[].maptype[].valuetype 10008
-doctype[].maptype[].idx 10029
+doctype[].maptype[].idx 10027
 doctype[].maptype[].keytype 10007
 doctype[].maptype[].valuetype 10004
-doctype[].maptype[].idx 10030
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10031
-doctype[].maptype[].idx 10036
+doctype[].maptype[].idx 10028
 doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10012
-doctype[].maptype[].idx 10038
+doctype[].maptype[].valuetype 10017
+doctype[].maptype[].idx 10034
 doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10039
-doctype[].maptype[].idx 10043
-doctype[].maptype[].keytype 10012
-doctype[].maptype[].valuetype 10012
-doctype[].maptype[].idx 10044
+doctype[].maptype[].valuetype 10030
+doctype[].maptype[].idx 10037
 doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10041
-doctype[].maptype[].idx 10046
+doctype[].maptype[].valuetype 10035
+doctype[].maptype[].idx 10039
 doctype[].maptype[].keytype 10007
-doctype[].maptype[].valuetype 10047
-doctype[].maptype[].idx 10048
+doctype[].maptype[].valuetype 10040
+doctype[].maptype[].idx 10041
 doctype[].maptype[].keytype 10012
 doctype[].maptype[].valuetype 10008
 doctype[].wsettype[].idx 10018
@@ -137,29 +125,13 @@ doctype[].wsettype[].createifnonexistent false
 doctype[].wsettype[].removeifzero false
 doctype[].wsettype[].idx 10019
 doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent true
-doctype[].wsettype[].removeifzero true
-doctype[].wsettype[].idx 10020
-doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent false
 doctype[].wsettype[].removeifzero true
-doctype[].wsettype[].idx 10021
+doctype[].wsettype[].idx 10020
 doctype[].wsettype[].elementtype 10012
 doctype[].wsettype[].createifnonexistent true
 doctype[].wsettype[].removeifzero false
-doctype[].wsettype[].idx 10022
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent true
-doctype[].wsettype[].removeifzero true
-doctype[].wsettype[].idx 10049
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent true
-doctype[].wsettype[].removeifzero true
-doctype[].wsettype[].idx 10050
-doctype[].wsettype[].elementtype 10012
-doctype[].wsettype[].createifnonexistent true
-doctype[].wsettype[].removeifzero true
-doctype[].structtype[].idx 10023
+doctype[].structtype[].idx 10021
 doctype[].structtype[].name "sct"
 doctype[].structtype[].field[].name "s1"
 doctype[].structtype[].field[].internalid 2146820765
@@ -167,21 +139,21 @@ doctype[].structtype[].field[].type 10012
 doctype[].structtype[].field[].name "s2"
 doctype[].structtype[].field[].internalid 45366795
 doctype[].structtype[].field[].type 10012
-doctype[].structtype[].idx 10041
+doctype[].structtype[].idx 10035
 doctype[].structtype[].name "mystruct"
 doctype[].structtype[].field[].name "bytearr"
 doctype[].structtype[].field[].internalid 1079701754
-doctype[].structtype[].field[].type 10042
+doctype[].structtype[].field[].type 10036
 doctype[].structtype[].field[].name "mymap"
 doctype[].structtype[].field[].internalid 1954178122
-doctype[].structtype[].field[].type 10043
+doctype[].structtype[].field[].type 10023
 doctype[].structtype[].field[].name "title"
 doctype[].structtype[].field[].internalid 567626448
 doctype[].structtype[].field[].type 10012
 doctype[].structtype[].field[].name "structfield"
 doctype[].structtype[].field[].internalid 1726890940
 doctype[].structtype[].field[].type 10012
-doctype[].structtype[].idx 10047
+doctype[].structtype[].idx 10040
 doctype[].structtype[].name "folder"
 doctype[].structtype[].field[].name "Version"
 doctype[].structtype[].field[].internalid 64430502
@@ -191,10 +163,10 @@ doctype[].structtype[].field[].internalid 2002760220
 doctype[].structtype[].field[].type 10012
 doctype[].structtype[].field[].name "FlagsCounter"
 doctype[].structtype[].field[].internalid 1741227606
-doctype[].structtype[].field[].type 10048
+doctype[].structtype[].field[].type 10041
 doctype[].structtype[].field[].name "anotherfolder"
 doctype[].structtype[].field[].internalid 1582421848
-doctype[].structtype[].field[].type 10047
+doctype[].structtype[].field[].type 10040
 doctype[].structtype[].idx 10016
 doctype[].structtype[].name "types.header"
 doctype[].structtype[].field[].name "abyte"
@@ -217,70 +189,70 @@ doctype[].structtype[].field[].internalid 761581914
 doctype[].structtype[].field[].type 10018
 doctype[].structtype[].field[].name "setfield2"
 doctype[].structtype[].field[].internalid 1066659198
-doctype[].structtype[].field[].type 10019
+doctype[].structtype[].field[].type 10013
 doctype[].structtype[].field[].name "setfield3"
 doctype[].structtype[].field[].internalid 1180155772
-doctype[].structtype[].field[].type 10020
+doctype[].structtype[].field[].type 10019
 doctype[].structtype[].field[].name "setfield4"
 doctype[].structtype[].field[].internalid 1254131631
-doctype[].structtype[].field[].type 10021
+doctype[].structtype[].field[].type 10020
 doctype[].structtype[].field[].name "tagfield"
 doctype[].structtype[].field[].internalid 1653562069
-doctype[].structtype[].field[].type 10022
+doctype[].structtype[].field[].type 10013
 doctype[].structtype[].field[].name "structfield"
 doctype[].structtype[].field[].internalid 486207386
-doctype[].structtype[].field[].type 10023
+doctype[].structtype[].field[].type 10021
 doctype[].structtype[].field[].name "structarrayfield"
 doctype[].structtype[].field[].internalid 335048518
-doctype[].structtype[].field[].type 10024
+doctype[].structtype[].field[].type 10022
 doctype[].structtype[].field[].name "stringmapfield"
 doctype[].structtype[].field[].internalid 117465687
-doctype[].structtype[].field[].type 10025
+doctype[].structtype[].field[].type 10023
 doctype[].structtype[].field[].name "intmapfield"
 doctype[].structtype[].field[].internalid 121004462
-doctype[].structtype[].field[].type 10026
+doctype[].structtype[].field[].type 10024
 doctype[].structtype[].field[].name "floatmapfield"
 doctype[].structtype[].field[].internalid 1239120925
-doctype[].structtype[].field[].type 10027
+doctype[].structtype[].field[].type 10025
 doctype[].structtype[].field[].name "longmapfield"
 doctype[].structtype[].field[].internalid 477718745
-doctype[].structtype[].field[].type 10028
+doctype[].structtype[].field[].type 10026
 doctype[].structtype[].field[].name "doublemapfield"
 doctype[].structtype[].field[].internalid 877047192
-doctype[].structtype[].field[].type 10029
+doctype[].structtype[].field[].type 10027
 doctype[].structtype[].field[].name "arraymapfield"
 doctype[].structtype[].field[].internalid 1670805928
-doctype[].structtype[].field[].type 10030
+doctype[].structtype[].field[].type 10028
 doctype[].structtype[].field[].name "arrarr"
 doctype[].structtype[].field[].internalid 1962567166
-doctype[].structtype[].field[].type 10032
+doctype[].structtype[].field[].type 10029
 doctype[].structtype[].field[].name "maparr"
 doctype[].structtype[].field[].internalid 904375219
-doctype[].structtype[].field[].type 10035
+doctype[].structtype[].field[].type 10032
 doctype[].structtype[].field[].name "complexarray"
 doctype[].structtype[].field[].internalid 795629533
-doctype[].structtype[].field[].type 10037
+doctype[].structtype[].field[].type 10033
 doctype[].structtype[].field[].name "mystructfield"
 doctype[].structtype[].field[].internalid 1348513378
-doctype[].structtype[].field[].type 10041
+doctype[].structtype[].field[].type 10035
 doctype[].structtype[].field[].name "mystructmap"
 doctype[].structtype[].field[].internalid 1511423250
-doctype[].structtype[].field[].type 10044
+doctype[].structtype[].field[].type 10037
 doctype[].structtype[].field[].name "mystructarr"
 doctype[].structtype[].field[].internalid 595856991
-doctype[].structtype[].field[].type 10045
+doctype[].structtype[].field[].type 10038
 doctype[].structtype[].field[].name "Folders"
 doctype[].structtype[].field[].internalid 34575524
-doctype[].structtype[].field[].type 10046
+doctype[].structtype[].field[].type 10039
 doctype[].structtype[].field[].name "juletre"
 doctype[].structtype[].field[].internalid 1039981530
 doctype[].structtype[].field[].type 10008
 doctype[].structtype[].field[].name "album0"
 doctype[].structtype[].field[].internalid 764312262
-doctype[].structtype[].field[].type 10049
+doctype[].structtype[].field[].type 10013
 doctype[].structtype[].field[].name "album1"
 doctype[].structtype[].field[].internalid 1967160809
-doctype[].structtype[].field[].type 10050
+doctype[].structtype[].field[].type 10013
 doctype[].structtype[].field[].name "other"
 doctype[].structtype[].field[].internalid 2443357
 doctype[].structtype[].field[].type 10008