Changes for page Intersection table of ML Elements with glossary terms

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,8 +1,7 @@
1		-{{velocity}}
	1	+{{velocity output="false"}}
2	2	#set($rootDocFullName = $doc.getParent())
3	3	#set($rootDoc = $xwiki.getDocument($rootDocFullName))
4	4	#set($fullNamePrefix = "${rootDoc.space}.%")
5		-
6	6	## ----------------------------
7	7	## 1. Получаем Ontology Elements
8	8	## ----------------------------
...	...	@@ -16,9 +16,7 @@
16	16	and doc.fullName <> :rootDocFullName
17	17	and doc.fullName like :fullNamePrefix
18	18	order by doc.fullName")
19		-
20	20	#set($elementRows = $services.query.hql($hqlElements).bindValue('rootDocFullName', $rootDocFullName).bindValue('fullNamePrefix', $fullNamePrefix).execute())
21		-
22	22	## ---------------------------
23	23	## 2. Получаем термины глоссария
24	24	## ----------------------------
...	...	@@ -32,12 +32,10 @@
32	32	order by doc.fullName")
33	33
34	34	#set($glossaryRows = $services.query.hql($hqlGlossary).execute())
35		-
36	36	## ---------------------------
37	37	## 3. Строим map глоссария по нормализованному title
38	38	## ----------------------------
39	39	#set($glossaryMap = {})
40		-
41	41	#foreach($row in $glossaryRows)
42	42	#set($glossaryFullName = $row[0])
43	43	#set($glossaryTitle = "$!row[1]")
...	...	@@ -53,7 +53,6 @@
53	53	#end
54	54	#end
55	55	#end
56		-
57	57	## ----------------------------
58	58	## 4. Ищем совпадения
59	59	## ----------------------------
...	...	@@ -81,7 +81,7 @@
81	81	#end
82	82	#end
83	83	#end
84		-
	78	+{{/velocity}}{{velocity output="true"}}
85	85	## ---------------------------
86	86	## 5. Выводим таблицу совпадений
87	87	## ----------------------------
...	...	@@ -89,7 +89,7 @@
89	89	<table class="wikitable" border="1">
90	90	<thead>
91	91	<tr>
92		- <th>Ontology elements</th>
	86	+ <th>ML elements</th>
93	93	<th>Glossary terms</th>
94	94	</tr>
95	95	</thead>