... |
... |
@@ -1,69 +1,80 @@ |
1 |
|
-{{groovy bindings="tags"}} |
|
1 |
+{{groovy}} |
|
2 |
+def binding = binding |
|
3 |
+def tags = binding.getVariable('tags') |
|
4 |
+def max = binding.getVariable('max') |
|
5 |
+ |
2 |
2 |
def includeTags = tags?.split(',')*.trim()*.toLowerCase().findAll { it } |
3 |
|
-def maxCount = 100 |
|
7 |
+def maxCount = max?.toInteger() ?: 999 |
4 |
4 |
|
5 |
|
-def hql = """ |
6 |
|
- select doc.fullName |
7 |
|
- from XWikiDocument doc, BaseObject obj |
8 |
|
- where obj.name = doc.fullName |
9 |
|
- and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass' |
10 |
|
- order by doc.date desc |
11 |
|
-""" |
12 |
12 |
|
13 |
|
-def docs = xwiki.search(hql, maxCount, 0) |
14 |
|
-def results = [] |
|
10 |
+ def hql = """ |
|
11 |
+ select doc.fullName |
|
12 |
+ from XWikiDocument doc, BaseObject obj |
|
13 |
+ where obj.name = doc.fullName |
|
14 |
+ and obj.className = 'Main Categories.Anti White Incidents.Code.MoviesClass' |
|
15 |
+ order by doc.date desc |
|
16 |
+ """ |
15 |
15 |
|
16 |
|
-docs.each { docName -> |
17 |
|
- def doc = xwiki.getDocument(docName) |
18 |
|
- def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass") |
19 |
|
- if (!obj) return |
|
18 |
+ def docs = xwiki.search(hql, maxCount, 0) |
|
19 |
+ def results = [] |
20 |
20 |
|
21 |
|
- def title = obj.getProperty("shortText1")?.value?.toString()?.trim() |
22 |
|
- def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim() |
23 |
|
- def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim() |
24 |
|
- def tagList = obj.getProperty("tags")?.value |
|
21 |
+ docs.each { docName -> |
|
22 |
+ if (results.size() >= maxCount) return |
25 |
25 |
|
26 |
|
- if (!title || !summary) return |
|
24 |
+ def doc = xwiki.getDocument(docName) |
|
25 |
+ def obj = doc.getObject("Main Categories.Anti White Incidents.Code.MoviesClass") |
|
26 |
+ if (!obj) return |
27 |
27 |
|
28 |
|
- if (includeTags && tagList) { |
29 |
|
- def docTags = tagList.collect { it.toString().toLowerCase() } |
30 |
|
- if (!docTags.any { includeTags.contains(it) }) return |
31 |
|
- } |
|
28 |
+ def title = obj.getProperty("shortText1")?.value?.toString()?.trim() |
|
29 |
+ def summary = obj.getProperty("shortText2")?.value?.toString()?.trim() ?: obj.getProperty("longText1")?.value?.toString()?.trim() |
|
30 |
+ def externalURL = obj.getProperty("longText2")?.value?.toString()?.trim() |
|
31 |
+ def tagList = obj.getProperty("tags")?.value |
32 |
32 |
|
33 |
|
- def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://") |
34 |
|
- def linkTarget = isValidURL ? externalURL : "doc:${docName}" |
35 |
|
- def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B') |
|
33 |
+ if (!title || !summary) return |
36 |
36 |
|
37 |
|
- def imageFile = doc.getAttachmentList()?.find { |
38 |
|
- it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)") |
39 |
|
- }?.filename |
|
35 |
+ if (includeTags && tagList) { |
|
36 |
+ def tagNames = tagList.collect { it.toString().toLowerCase() } |
|
37 |
+ if (!tagNames.any { includeTags.contains(it) }) return |
|
38 |
+ } |
40 |
40 |
|
41 |
|
- def imageMarkup = "" |
42 |
|
- if (imageFile) { |
43 |
|
- imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]" |
44 |
|
- } |
|
40 |
+ def isValidURL = externalURL?.startsWith("http://") || externalURL?.startsWith("https://") |
|
41 |
+ def linkTarget = isValidURL ? externalURL : "doc:${docName}" |
|
42 |
+ def safeTitle = title.replaceAll(/[\[\]\|]/, '').replaceAll(/\>\>/, '>>\u200B') |
45 |
45 |
|
46 |
|
- def block = """ |
47 |
|
- (% style="margin-bottom:20px; width:100%" %) |
48 |
|
- |${imageMarkup}| |
|
44 |
+ def imageFile = doc.getAttachmentList()?.find { |
|
45 |
+ it.filename.toLowerCase().matches(".*\\.(png|jpg|jpeg|gif)") |
|
46 |
+ }?.filename |
49 |
49 |
|
50 |
|
- === [[${safeTitle}>>${linkTarget}]] === |
|
48 |
+ def imageMarkup = "" |
|
49 |
+ if (imageFile) { |
|
50 |
+ imageMarkup = "[[image:${doc.fullName}@${imageFile}||alt=\"Image\" data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]" |
|
51 |
+ } |
51 |
51 |
|
52 |
|
- ${summary} |
53 |
|
- [[Read More>>${linkTarget}]] |
54 |
|
- """.trim() |
|
53 |
+ def block = """ |
|
54 |
+ (% style="margin-bottom:20px; width:100%" %) |
|
55 |
+ |${imageMarkup}| |
55 |
55 |
|
56 |
|
- results << block |
57 |
|
-} |
|
57 |
+ === [[${safeTitle}>>${linkTarget}]] === |
58 |
58 |
|
59 |
|
-if (results.isEmpty()) { |
60 |
|
- if (includeTags) { |
61 |
|
- println "⚠️ No incidents found with selected tag(s): ${tags}" |
|
59 |
+ ${summary} |
|
60 |
+ [[Read More>>${linkTarget}]] |
|
61 |
+ """.trim() |
|
62 |
+ |
|
63 |
+ results << block |
|
64 |
+ } |
|
65 |
+ |
|
66 |
+ if (results.isEmpty()) { |
|
67 |
+ if (includeTags) { |
|
68 |
+ println "⚠️ No incidents found for tags: ${tags}" |
|
69 |
+ } else { |
|
70 |
+ println "⚠️ No incidents to display." |
|
71 |
+ } |
62 |
62 |
} else { |
63 |
|
- println "⚠️ No incidents to display." |
|
73 |
+ println results.join("\n\n") |
64 |
64 |
} |
65 |
|
-} else { |
66 |
|
- println results.join("\n\n") |
67 |
67 |
} |
|
76 |
+ |
|
77 |
+// ✅ This is the actual macro parameter call |
|
78 |
+render(tags, max) |
68 |
68 |
{{/groovy}} |
69 |
69 |
|