xml parsing update

consolving · Nov 30, 2022 · 29616d3 · 29616d3
1 parent 417184b
commit 29616d3
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 53 deletions.
diff --git a/autodns/auth.go b/autodns/auth.go
@@ -6,7 +6,7 @@ import (
 
 type Auth struct {
 	XMLName  xml.Name `xml:"auth"`
-	Text     string   `xml:",chardata"`
+	Chardata string   `xml:",chardata"`
 	User     string   `xml:"user"`
 	Password string   `xml:"password"`
 	Context  string   `xml:"context"`

diff --git a/autodns/owner.go b/autodns/owner.go
@@ -3,8 +3,8 @@ package autodns
 import "encoding/xml"
 
 type Owner struct {
-	XMLName xml.Name `xml:"owner"`
-	Text    string   `xml:",chardata"`
-	User    string   `xml:"user"`
-	Context string   `xml:"context"`
+	XMLName  xml.Name `xml:"owner"`
+	Chardata string   `xml:",chardata"`
+	User     string   `xml:"user"`
+	Context  string   `xml:"context"`
 }
diff --git a/autodns/request.go b/autodns/request.go
@@ -7,7 +7,7 @@ import (
 
 type Request struct {
 	XMLName  xml.Name `xml:"request"`
-	Text     string   `xml:",chardata"`
+	Chardata string   `xml:",chardata"`
 	Auth     *Auth
 	Owner    *Owner
 	Language string `xml:"language"`

diff --git a/autodns/response.go b/autodns/response.go
@@ -3,20 +3,19 @@ package autodns
 import "encoding/xml"
 
 type Response struct {
-	XMLName xml.Name `xml:"response"`
-	Text    string   `xml:",chardata"`
-	Result  struct {
-		Text   string     `xml:",chardata"`
-		Data   *Data      `xml:"data"`
-		Status *Status    `xml:"status"`
-		Msg    []*Message `xml:"msg"`
+	XMLName  xml.Name `xml:"response"`
+	Chardata string   `xml:",chardata"`
+	Result   struct {
+		Chardata string     `xml:",chardata"`
+		Data     *Data      `xml:"data"`
+		Status   *Status    `xml:"status"`
+		Msg      []*Message `xml:"msg"`
 	} `xml:"result"`
 	StID string `xml:"stid"`
 }
 
 type Data struct {
 	Chardata string `xml:",chardata"`
-	Text     string `xml:",chardata"`
 	Zone     *Zone  `xml:"zone"`
 }
 
@@ -26,8 +25,8 @@ type Message struct {
 	Code     Code     `xml:"code"`
 	Type     string   `xml:"type"`
 	Object   struct {
-		Text  string `xml:",chardata"`
-		Type  string `xml:"type"`
-		Value string `xml:"value"`
+		Chardata string `xml:",chardata"`
+		Type     string `xml:"type"`
+		Value    string `xml:"value"`
 	} `xml:"object"`
 }
diff --git a/autodns/task.go b/autodns/task.go
@@ -5,18 +5,18 @@ import (
 )
 
 type Task struct {
-	XMLName xml.Name `xml:"task"`
-	Text    string   `xml:",chardata"`
-	Code    Code     `xml:"code"`
-	Default *Default `xml:"default"`
-	Key     *TaskKey `xml:"key,omitempty"`
-	Zone    *Zone    `xml:"zone"`
+	XMLName  xml.Name `xml:"task"`
+	Chardata string   `xml:",chardata"`
+	Code     Code     `xml:"code"`
+	Default  *Default `xml:"default"`
+	Key      *TaskKey `xml:"key,omitempty"`
+	Zone     *Zone    `xml:"zone"`
 }
 
 type TaskKey string
 
 type Default struct {
-	Text                  string            `xml:",chardata"`
+	Chardata              string            `xml:",chardata"`
 	Comment               *Comment          `xml:"comment"`
 	ResourceRecordAdds    []*ResourceRecord `xml:"rr_add"`
 	ResourceRecordRemoves []*ResourceRecord `xml:"rr_rem"`

diff --git a/autodns/zone.go b/autodns/zone.go
@@ -7,7 +7,7 @@ import (
 )
 
 type Zone struct {
-	Text              string             `xml:",chardata"`
+	Chardata          string             `xml:",chardata"`
 	Name              string             `xml:"name"`
 	Changed           *Changed           `xml:"changed"`
 	Created           *Created           `xml:"created"`
@@ -38,47 +38,47 @@ type NsGroup string
 type PurgeType string
 
 type User struct {
-	Text    string `xml:",chardata"`
-	User    string `xml:"user"`
-	Context string `xml:"context"`
+	Chardata string `xml:",chardata"`
+	User     string `xml:"user"`
+	Context  string `xml:"context"`
 }
 
 type Free struct {
-	XMLName xml.Name `xml:"free"`
-	Text    string   `xml:",chardata"`
+	XMLName  xml.Name `xml:"free"`
+	Chardata string   `xml:",chardata"`
 }
 
 type Main struct {
-	Text  string `xml:",chardata"`
-	Value string `xml:"value"`
-	Ttl   string `xml:"ttl"`
+	Chardata string `xml:",chardata"`
+	Value    string `xml:"value"`
+	Ttl      string `xml:"ttl"`
 }
 
 type Soa struct {
-	Text    string `xml:",chardata"`
-	Level   string `xml:"level,omitempty"`
-	Refresh string `xml:"refresh"`
-	Retry   string `xml:"retry"`
-	Expire  string `xml:"expire"`
-	Ttl     string `xml:"ttl"`
-	Email   string `xml:"email"`
-	Default string `xml:"default"`
+	Chardata string `xml:",chardata"`
+	Level    string `xml:"level,omitempty"`
+	Refresh  string `xml:"refresh"`
+	Retry    string `xml:"retry"`
+	Expire   string `xml:"expire"`
+	Ttl      string `xml:"ttl"`
+	Email    string `xml:"email"`
+	Default  string `xml:"default"`
 }
 
 type NameServer struct {
-	XMLName xml.Name `xml:"nserver"`
-	Text    string   `xml:",chardata"`
-	Name    string   `xml:"name"`
-	Ttl     string   `xml:"ttl,omitempty"`
+	XMLName  xml.Name `xml:"nserver"`
+	Chardata string   `xml:",chardata"`
+	Name     string   `xml:"name"`
+	Ttl      string   `xml:"ttl,omitempty"`
 }
 
 type ResourceRecord struct {
-	Text  string  `xml:",chardata"`
-	Name  string  `xml:"name"`
-	Ttl   string  `xml:"ttl"`
-	Type  *RRType `xml:"type"`
-	Pref  string  `xml:"pref,omitempty"`
-	Value string  `xml:"value"`
+	Chardata string  `xml:",chardata"`
+	Name     string  `xml:"name"`
+	Ttl      string  `xml:"ttl"`
+	Type     *RRType `xml:"type"`
+	Pref     string  `xml:"pref,omitempty"`
+	Value    string  `xml:"value"`
 }
 
 func NewZone(name string) (*Zone, error) {
@@ -92,8 +92,8 @@ func (zone *Zone) WithSystemNS(sysNameServer SystemNameServer) *Zone {
 	return zone
 }
 
-func (zone *Zone) WithFree(text string) *Zone {
-	free := &Free{Text: text}
+func (zone *Zone) WithFree(chardata string) *Zone {
+	free := &Free{Chardata: chardata}
 	zone.Free = append(zone.Free, free)
 	return zone
 }