Skip to content

Commit 5988a38

Browse files
skinkiegithub-actions[bot]
skinkie
and
github-actions[bot]
authored
validate and lint update (#170)
* validate and lint update * Temporary add it * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 38e687f commit 5988a38

File tree

6 files changed

+1381
-1358
lines changed

6 files changed

+1381
-1358
lines changed

‎.github/scripts/validate-and-lint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ while IFS= read -r -d $'\0' filename; do
1616
continue # Skip files inside the .git directory
1717
fi
1818
# Prettify the file using xmllint and save the result to ${filename}.pretty
19-
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
19+
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --format --pretty 1 "${filename}" >"${filename}.pretty"; then
2020
# Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
2121
grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
2222
else
@@ -25,7 +25,7 @@ while IFS= read -r -d $'\0' filename; do
2525
fi
2626
# Remove temp file
2727
rm "${filename}.pretty"
28-
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -not -path "./git" -print0)
28+
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -not -path "./.git/*" -print0)
2929

3030
if [ ${PARSING_ERROR} -ne 0 ]; then
3131
exit ${PARSING_ERROR}

‎docs/generate-tables.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ cd ${xsl_dir}
2828
java -cp /tmp/basex.jar org.basex.BaseX -b report=contab -b dir=${xsd_dir} -b odir=${generated_dir} -b custom=custom-ojp.xml -b dnamesExcluded=".git .github" xcore.xq
2929
rm -fr "${generated_dir}"/edesc
3030

31-
echo -e '\033[0;32mFinished generating documentation tables\033[0m'
31+
echo -e '\033[0;32mFinished generating documentation tables\033[0m'

‎docs/generated/contab/acsb.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
248248
</td>
249249
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
250250
<p class="tableblock">
251-
<em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
251+
<em>+<a shape="rect" href="#local-type.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
252252
</em>
253253
</p>
254254
</td>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
272272
</td>
273273
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
274274
<p class="tableblock">
275-
<em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
275+
<em>+<a shape="rect" href="#local-type.typedef-25.2" title="local-type: typedef-25.2">local-type: typedef-25.2</a>
276276
</em>
277277
</p>
278278
</td>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
297297
</td>
298298
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
299299
<p class="tableblock">
300-
<em>+<a shape="rect" href="#local-type.typedef-71.1" title="local-type: typedef-71.1">local-type: typedef-71.1</a>
300+
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
301301
</em>
302302
</p>
303303
</td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
544544
</td>
545545
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
546546
<p class="tableblock">
547-
<em>+<a shape="rect" href="#local-type.typedef-71.1" title="local-type: typedef-71.1">local-type: typedef-71.1</a>
547+
<em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
548548
</em>
549549
</p>
550550
</td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
589589
</table>
590590
</div>
591591
</div>
592-
<div class="sect2" id="local-type.typedef-27.1">
593-
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-27.1)</code>
592+
<div class="sect2" id="local-type.typedef-25.1">
593+
<h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1)</code>
594594
</h3>
595595
<div class="sectionbody">
596596
<table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
610610
<br/>
611611
<code>  /Limitations #complexType</code>
612612
<br/>
613-
<code>  (typedef-27.1)</code>
613+
<code>  (typedef-25.1)</code>
614614
</p>
615615
</td>
616616
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
652652
</table>
653653
</div>
654654
</div>
655-
<div class="sect2" id="local-type.typedef-27.2">
656-
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-27.2)</code>
655+
<div class="sect2" id="local-type.typedef-25.2">
656+
<h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2)</code>
657657
</h3>
658658
<div class="sectionbody">
659659
<table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
673673
<br/>
674674
<code>  /Suitabilities #complexType</code>
675675
<br/>
676-
<code>  (typedef-27.2)</code>
676+
<code>  (typedef-25.2)</code>
677677
</p>
678678
</td>
679679
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
715715
</table>
716716
</div>
717717
</div>
718-
<div class="sect2" id="local-type.typedef-71.1">
719-
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-71.1)</code>
718+
<div class="sect2" id="local-type.typedef-8.1">
719+
<h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
720720
</h3>
721721
<div class="sectionbody">
722722
<table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-7
736736
<br/>
737737
<code>  #complexType</code>
738738
<br/>
739-
<code>  (typedef-71.1)</code>
739+
<code>  (typedef-8.1)</code>
740740
</p>
741741
</td>
742742
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-7
752752
</table>
753753
</div>
754754
</div>
755-
<div class="sect2" id="local-type.typedef-71.1">
756-
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-71.1)</code>
755+
<div class="sect2" id="local-type.typedef-8.1">
756+
<h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-8.1)</code>
757757
</h3>
758758
<div class="sectionbody">
759759
<table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-7
773773
<br/>
774774
<code>  #complexType</code>
775775
<br/>
776-
<code>  (typedef-71.1)</code>
776+
<code>  (typedef-8.1)</code>
777777
</p>
778778
</td>
779779
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <h3>3.1. Simple type definitions</h3>
16721672
</tr>
16731673
<tr>
16741674
<td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
1675-
<p id="local-type.typedef-25.1" class="tableblock">
1675+
<p id="local-type.typedef-27.1" class="tableblock">
16761676
<code>group[acsb:UserNeedGroup]</code>
16771677
<br/>
16781678
<code>  /MedicalNeed #simpleType</code>
16791679
<br/>
1680-
<code>  (typedef-25.1)</code>
1680+
<code>  (typedef-27.1)</code>
16811681
</p>
16821682
</td>
16831683
<td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
18441844
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
18451845
<p class="tableblock">
18461846
<em>
1847-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
1847+
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
18481848
</em>
18491849
</p>
18501850
</td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
21732173
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
21742174
<p class="tableblock">
21752175
<em>
2176-
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-25.1" title="local-type: typedef-25.1">local-type: typedef-25.1</a>
2176+
<a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
21772177
</em>
21782178
</p>
21792179
</td>

