ISOWeek -7 => date -d -7days +%G-%V

2026-04-24 12:05:02 +02:00
parent 580a54e11c
commit 5c492f55ff
20 changed files with 17 additions and 71 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ VRT/metadata
 VRT/vrt
 bin/data2json
 bin/dates2json
-bin/ISOWeek
 bin/flush
 bin/items2count
 bin/score
--- a/AT5/txt2corpus.sh
+++ b/AT5/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/GG/txt2corpus.sh
+++ b/GG/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/LitNL/txt2corpus.sh
+++ b/LitNL/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/4
+++ b/4
@@ -16,7 +16,6 @@ all:
 	make bin/data2json
 	make bin/dates2json
 	make bin/flush
-	make bin/ISOWeek
 	make bin/items2count
 	make bin/score
 	make bin/top20
@@ -31,9 +30,6 @@ bin/dates2json: cmd/dates2json/*.go
 bin/flush: cmd/flush/*.go
 	go build -o $@ $^

-bin/ISOWeek: cmd/ISOWeek/*.go
-	go build -o $@ $^
-
 bin/items2count: cmd/items2count/*.go
 	go build -o $@ $^

--- a/NOS/txt2corpus.sh
+++ b/NOS/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/NU/txt2corpus.sh
+++ b/NU/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/Oog/txt2corpus.sh
+++ b/Oog/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/RO/txt2corpus.sh
+++ b/RO/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/RTVNoord/txt2corpus.sh
+++ b/RTVNoord/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/Sargasso/txt2corpus.sh
+++ b/Sargasso/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/Sikkom/txt2corpus.sh
+++ b/Sikkom/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/Tzum/txt2corpus.sh
+++ b/Tzum/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/VRT/txt2corpus.sh
+++ b/VRT/txt2corpus.sh
@@ -9,7 +9,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/cmd/ISOWeek/ISOWeek.go
+++ b/cmd/ISOWeek/ISOWeek.go
@@ -1,48 +0,0 @@
-package main
-
-/*
-
-Waarom?
-
-We willen year-week, bijvoorbeeld 2025-52
-
-Als de datum 1 januari 2027 is, dan geeft dit:
-
-    date +%Y-%V
-
-... dit:
-
-    2027-53
-
-Dat is fout. Het moet zijn:
-
-    2026-53
-
-Dit programma geeft wel de juiste uitvoer.
-
-*/
-
-import (
-	e "codeberg.org/pebbe/errors"
-
-	"fmt"
-	"os"
-	"strconv"
-	"time"
-)
-
-var (
-	x = e.ExitErr
-)
-
-func main() {
-	// arg 1: aantal dagen opgeteld bij huidige datum
-	d, err := strconv.Atoi(os.Args[1])
-	x(err)
-
-	location, err := time.LoadLocation("Europe/Amsterdam")
-	x(err)
-
-	year, week := time.Now().AddDate(0, 0, d).In(location).ISOWeek()
-	fmt.Printf("%d-%02d\n", year, week)
-}
--- a/cmd/dates2json/dates2json.go
+++ b/cmd/dates2json/dates2json.go
@@ -26,7 +26,7 @@ var (

 func main() {

-	files, err := os.ReadDir("/net/corpora/nlnieuws/data")
+	files, err := os.ReadDir("/net/corpora/nlnieuws/data/json")
 	x(err)

 	for _, file := range files {
--- a/collect.sh
+++ b/collect.sh
@@ -155,6 +155,6 @@ do
    done
 done

-data2json $ds 1 > DATA-$ds-1.json
-data2json $ds 4 > DATA-$ds-4.json
+data2json $ds 1 > json/DATA-$ds-1.json
+data2json $ds 4 > json/DATA-$ds-4.json

--- a/www/app.html
+++ b/www/app.html
@@ -13,7 +13,6 @@
  <body>
    <div class="title">
      <h1>Woord van de maand</h1>
-      <p>terugkijkend over vier weken</p>
    </div>
    <div class="form">
      <form name="choice">
--- a/www/gettags.sh
+++ b/www/gettags.sh
@@ -13,7 +13,7 @@ fi

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])
--- a/xquery/collect.sh.oud
+++ b/xquery/collect.sh.oud
@@ -8,7 +8,7 @@ export TZ=Europe/Amsterdam

 if [ "$1" = "" ]
 then
-    ds=`ISOWeek -7`
+    ds=`date -d -7days +%G-%V`
 else
    case "$1" in
        2[0-9][0-9][0-9]-[0-5][0-9])