top20.go: aangepast aan grote reorganisatie

cmd/top20/top20.go

@@ -11,7 +11,7 @@ import (
 
 var (
 	x      = e.ExitErr
-	reFile = regexp.MustCompile(`(.*)(2[0-9][0-9][0-9]-[0-5][0-9])(.*)`)
+	reFile = regexp.MustCompile(`(.*)(2[0-9][0-9][0-9]\.[0-5][0-9])(.*)`)
 	seen   = make(map[string]bool)
 )
 
@@ -23,14 +23,22 @@ func main() {
 	suffix := m[3] + ".t20"
 	target := infile + ".t20"
 
-	x(os.Chdir("/net/corpora/nlnieuws/data"))
+	dirs, err := os.ReadDir("..")
-
+	x(err)
-	files, err := os.ReadDir(".")
+	for _, dir := range dirs {
+		if !dir.IsDir() {
+			continue
+		}
+		dirname := dir.Name()
+		if dirname[0] != '2' {
+			continue
+		}
+		files, err := os.ReadDir("../" + dirname)
 		x(err)
 		for _, file := range files {
 			name := file.Name()
 			if strings.HasPrefix(name, prefix) && strings.HasSuffix(name, suffix) && name < target {
-			fp, err := os.Open(name)
+				fp, err := os.Open("../" + dirname + "/" + name)
 				x(err)
 				scanner := bufio.NewScanner(fp)
 				for scanner.Scan() {
@@ -40,6 +48,7 @@ func main() {
 				x(fp.Close())
 			}
 		}
+	}
 
 	fpin, err := os.Open(infile)
 	x(err)