Исправлено: Если в макете задается несколько записей периодического н…

…езависимого регистра сведений, то в базе создается только одна последняя запись. fix xDrivenDevelopment#647
binexekb · Dec 24, 2016 · c39cf42 · c39cf42
1 parent c99a1f7
commit c39cf42
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 57 deletions.
diff --git a/Plugins/СериализаторMXL.epf b/Plugins/СериализаторMXL.epf
diff --git a/src/Plugins/СериализаторMXL/Form/Форма/form b/src/Plugins/СериализаторMXL/Form/Форма/form
@@ -113,9 +113,7 @@
 {0},4,1,0,00000000-0000-0000-0000-000000000000},
 {1,0},0,0},9,2,1,0,1,1,
 {5,c45fa92b-aba3-4d9e-a9fe-274560abc287,367,1,8,
-{6,1c81d3a5-1340-4e19-882f-d0eb9071c9d3,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
-{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
-{6,81c6e6bc-5b87-472a-9e97-bf3a75c7505f,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,eb1c4cc5-59f9-420a-8b47-0dffd1475bfd,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанель1ПротестироватьЗагрузкуМакета",
 {1,"КоманднаяПанель1ПротестироватьЗагрузкуМакета",
 {1,1,
@@ -135,10 +133,7 @@
 {4,1,
 {0,20ebc47b-f4d9-439c-acd3-fdc624fbac2a},"",-1,-1,1,0,""}
 },
-{6,e0ae2468-e1d0-4599-9927-c10a75e94d4e,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
-{6,4294967295,00000000-0000-0000-0000-000000000000,142,
-{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},
-{6,6768e376-1372-41ef-90d2-d7384c90d874,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,5a7696ce-501c-438d-9420-605207bb03f0,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанель1ПодменюСоздатьМакетДанных",
 {1,"КоманднаяПанель1ПодменюСоздатьМакетДанных",
 {1,1,
@@ -158,11 +153,14 @@
 {4,1,
 {0,affb1617-24bc-4170-9c84-0902cc3ef206},"",-1,-1,1,0,""}
 },
-{6,f28d99eb-106b-4274-bfff-7c7b9b381c5d,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{6,89885841-c96c-45a9-8daa-e810e8048ec9,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
 {1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
-{6,a0fa8fd6-8870-4d10-a901-ad3c4ec30ac8,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{6,656d7f3c-b9c6-4a95-8c1d-fb840eab4065,1,fbe38877-b914-4fd5-8540-07dde06ba2e1,
+{6,4294967295,00000000-0000-0000-0000-000000000000,142,
+{1,99,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0},0,1},0},
+{6,f9e98e7d-60b7-41e1-8dbe-8ac70d3b8a1b,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
 {1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
-{6,b7a2c275-e1e1-4fe4-a352-b1c5451fa030,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,f4a9d911-5abd-4dca-96d2-bffb98508d82,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанель1СохранитьМакетДанныхВФайл",
 {1,"КоманднаяПанель1СохранитьМакетДанныхВФайл",
 {1,1,
@@ -182,37 +180,39 @@
 {4,1,
 {0,818ab7d0-4654-4542-bd5e-fd9d1352b5a1},"",-1,-1,1,0,""}
 },
-{6,7a41b669-7148-445d-a7d2-f109892c38e9,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{6,4570b087-c4dd-44ef-b6a3-d5fe8070cc69,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
+{6,c170cb19-0020-4883-8c89-a08d671ea015,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
 {1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},1,
-{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,8,a0fa8fd6-8870-4d10-a901-ad3c4ec30ac8,
+{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,8,89885841-c96c-45a9-8daa-e810e8048ec9,
 {8,"Разделитель4",0,1,
 {1,1,
 {"ru","Действие2"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,38,1e2,2,0,1,0,0,0,0},6768e376-1372-41ef-90d2-d7384c90d874,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,38,1e2,2,0,1,0,0,0,0},5a7696ce-501c-438d-9420-605207bb03f0,
 {8,"ПодменюСоздатьМакетДанных",0,1,
 {1,1,
 {"ru","Создать макет данных"}
-},1,c45fa92b-aba3-4d9e-a9fe-274560abc287,81,1e2,0,3,1,0,0,0,0},7a41b669-7148-445d-a7d2-f109892c38e9,
+},1,c45fa92b-aba3-4d9e-a9fe-274560abc287,81,1e2,0,3,1,0,0,0,0},4570b087-c4dd-44ef-b6a3-d5fe8070cc69,
 {8,"Разделитель1",0,1,
 {1,1,
 {"ru","Действие1"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,11,1e2,2,0,1,0,0,0,0},81c6e6bc-5b87-472a-9e97-bf3a75c7505f,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,11,1e2,2,0,1,0,0,0,0},eb1c4cc5-59f9-420a-8b47-0dffd1475bfd,
 {8,"ПротестироватьЗагрузкуМакета",0,1,
 {1,1,
 {"#","Протестировать загрузку макета"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,12,1e2,0,3,1,0,0,0,0},1c81d3a5-1340-4e19-882f-d0eb9071c9d3,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,12,1e2,0,3,1,0,0,0,0},c170cb19-0020-4883-8c89-a08d671ea015,
 {8,"Разделитель2",0,1,
 {1,1,
 {"ru","Действие1"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,13,1e2,2,0,1,0,0,0,0},b7a2c275-e1e1-4fe4-a352-b1c5451fa030,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,13,1e2,2,0,1,0,0,0,0},f4a9d911-5abd-4dca-96d2-bffb98508d82,
 {8,"СохранитьМакетДанныхВФайл",0,1,
 {1,1,
 {"#","Сохранить макет данных в файл"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,14,1e2,0,3,1,0,0,0,0},f28d99eb-106b-4274-bfff-7c7b9b381c5d,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,14,1e2,0,3,1,0,0,0,0},f9e98e7d-60b7-41e1-8dbe-8ac70d3b8a1b,
 {8,"Разделитель3",0,1,
 {1,1,
 {"ru","Действие2"}
-},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,16,1e2,2,0,1,0,0,0,0},e0ae2468-e1d0-4599-9927-c10a75e94d4e,
+},0,c45fa92b-aba3-4d9e-a9fe-274560abc287,16,1e2,2,0,1,0,0,0,0},656d7f3c-b9c6-4a95-8c1d-fb840eab4065,
 {8,"Действие1",0,1,
 {1,1,
 {"#","Действие1"}
@@ -602,7 +602,9 @@
 {0},0,0,0,48312c09-257f-4b29-b280-284dd89efc1e},
 {1,0},0,0},9,2,1,0,1,1,
 {5,c57d1982-5648-4cf0-a874-e4b7f130b2f9,638,1,2,
-{6,6a6b660a-5e8d-4cbf-9fa2-29cdc2b1bd4b,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,004e8fd5-cfeb-4750-91dc-d344b5502cbf,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
+{6,881d5a4f-1114-4ff8-8c66-7027fd294772,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанель2ОчиститьТаблицуДанных",
 {1,"КоманднаяПанель2ОчиститьТаблицуДанных",
 {1,1,
@@ -621,14 +623,12 @@
 },1,
 {4,1,
 {-2},"",-1,-1,1,0,""}
-},
-{6,14f38c96-f4d5-47fc-a94f-ade13d16016b,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
-{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},1,
-{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,14f38c96-f4d5-47fc-a94f-ade13d16016b,
+},1,
+{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,004e8fd5-cfeb-4750-91dc-d344b5502cbf,
 {8,"Разделитель",0,1,
 {1,1,
 {"ru","Действие9"}
-},0,c57d1982-5648-4cf0-a874-e4b7f130b2f9,88,1e2,2,0,1,0,0,0,0},6a6b660a-5e8d-4cbf-9fa2-29cdc2b1bd4b,
+},0,c57d1982-5648-4cf0-a874-e4b7f130b2f9,88,1e2,2,0,1,0,0,0,0},881d5a4f-1114-4ff8-8c66-7027fd294772,
 {8,"ОчиститьТаблицуДанных",0,1,
 {1,1,
 {"ru","Очистить"}
@@ -5477,9 +5477,9 @@ CYGcwWBPZwKqGvLSfenfygT8jsON3BLEihiIbw==},0}
 {0},0,0,0,48312c09-257f-4b29-b280-284dd89efc1e},
 {1,0},0,0},9,2,1,0,1,1,
 {5,d0a52278-ca43-4762-b8e3-8d872ef8fe2d,326,1,2,
-{6,e0da4dc9-3548-42c1-bd84-40e294a8b2d6,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{6,99d37ec0-6dd8-4d1e-911b-f3e52cb5dbd2,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
 {1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
-{6,4af8df4c-e8ca-45d8-8ade-58069743d392,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,a8913599-9643-43d6-ba2f-96c547d00743,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанельКомпоновщикОтборПоказатьРезультатаОтбора",
 {1,"КоманднаяПанельКомпоновщикОтборПоказатьРезультатаОтбора",
 {1,1,
@@ -5503,11 +5503,11 @@ CYGcwWBPZwKqGvLSfenfygT8jsON3BLEihiIbw==},0}
 {"ru","Показать выбранные записи"}
 }
 },1,
-{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,e0da4dc9-3548-42c1-bd84-40e294a8b2d6,
+{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,2,99d37ec0-6dd8-4d1e-911b-f3e52cb5dbd2,
 {8,"Разделитель1",0,1,
 {1,1,
 {"ru","Действие4"}
-},0,d0a52278-ca43-4762-b8e3-8d872ef8fe2d,8,1e2,2,0,1,0,0,0,0},4af8df4c-e8ca-45d8-8ade-58069743d392,
+},0,d0a52278-ca43-4762-b8e3-8d872ef8fe2d,8,1e2,2,0,1,0,0,0,0},a8913599-9643-43d6-ba2f-96c547d00743,
 {8,"ПоказатьРезультатаОтбора",0,3,
 {1,1,
 {"ru","Показать выбранные"}
@@ -5577,7 +5577,29 @@ CYGcwWBPZwKqGvLSfenfygT8jsON3BLEihiIbw==},0}
 {0},0,0,0,48312c09-257f-4b29-b280-284dd89efc1e},
 {1,0},0,0},9,2,0,0,1,1,
 {5,8d6538eb-fa47-46f2-82d7-07ab238d41c2,3,1,3,
-{6,44359061-973a-473b-ad1d-82ec2845c6b8,1,e1692cc2-605b-4535-84dd-28440238746c,
+{6,df1277be-c6fa-4cc7-a22f-b129344bbe63,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
+{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},
+{6,dc77179e-97e9-4d4b-b7ea-855c8f4067ef,1,e1692cc2-605b-4535-84dd-28440238746c,
+{3,"КоманднаяПанельДеревоМетаданныхЗаполнитьТаблицуДанных",
+{1,"КоманднаяПанельДеревоМетаданныхЗаполнитьТаблицуДанных",
+{1,1,
+{"ru","Заполнить таблицу данных"}
+},
+{1,1,
+{"ru","Заполнить таблицу данных"}
+},
+{1,1,
+{"ru","Заполнить таблицу данных"}
+},
+{4,0,
+{0},"",-1,-1,1,0,""},
+{0,0,0}
+}
+},1,
+{4,1,
+{-8},"",-1,-1,1,0,""}
+},
+{6,2c569a0a-dfad-41cb-b2fd-41ebb2bd6830,1,e1692cc2-605b-4535-84dd-28440238746c,
 {3,"КоманднаяПанель1ПересчетВыгружаемыхПоСсылке",
 {1,"КоманднаяПанель1ПересчетВыгружаемыхПоСсылке",
 {1,1,
@@ -5610,38 +5632,16 @@ AP+IiGZggA8AD4/4ZmCA//AAj/hmYI///wCP+IiAj///8I/4/4CIiIiIj/j/gGZo
 ////+P+AZmj////4D4BmaIiIiIgAgGZmZo///wCAZmZmj///8IBmZmaIiIiIgA==
 }
 },0,""}
-},
-{6,4f0e822a-996f-41b2-aa12-6c3a8a969578,1,e1692cc2-605b-4535-84dd-28440238746c,
-{3,"КоманднаяПанельДеревоМетаданныхЗаполнитьТаблицуДанных",
-{1,"КоманднаяПанельДеревоМетаданныхЗаполнитьТаблицуДанных",
-{1,1,
-{"ru","Заполнить таблицу данных"}
-},
-{1,1,
-{"ru","Заполнить таблицу данных"}
-},
-{1,1,
-{"ru","Заполнить таблицу данных"}
-},
-{4,0,
-{0},"",-1,-1,1,0,""},
-{0,0,0}
-}
 },1,
-{4,1,
-{-8},"",-1,-1,1,0,""}
-},
-{6,61367591-b51f-4780-a39c-05bb35776b94,1,abde0c9a-18a6-4e0c-bbaa-af26b911b3e6,
-{1,9d0a2e40-b978-11d4-84b6-008048da06df,0},0},1,
-{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,3,44359061-973a-473b-ad1d-82ec2845c6b8,
+{5,b78f2e80-ec68-11d4-9dcf-0050bae2bc79,4,0,3,2c569a0a-dfad-41cb-b2fd-41ebb2bd6830,
 {8,"ПересчетВыгружаемыхПоСсылке",0,2,
 {1,1,
 {"ru","Объекты по ссылкам"}
-},1,8d6538eb-fa47-46f2-82d7-07ab238d41c2,1,1e2,0,3,1,0,0,0,0},61367591-b51f-4780-a39c-05bb35776b94,
+},1,8d6538eb-fa47-46f2-82d7-07ab238d41c2,1,1e2,0,3,1,0,0,0,0},df1277be-c6fa-4cc7-a22f-b129344bbe63,
 {8,"Разделитель",0,1,
 {1,1,
 {"ru","Действие"}
-},0,8d6538eb-fa47-46f2-82d7-07ab238d41c2,3,1e2,2,0,1,0,0,0,0},4f0e822a-996f-41b2-aa12-6c3a8a969578,
+},0,8d6538eb-fa47-46f2-82d7-07ab238d41c2,3,1e2,2,0,1,0,0,0,0},dc77179e-97e9-4d4b-b7ea-855c8f4067ef,
 {8,"ЗаполнитьТаблицуДанных",0,1,
 {1,1,
 {"#","Заполнить таблицу данных"}
@@ -7111,7 +7111,7 @@ oanqzpkY0RsX7fGEgHWLQaYv/VvZgP/k2JFHglgRA+kF},0}
 {0}
 }
 }
-},937,500,1,0,1,4,4,392,937,500,96},
+},937,500,1,0,1,4,4,393,937,500,96},
 {
 {0},14,
 {2,

diff --git a/src/Plugins/СериализаторMXL/ObjectModule.bsl b/src/Plugins/СериализаторMXL/ObjectModule.bsl
@@ -154,6 +154,7 @@
 
 		//Если новый объект
 		ИмяПеременной = ПрочитатьЗначениеЯчейкиМакета(ТабличныйДокумент,НомерСтроки,КолонкиМакета.ИмяПеременной);
+		ИмяПеременной = СтрЗаменить(СокрЛП(ИмяПеременной), Символы.НПП, "");
 		Если Не ПустаяСтрока(ИмяПеременной) Тогда
 			Если ПротоДанные.Свойство(ИмяПеременной) Тогда
 				ВызватьИсключение "Ошибка при создании данных из макета! Неуникальное имя переменной: ["+ИмяПеременной+"]";
@@ -838,6 +839,10 @@
 					Объект.Отбор[ИмяИзмерения].Установить(ЗаписьНабора[ИмяИзмерения]);
 				КонецЕсли;
 			КонецЦикла;
+
+			Если МетаданныеНабора.ПериодичностьРегистраСведений <> Метаданные.СвойстваОбъектов.ПериодичностьРегистраСведений.Непериодический Тогда
+				Объект.Отбор.Период.Установить(ЗаписьНабора["Период"]); 
+			КонецЕсли;
 		КонецЕсли;
 
 		ЗаполнитьОбменДанными(Объект, ПротоДанные, ПротоОбъект);

diff --git a/src/Plugins/СериализаторMXL/und/versions b/src/Plugins/СериализаторMXL/und/versions
@@ -1 +1 @@
-{1,49,"",a47020a3-ca16-49ac-bac7-647752b90a15,"01b3462f-bb96-43d3-862b-e5cbcf9afd55",360d6d61-2554-4a0d-8a26-24fdc64577bb,"01b3462f-bb96-43d3-862b-e5cbcf9afd55.0",cd699863-430e-4d43-a321-2c397eb1d2b4,"103ebd31-7643-4b1a-ba8b-4c789efcb71f",166666ed-c8ed-42e5-ab10-cf2b04c91213,"103ebd31-7643-4b1a-ba8b-4c789efcb71f.0",3d336166-3888-4c63-ae9a-99e7821ed589,"178f7433-f515-4d45-befa-5af52252dd0a",a44c1794-999d-4b1e-b370-35e8fddb94f9,"178f7433-f515-4d45-befa-5af52252dd0a.0",fc257d45-d661-4755-9d8a-63cd7781101c,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454",3f34ba69-ecc5-4a44-bee2-07a58407868a,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454.0",0530e4b9-d105-4004-8d6c-fd75c47c3a20,"3bcacc26-7049-41bb-94bc-b45f76986467",a35b8aec-9b11-46a0-b14f-18583212429c,"3bcacc26-7049-41bb-94bc-b45f76986467.0",57b05bc7-29ec-4ef7-86cd-3228ca9db7bf,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10",d0616563-d58b-4f9b-b426-d9c6ac839c99,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10.0",90130279-52b6-459c-a6e1-009d0d8aeeb2,"54f1dec0-8f13-4065-9f45-0e74788142d2.0",4a35dd12-8770-40bf-a4a2-9aec807cc589,"5e00fac5-7796-4854-8e6b-c5933432d814",7e906da7-4580-4e42-9cec-8be2381a0163,"5e00fac5-7796-4854-8e6b-c5933432d814.0",48d53265-e3ba-46fe-8570-5f43c840a5f3,"624cf4b8-3591-4ce1-9579-6ac683689eb1",f26947ab-9bbb-472e-863e-e8ee6e5181b8,"624cf4b8-3591-4ce1-9579-6ac683689eb1.0",c5fcaeee-f748-45ee-b26b-30134ba875cf,"6da54382-70f9-4d82-aa91-d001b86297ee",109c41ac-ff76-46d8-a213-af665310cbf0,"6da54382-70f9-4d82-aa91-d001b86297ee.0",a81c20c0-168f-46f8-8540-f6c927cafa20,"799b41e4-6664-42d1-ba19-2dd1a0822bf6",0d2d8cd2-c65c-4cb6-9a96-0e9ab4fc8ced,"799b41e4-6664-42d1-ba19-2dd1a0822bf6.0",d5df2006-bbfa-4666-97a8-97fabffa78cf,"7b3de063-6588-445c-a318-e989e219f24c",500d26af-8fe9-4119-9839-99f72344e48d,"7b3de063-6588-445c-a318-e989e219f24c.0",239ddd0e-1ccb-4c4d-9bdf-a6c30d5cd781,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7",3b232cd8-10dc-41ae-8d97-58977ccf1118,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7.0",aa391f4e-3479-4a09-81b8-8cbcbf43fdf6,"96508b55-1be0-4dbb-9a9d-a96d9a404282",8d88f2ea-7578-4efb-8b0f-46058a697c1c,"96508b55-1be0-4dbb-9a9d-a96d9a404282.0",ec87d55c-54be-46c2-9967-a148160e1ea8,"96bd1b96-9768-4a45-a972-1a728188f448",5d4f085a-f129-4614-8fce-e6f6ec93cf6b,"96bd1b96-9768-4a45-a972-1a728188f448.0",88d6b8a6-9f21-487e-9f1b-0aff142bb495,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0",f7a2cccf-4d77-47b5-b690-2d3b2694e8d5,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0.0",35e0150c-aa31-4bc2-a055-61547d416e8c,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991",300c1430-75f8-4d27-9107-675b53ac9b47,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991.0",d279c40e-f955-42ce-aee0-53159ae9c902,"a5b4bbdd-19ca-489b-9dce-60e08daa143f",30e45d44-0be8-4433-b9e3-7f8c19eb8b30,"a5b4bbdd-19ca-489b-9dce-60e08daa143f.0",3adc200b-53fd-4bb6-9f88-10d47de6041b,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6",e6aa2ed1-354b-4919-8962-3a0d674ccddc,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6.0",d383f53b-d722-431d-b26a-df624a659c3e,"copyinfo",c8a7d02c-42d4-4cbd-a636-8e7a10045634,"d0ac533a-c210-47e2-94e1-6d5329bcc033",cac5ed94-a347-4acb-81d0-3f0cc60e040e,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8",9431d5bc-a6b9-4ce9-ae9f-f199d1ed4402,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8.0",b62d4f37-90a7-4385-ab3e-12dd1317d249,"f04e1194-a196-4a4b-b797-7ece45ac1872",3490e845-662a-4973-9d6b-e0190f76349e,"f04e1194-a196-4a4b-b797-7ece45ac1872.0",7b1d7c01-9ed6-4e52-b14c-a46aa697e5cc,"f930823a-837f-43ad-9791-02742bdf3c7a",67a5bb77-3472-46f5-90a4-089b33c28f37,"f930823a-837f-43ad-9791-02742bdf3c7a.0",9ec21faa-874c-4279-8ef3-ede49ee6efbf,"root",f51e3c1e-9536-4280-ab6c-736a8631d0f0,"version",823f82a1-fa91-4e5c-8a6d-fc285b508c24,"versions",79cae9b2-46e1-4565-b02a-66ba22ccbc80}
+{1,49,"",913c26ca-ca6f-46f8-a57f-8590ed5fd07a,"01b3462f-bb96-43d3-862b-e5cbcf9afd55",4764b26d-5b5c-46cf-a7e7-c5523b08635a,"01b3462f-bb96-43d3-862b-e5cbcf9afd55.0",644dd407-497a-42be-b807-edb2cad5564f,"103ebd31-7643-4b1a-ba8b-4c789efcb71f",ed33138d-f0dc-4e10-851d-9f4b7784fa83,"103ebd31-7643-4b1a-ba8b-4c789efcb71f.0",e28b3dcf-93fb-4b96-b7a2-12afa671b797,"178f7433-f515-4d45-befa-5af52252dd0a",00a7643a-5474-436b-a21f-f3d286cdc5a8,"178f7433-f515-4d45-befa-5af52252dd0a.0",2f139beb-cf8c-41c1-a3b7-a3be851ded3e,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454",22fd2cad-21a3-4bb0-8ec4-342e8de2748a,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454.0",2cf0665c-9314-4543-89c9-791b74480f3f,"3bcacc26-7049-41bb-94bc-b45f76986467",eaa75803-a89e-4eae-b518-9d90d7f8771e,"3bcacc26-7049-41bb-94bc-b45f76986467.0",3b11e031-3b91-42ce-b754-705dff0f8cc6,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10",0f51ef20-3ea6-4150-a241-9d8f6ac4ac82,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10.0",126cfe5e-bf7d-4bed-a7ed-d393d923835d,"54f1dec0-8f13-4065-9f45-0e74788142d2.0",d59e472f-14d5-4b2e-ba6f-9a939ef363d5,"5e00fac5-7796-4854-8e6b-c5933432d814",ab670d1b-44c5-4059-a598-0c8704e0898e,"5e00fac5-7796-4854-8e6b-c5933432d814.0",86ed9898-01c2-4a65-b8e0-842c12537400,"624cf4b8-3591-4ce1-9579-6ac683689eb1",b3c91875-779c-4d59-b9d0-52c808ced667,"624cf4b8-3591-4ce1-9579-6ac683689eb1.0",e01729de-520f-4fc8-874e-f86cfb7c6059,"6da54382-70f9-4d82-aa91-d001b86297ee",ef70c164-4840-4b25-9d9b-5502d5d68d46,"6da54382-70f9-4d82-aa91-d001b86297ee.0",c1dffb6b-35d8-484a-813f-1be6e1faf332,"799b41e4-6664-42d1-ba19-2dd1a0822bf6",a39b4c7e-e06a-4278-9ba7-620e6aa417ab,"799b41e4-6664-42d1-ba19-2dd1a0822bf6.0",a861a8be-7ce2-466c-8cd7-5c11b8ef437e,"7b3de063-6588-445c-a318-e989e219f24c",2a483dc0-9b4a-4197-956f-a55760a839c9,"7b3de063-6588-445c-a318-e989e219f24c.0",2ad2384f-bcdc-4c59-8e4a-dff3deca9a08,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7",b6ae616c-00a1-4c56-bd09-44a57850dea8,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7.0",d02ad618-691c-42f7-8eab-bafcf18bd503,"96508b55-1be0-4dbb-9a9d-a96d9a404282",14853922-cbf4-4cfa-9bc8-d4fde5269688,"96508b55-1be0-4dbb-9a9d-a96d9a404282.0",c49597aa-6bb3-4f65-b074-7288091c4e17,"96bd1b96-9768-4a45-a972-1a728188f448",ead04d7e-4d5d-416c-a13f-bc9e1ffe50f7,"96bd1b96-9768-4a45-a972-1a728188f448.0",95dc16dc-d8de-40af-a938-87a1b1179d32,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0",4f680795-5ec6-4038-9701-741df1ca9e33,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0.0",ff3b8e8e-2838-40b4-b212-81bdfb1da607,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991",1cb44faf-79a6-465f-aa7d-215515da3596,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991.0",52d01a4d-0053-4404-bd72-da463cbd7551,"a5b4bbdd-19ca-489b-9dce-60e08daa143f",2d0f6100-cbc9-4361-acc8-b54286689c2e,"a5b4bbdd-19ca-489b-9dce-60e08daa143f.0",0815ed7a-40e3-4365-a227-1058460e1bf8,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6",0da84edc-2404-4052-8050-fdde2e1ea29c,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6.0",02575c5c-186c-45a5-8ce8-01828550b74c,"copyinfo",59debe3a-6c19-46b3-ad01-e5339cb8c901,"d0ac533a-c210-47e2-94e1-6d5329bcc033",1d8ec165-5d9f-4aab-a810-4c44feeb770b,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8",985f02ef-0309-44f8-aa75-db03171618d1,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8.0",28e20615-ebfe-4b78-b13d-ef2252f538c2,"f04e1194-a196-4a4b-b797-7ece45ac1872",19372744-a445-4b6c-952d-605bdab71960,"f04e1194-a196-4a4b-b797-7ece45ac1872.0",02771870-74aa-4eec-b8e0-f645c8f33fc4,"f930823a-837f-43ad-9791-02742bdf3c7a",228b245f-d627-4a98-b5ea-09aa47abe37c,"f930823a-837f-43ad-9791-02742bdf3c7a.0",9cc1f799-1845-4cfa-8bfa-3cb763d654a7,"root",ff05003a-74be-424c-928b-f12f8c5fcc18,"version",dfdf3ed6-4229-4470-9472-ea04e9fccdd3,"versions",5ff3e705-cd88-4309-b638-c750bbef36cc}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{1,49,"",a47020a3-ca16-49ac-bac7-647752b90a15,"01b3462f-bb96-43d3-862b-e5cbcf9afd55",360d6d61-2554-4a0d-8a26-24fdc64577bb,"01b3462f-bb96-43d3-862b-e5cbcf9afd55.0",cd699863-430e-4d43-a321-2c397eb1d2b4,"103ebd31-7643-4b1a-ba8b-4c789efcb71f",166666ed-c8ed-42e5-ab10-cf2b04c91213,"103ebd31-7643-4b1a-ba8b-4c789efcb71f.0",3d336166-3888-4c63-ae9a-99e7821ed589,"178f7433-f515-4d45-befa-5af52252dd0a",a44c1794-999d-4b1e-b370-35e8fddb94f9,"178f7433-f515-4d45-befa-5af52252dd0a.0",fc257d45-d661-4755-9d8a-63cd7781101c,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454",3f34ba69-ecc5-4a44-bee2-07a58407868a,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454.0",0530e4b9-d105-4004-8d6c-fd75c47c3a20,"3bcacc26-7049-41bb-94bc-b45f76986467",a35b8aec-9b11-46a0-b14f-18583212429c,"3bcacc26-7049-41bb-94bc-b45f76986467.0",57b05bc7-29ec-4ef7-86cd-3228ca9db7bf,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10",d0616563-d58b-4f9b-b426-d9c6ac839c99,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10.0",90130279-52b6-459c-a6e1-009d0d8aeeb2,"54f1dec0-8f13-4065-9f45-0e74788142d2.0",4a35dd12-8770-40bf-a4a2-9aec807cc589,"5e00fac5-7796-4854-8e6b-c5933432d814",7e906da7-4580-4e42-9cec-8be2381a0163,"5e00fac5-7796-4854-8e6b-c5933432d814.0",48d53265-e3ba-46fe-8570-5f43c840a5f3,"624cf4b8-3591-4ce1-9579-6ac683689eb1",f26947ab-9bbb-472e-863e-e8ee6e5181b8,"624cf4b8-3591-4ce1-9579-6ac683689eb1.0",c5fcaeee-f748-45ee-b26b-30134ba875cf,"6da54382-70f9-4d82-aa91-d001b86297ee",109c41ac-ff76-46d8-a213-af665310cbf0,"6da54382-70f9-4d82-aa91-d001b86297ee.0",a81c20c0-168f-46f8-8540-f6c927cafa20,"799b41e4-6664-42d1-ba19-2dd1a0822bf6",0d2d8cd2-c65c-4cb6-9a96-0e9ab4fc8ced,"799b41e4-6664-42d1-ba19-2dd1a0822bf6.0",d5df2006-bbfa-4666-97a8-97fabffa78cf,"7b3de063-6588-445c-a318-e989e219f24c",500d26af-8fe9-4119-9839-99f72344e48d,"7b3de063-6588-445c-a318-e989e219f24c.0",239ddd0e-1ccb-4c4d-9bdf-a6c30d5cd781,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7",3b232cd8-10dc-41ae-8d97-58977ccf1118,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7.0",aa391f4e-3479-4a09-81b8-8cbcbf43fdf6,"96508b55-1be0-4dbb-9a9d-a96d9a404282",8d88f2ea-7578-4efb-8b0f-46058a697c1c,"96508b55-1be0-4dbb-9a9d-a96d9a404282.0",ec87d55c-54be-46c2-9967-a148160e1ea8,"96bd1b96-9768-4a45-a972-1a728188f448",5d4f085a-f129-4614-8fce-e6f6ec93cf6b,"96bd1b96-9768-4a45-a972-1a728188f448.0",88d6b8a6-9f21-487e-9f1b-0aff142bb495,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0",f7a2cccf-4d77-47b5-b690-2d3b2694e8d5,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0.0",35e0150c-aa31-4bc2-a055-61547d416e8c,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991",300c1430-75f8-4d27-9107-675b53ac9b47,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991.0",d279c40e-f955-42ce-aee0-53159ae9c902,"a5b4bbdd-19ca-489b-9dce-60e08daa143f",30e45d44-0be8-4433-b9e3-7f8c19eb8b30,"a5b4bbdd-19ca-489b-9dce-60e08daa143f.0",3adc200b-53fd-4bb6-9f88-10d47de6041b,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6",e6aa2ed1-354b-4919-8962-3a0d674ccddc,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6.0",d383f53b-d722-431d-b26a-df624a659c3e,"copyinfo",c8a7d02c-42d4-4cbd-a636-8e7a10045634,"d0ac533a-c210-47e2-94e1-6d5329bcc033",cac5ed94-a347-4acb-81d0-3f0cc60e040e,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8",9431d5bc-a6b9-4ce9-ae9f-f199d1ed4402,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8.0",b62d4f37-90a7-4385-ab3e-12dd1317d249,"f04e1194-a196-4a4b-b797-7ece45ac1872",3490e845-662a-4973-9d6b-e0190f76349e,"f04e1194-a196-4a4b-b797-7ece45ac1872.0",7b1d7c01-9ed6-4e52-b14c-a46aa697e5cc,"f930823a-837f-43ad-9791-02742bdf3c7a",67a5bb77-3472-46f5-90a4-089b33c28f37,"f930823a-837f-43ad-9791-02742bdf3c7a.0",9ec21faa-874c-4279-8ef3-ede49ee6efbf,"root",f51e3c1e-9536-4280-ab6c-736a8631d0f0,"version",823f82a1-fa91-4e5c-8a6d-fc285b508c24,"versions",79cae9b2-46e1-4565-b02a-66ba22ccbc80}
		{1,49,"",913c26ca-ca6f-46f8-a57f-8590ed5fd07a,"01b3462f-bb96-43d3-862b-e5cbcf9afd55",4764b26d-5b5c-46cf-a7e7-c5523b08635a,"01b3462f-bb96-43d3-862b-e5cbcf9afd55.0",644dd407-497a-42be-b807-edb2cad5564f,"103ebd31-7643-4b1a-ba8b-4c789efcb71f",ed33138d-f0dc-4e10-851d-9f4b7784fa83,"103ebd31-7643-4b1a-ba8b-4c789efcb71f.0",e28b3dcf-93fb-4b96-b7a2-12afa671b797,"178f7433-f515-4d45-befa-5af52252dd0a",00a7643a-5474-436b-a21f-f3d286cdc5a8,"178f7433-f515-4d45-befa-5af52252dd0a.0",2f139beb-cf8c-41c1-a3b7-a3be851ded3e,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454",22fd2cad-21a3-4bb0-8ec4-342e8de2748a,"39a44593-4b6d-4b66-8cda-2f0e9ea7d454.0",2cf0665c-9314-4543-89c9-791b74480f3f,"3bcacc26-7049-41bb-94bc-b45f76986467",eaa75803-a89e-4eae-b518-9d90d7f8771e,"3bcacc26-7049-41bb-94bc-b45f76986467.0",3b11e031-3b91-42ce-b754-705dff0f8cc6,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10",0f51ef20-3ea6-4150-a241-9d8f6ac4ac82,"4b38e3ee-f722-47b8-9c4c-1c4aa073ba10.0",126cfe5e-bf7d-4bed-a7ed-d393d923835d,"54f1dec0-8f13-4065-9f45-0e74788142d2.0",d59e472f-14d5-4b2e-ba6f-9a939ef363d5,"5e00fac5-7796-4854-8e6b-c5933432d814",ab670d1b-44c5-4059-a598-0c8704e0898e,"5e00fac5-7796-4854-8e6b-c5933432d814.0",86ed9898-01c2-4a65-b8e0-842c12537400,"624cf4b8-3591-4ce1-9579-6ac683689eb1",b3c91875-779c-4d59-b9d0-52c808ced667,"624cf4b8-3591-4ce1-9579-6ac683689eb1.0",e01729de-520f-4fc8-874e-f86cfb7c6059,"6da54382-70f9-4d82-aa91-d001b86297ee",ef70c164-4840-4b25-9d9b-5502d5d68d46,"6da54382-70f9-4d82-aa91-d001b86297ee.0",c1dffb6b-35d8-484a-813f-1be6e1faf332,"799b41e4-6664-42d1-ba19-2dd1a0822bf6",a39b4c7e-e06a-4278-9ba7-620e6aa417ab,"799b41e4-6664-42d1-ba19-2dd1a0822bf6.0",a861a8be-7ce2-466c-8cd7-5c11b8ef437e,"7b3de063-6588-445c-a318-e989e219f24c",2a483dc0-9b4a-4197-956f-a55760a839c9,"7b3de063-6588-445c-a318-e989e219f24c.0",2ad2384f-bcdc-4c59-8e4a-dff3deca9a08,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7",b6ae616c-00a1-4c56-bd09-44a57850dea8,"7ce6ce19-d0d0-4f0d-96c4-74d9b6238df7.0",d02ad618-691c-42f7-8eab-bafcf18bd503,"96508b55-1be0-4dbb-9a9d-a96d9a404282",14853922-cbf4-4cfa-9bc8-d4fde5269688,"96508b55-1be0-4dbb-9a9d-a96d9a404282.0",c49597aa-6bb3-4f65-b074-7288091c4e17,"96bd1b96-9768-4a45-a972-1a728188f448",ead04d7e-4d5d-416c-a13f-bc9e1ffe50f7,"96bd1b96-9768-4a45-a972-1a728188f448.0",95dc16dc-d8de-40af-a938-87a1b1179d32,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0",4f680795-5ec6-4038-9701-741df1ca9e33,"9bd9901f-46d8-4c40-88b9-f58ac48f0fd0.0",ff3b8e8e-2838-40b4-b212-81bdfb1da607,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991",1cb44faf-79a6-465f-aa7d-215515da3596,"9c8d5c50-f21a-4e92-a2df-2a0b5306e991.0",52d01a4d-0053-4404-bd72-da463cbd7551,"a5b4bbdd-19ca-489b-9dce-60e08daa143f",2d0f6100-cbc9-4361-acc8-b54286689c2e,"a5b4bbdd-19ca-489b-9dce-60e08daa143f.0",0815ed7a-40e3-4365-a227-1058460e1bf8,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6",0da84edc-2404-4052-8050-fdde2e1ea29c,"aeaa86b2-a07f-40ef-afd6-1b116e7a37b6.0",02575c5c-186c-45a5-8ce8-01828550b74c,"copyinfo",59debe3a-6c19-46b3-ad01-e5339cb8c901,"d0ac533a-c210-47e2-94e1-6d5329bcc033",1d8ec165-5d9f-4aab-a810-4c44feeb770b,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8",985f02ef-0309-44f8-aa75-db03171618d1,"efa2b5fc-de31-4695-a81b-8acc1a24d8f8.0",28e20615-ebfe-4b78-b13d-ef2252f538c2,"f04e1194-a196-4a4b-b797-7ece45ac1872",19372744-a445-4b6c-952d-605bdab71960,"f04e1194-a196-4a4b-b797-7ece45ac1872.0",02771870-74aa-4eec-b8e0-f645c8f33fc4,"f930823a-837f-43ad-9791-02742bdf3c7a",228b245f-d627-4a98-b5ea-09aa47abe37c,"f930823a-837f-43ad-9791-02742bdf3c7a.0",9cc1f799-1845-4cfa-8bfa-3cb763d654a7,"root",ff05003a-74be-424c-928b-f12f8c5fcc18,"version",dfdf3ed6-4229-4470-9472-ea04e9fccdd3,"versions",5ff3e705-cd88-4309-b638-c750bbef36cc}