rulrich/pcs-website-test
1
0
Fork 0
mirror of https://git.bolliret.ch/pcs/pcs-website synced 2026-01-18 16:41:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue with not properly emptied variables in script

Browse source
This commit is contained in:
Reto Bollinger 2024-11-16 22:34:25 +01:00
parent 877d22564c
commit 589e337ded
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lektor/lektordata/project/content/termine/contents.lr
View file

@ -6,16 +6,16 @@ body:
| **Datum** | **Anlass** | **Zeit** | **Ort** | | **Datum** | **Anlass** | **Zeit** | **Ort** |
|-------|--------|------|-----| |-------|--------|------|-----|
| So. 8. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermantingn\n | | So. 8. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermatingen |
| Sa. 14. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermantingn\n | | Sa. 14. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermatingen |
| So. 15. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermantingn\n | | So. 15. Dezember 2024 | Pistolen Gangfisch Schiessen | | Ermatingen |
| Do. 2. Januar 2025 | 40. Appenzeller Luftpistolenmeisterschaft 2025 | | Restaurant Schwert Oberstammheim | | Do. 2. Januar 2025 | 40. Appenzeller Luftpistolenmeisterschaft 2025 | | |
| Do. 9. Januar 2025 | 40. Appenzeller Luftpistolenmeisterschaft 2025 | | Diessenhofen | | Do. 9. Januar 2025 | 40. Appenzeller Luftpistolenmeisterschaft 2025 | | |
| So. 12. Januar 2025 | Appenzeller Lupi Meisterschaft | | Alterswilen | | So. 12. Januar 2025 | Appenzeller Lupi Meisterschaft | | |
| Sa. 20. September 2025 | Schwaderlohschiessen | 13:00 | Ermantingn\n | | Sa. 20. September 2025 | Schwaderlohschiessen | 13:00 | |
| Di. 23. September 2025 | Schwaderlohschiessen | 17:00 | Unterstammheim | | Di. 23. September 2025 | Schwaderlohschiessen | 17:00 | |
| Sa. 27. September 2025 | Schwaderlohschiessen | | Unterstammheim | | Sa. 27. September 2025 | Schwaderlohschiessen | | |
| So. 28. September 2025 | Schwaderlohschiessen | | Ermantingn\n | | So. 28. September 2025 | Schwaderlohschiessen | | |
| Do. 23. August 2029 | Bezirkssommerschiessen | 18:00 | Unterstammheim | | Do. 23. August 2029 | Bezirkssommerschiessen | 18:00 | |
| Do. 30. August 2029 | Bezirkssommerschiessen | 18:00 | Unterstammheim | | Do. 30. August 2029 | Bezirkssommerschiessen | 18:00 | |

9
lektor/lektordata/scripts/calendar-fetcher.sh
View file

@ -31,9 +31,9 @@ echo "$ICS_DATA" | awk 'BEGIN{FS=":"}
/^END:VEVENT/{ /^END:VEVENT/{
gsub(/\r/, "", summary) gsub(/\r/, "", summary)
gsub(/\r/, "", location) gsub(/\r/, "", location)
if (dtstart == "") dtstart = "Kein Datum" if (dtstart == "") dtstart = "19700101T000000"
if (summary == "") summary = "Kein Titel" if (summary == "") summary = " "
if (location == "") location = "Kein Ort" if (location == "") location = " "
date_str = substr(dtstart, 1, 4) "-" substr(dtstart, 5, 2) "-" substr(dtstart, 7, 2) date_str = substr(dtstart, 1, 4) "-" substr(dtstart, 5, 2) "-" substr(dtstart, 7, 2)
cmd = "LC_ALL=de_DE.UTF-8 date -d \"" date_str "\" +%a" cmd = "LC_ALL=de_DE.UTF-8 date -d \"" date_str "\" +%a"
@ -52,6 +52,9 @@ echo "$ICS_DATA" | awk 'BEGIN{FS=":"}
wholeline=sprintf("%s | %s | %s | %s | %s |", orderstartdate, realstartdate, summarystring, starttime, location) wholeline=sprintf("%s | %s | %s | %s | %s |", orderstartdate, realstartdate, summarystring, starttime, location)
gsub(/\| 00:00 \|/, "| |", wholeline) gsub(/\| 00:00 \|/, "| |", wholeline)
print wholeline print wholeline
dtstart=""
summary=""
location=""
}' | awk -v today="$TODAY" 'substr($1,1,8) >= today' | sort | awk '{$1=""}1' | awk '{$1=$1}1' }' | awk -v today="$TODAY" 'substr($1,1,8) >= today' | sort | awk '{$1=""}1' | awk '{$1=$1}1'
echo "" echo ""