add -B best effort flag, newline handling

1 files changed, 8 insertions, 1 deletions

diff --git a/skate/cmd/skate-resolve-journal-name/main.go b/skate/cmd/skate-resolve-journal-name/main.go
index 7f4b53d..2351730 100644
--- a/skate/cmd/skate-resolve-journal-name/main.go
+++ b/skate/cmd/skate-resolve-journal-name/main.go
@@ -50,7 +50,11 @@ func main() {
 			return nil, fmt.Errorf("column mismatch")
 		}
 		if err = json.Unmarshal(fields[*column-1], &release); err != nil {
-			return nil, err
+			if *bestEffort {
+				log.Printf("failed to unmarshal: %v", string(p))
+			} else {
+				return nil, err
+			}
 		}
 		name := strings.ToLower(release.ContainerName)
 		results := ms.Lookup(name, -1)
@@ -68,6 +72,9 @@ func main() {
 		if err != nil {
 			return nil, err
 		}
+		if len(fields) == *column {
+			b = append(b, []byte("\n")...)
+		}
 		fields[*column-1] = b
 		return bytes.Join(fields, []byte(*sep)), nil
 	})