Add Submitter record parsing and serialization.

Author: jochenboesmans

gedcom/gedcom.pb.go

@@ -7,6 +7,7 @@ message Gedcom {
     HeaderType Header = 1;
     repeated Individual Individuals = 2;
     repeated Family Families = 3;
+    repeated Submitter Submitters = 4;
 
     message HeaderType {
         string Source = 1;
@@ -50,5 +51,10 @@ message Gedcom {
         string MotherId = 3;
         repeated string ChildIds = 4;
     }
+
+    message Submitter {
+       string Id = 1;
+       string Name = 2;
+    }
 }
 

gedcom/gedcom.proto

@@ -70,7 +70,7 @@ func (g *ConcurrencySafeGedcom) InterpretHeader(headerLines []*Line) error {
 //
 // * SOURCE_RECORD (SOUR)
 //
-// * SUBMITTER_RECORD (SUBN)
+// * SUBMITTER_RECORD (SUBM)
 //
 func (g *ConcurrencySafeGedcom) InterpretRecord(recordLines []*Line, waitGroup *sync.WaitGroup) {
 	tag, err := recordLines[0].Tag()
@@ -90,8 +90,8 @@ func (g *ConcurrencySafeGedcom) InterpretRecord(recordLines []*Line, waitGroup *
 		// TODO
 	case "SOUR":
 		// TODO
-	case "SUBN":
-		// TODO
+	case "SUBM":
+		g.interpretSubmitterRecord(recordLines)
 	}
 	waitGroup.Done()
 }
@@ -207,6 +207,39 @@ func (g *ConcurrencySafeGedcom) interpretFamilyRecord(recordLines []*Line) {
 	g.unlock()
 }
 
+func (g *ConcurrencySafeGedcom) interpretSubmitterRecord(recordLines []*Line) {
+	xRefID := recordLines[0].XRefID()
+	submitterInstance := Gedcom_Submitter{
+		Id: xRefID,
+	}
+	rootLevel, err := recordLines[0].Level()
+	if err != nil {
+		return
+	}
+	for _, line := range recordLines[1:] {
+		level, err := line.Level()
+		if err != nil {
+			continue
+		}
+		if level <= rootLevel {
+			break // end of record
+		}
+
+		tag, err := line.Tag()
+		if err != nil {
+			continue
+		}
+		switch tag {
+		case "NAME":
+			submitterInstance.Name = line.Value()
+		}
+	}
+	g.lock()
+	g.Gedcom.Submitters = append(g.Gedcom.Submitters, &submitterInstance)
+	g.unlock()
+
+}
+
 func logError(firstLine *Line, structureKind string, err error) {
 	l, toStringErr := firstLine.ToString()
 	if toStringErr != nil {

gedcom/interpret.go

@@ -192,6 +192,24 @@ func (g *ConcurrencySafeGedcom) ToSerializedGedcom() (*bytes.Buffer, error) {
 		}
 	}
 
+	submitterLevel := rootLevel
+	for _, submitter := range g.Submitters {
+		err := createAndWriteLine(submitterLevel, submitter.Id, "SUBM", "", &lineCounter, buf)
+		if err != nil {
+			log.Println(err)
+			continue
+		}
+
+		if submitter.Name != "" {
+			nameLevel := submitterLevel + 1
+			err := createAndWriteLine(nameLevel, "", "NAME", submitter.Name, &lineCounter, buf)
+			if err != nil {
+				log.Println(err)
+				continue
+			}
+		}
+	}
+
 	err = createAndWriteLine(rootLevel, "", "TRLR", "", &lineCounter, buf)
 	if err != nil {
 		log.Println(err)

gedcom/serialize.go

@@ -8,5 +8,6 @@ require (
 	github.com/joho/godotenv v1.3.0
 	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
 	google.golang.org/grpc v1.32.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect
 	google.golang.org/protobuf v1.25.0
 )

go.mod

@@ -80,6 +80,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=