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,21 +23,30 @@ func main() {
 	suffix := m[3] + ".t20"
 	target := infile + ".t20"
 
-	x(os.Chdir("/net/corpora/nlnieuws/data"))
+	dirs, err := os.ReadDir("..")
-
-	files, err := os.ReadDir(".")
 	x(err)
-	for _, file := range files {
+	for _, dir := range dirs {
-		name := file.Name()
+		if !dir.IsDir() {
-		if strings.HasPrefix(name, prefix) && strings.HasSuffix(name, suffix) && name < target {
+			continue
-			fp, err := os.Open(name)
+		}
-			x(err)
+		dirname := dir.Name()
-			scanner := bufio.NewScanner(fp)
+		if dirname[0] != '2' {
-			for scanner.Scan() {
+			continue
-				seen[strings.Split(scanner.Text(), "\t")[1]] = true
+		}
+		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("../" + dirname + "/" + name)
+				x(err)
+				scanner := bufio.NewScanner(fp)
+				for scanner.Scan() {
+					seen[strings.Split(scanner.Text(), "\t")[1]] = true
+				}
+				x(scanner.Err())
+				x(fp.Close())
 			}
-			x(scanner.Err())
-			x(fp.Close())
 		}
 	}