‎docs/generated/contab/datex2.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
107112107112
</td>
107113107113
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
107114107114
<p class="tableblock">
107115-
<em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
107115+
<em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
107116107116
</em>
107117107117
</p>
107118107118
</td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
111020111020
</td>
111021111021
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
111022111022
<p class="tableblock">
111023-
<em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
111023+
<em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
111024111024
</em>
111025111025
</p>
111026111026
</td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
111865111865
</td>
111866111866
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
111867111867
<p class="tableblock">
111868-
<em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
111868+
<em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
111869111869
</em>
111870111870
</p>
111871111871
</td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
127573127573
</td>
127574127574
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
127575127575
<p class="tableblock">
127576-
<em>+<a shape="rect" href="#local-type.typedef-59.4" title="local-type: typedef-59.4">local-type: typedef-59.4</a>
127576+
<em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
127577127577
</em>
127578127578
</p>
127579127579
</td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
145442145442
</table>
145443145443
</div>
145444145444
</div>
145445-
<div class="sect2" id="local-type.typedef-59.1">
145446-
<h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-59.1)</code>
145445+
<div class="sect2" id="local-type.typedef-23.1">
145446+
<h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-23.1)</code>
145447145447
</h3>
145448145448
<div class="sectionbody">
145449145449
<table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
145463145463
<br/>
145464145464
<code>  /locationContainedInItinerary #complexType</code>
145465145465
<br/>
145466-
<code>  (typedef-59.1)</code>
145466+
<code>  (typedef-23.1)</code>
145467145467
</p>
145468145468
</td>
145469145469
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
145588145588
</table>
145589145589
</div>
145590145590
</div>
145591-
<div class="sect2" id="local-type.typedef-59.2">
145592-
<h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-59.2)</code>
145591+
<div class="sect2" id="local-type.typedef-23.2">
145592+
<h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-23.2)</code>
145593145593
</h3>
145594145594
<div class="sectionbody">
145595145595
<table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
145609145609
<br/>
145610145610
<code>  /measurementSpecificCharacteristics #complexType</code>
145611145611
<br/>
145612-
<code>  (typedef-59.2)</code>
145612+
<code>  (typedef-23.2)</code>
145613145613
</p>
145614145614
</td>
145615145615
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
145839145839
</table>
145840145840
</div>
145841145841
</div>
145842-
<div class="sect2" id="local-type.typedef-59.3">
145843-
<h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-59.3)</code>
145842+
<div class="sect2" id="local-type.typedef-23.3">
145843+
<h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-23.3)</code>
145844145844
</h3>
145845145845
<div class="sectionbody">
145846145846
<table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
145860145860
<br/>
145861145861
<code>  /values #complexType</code>
145862145862
<br/>
145863-
<code>  (typedef-59.3)</code>
145863+
<code>  (typedef-23.3)</code>
145864145864
</p>
145865145865
</td>
145866145866
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
145902145902
</table>
145903145903
</div>
145904145904
</div>
145905-
<div class="sect2" id="local-type.typedef-59.4">
145906-
<h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-59.4)</code>
145905+
<div class="sect2" id="local-type.typedef-23.4">
145906+
<h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-23.4)</code>
145907145907
</h3>
145908145908
<div class="sectionbody">
145909145909
<table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
145923145923
<br/>
145924145924
<code>  /measuredValue #complexType</code>
145925145925
<br/>
145926-
<code>  (typedef-59.4)</code>
145926+
<code>  (typedef-23.4)</code>
145927145927
</p>
145928145928
</td>
145929145929
<td colspan="1" rowspan="1" class="tableblock halign-left valign-top">

0 commit comments

Comments
 (0)