Skip to content

add default value for xml2RPC #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ochinchina wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add default value for xml2RPC #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
361d721
add default value for xml2RPC
ochinchina Dec 12, 2016
abb6ae7
process error from method
Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions xml/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ func (c *CodecRequest) ReadRequest(args interface{}) error {
// it gets encoded into the XML-RPC xml string
func (c *CodecRequest) WriteResponse(w http.ResponseWriter, response interface{}, methodErr error) error {
var xmlstr string
if c.err == nil {
c.err = methodErr
}
if c.err != nil {
var fault Fault
switch c.err.(type) {
Expand Down
26 changes: 21 additions & 5 deletions xml/xml2rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,21 @@ func xml2RPC(xmlraw string, rpc interface{}) error {
}

// Structures should have equal number of fields
if reflect.TypeOf(rpc).Elem().NumField() != len(ret.Params) {
return FaultWrongArgumentsNumber
}
//if reflect.TypeOf(rpc).Elem().NumField() != len(ret.Params) {
// return FaultWrongArgumentsNumber
//}

// Now, convert temporal structure into the
// passed rpc variable, according to it's structure
for i, param := range ret.Params {
fieldNum := reflect.TypeOf(rpc).Elem().NumField()
//for i, param := range ret.Params {
for i:= 0; i < fieldNum; i += 1 {
field := reflect.ValueOf(rpc).Elem().Field(i)
err = value2Field(param.Value, &field)
if len(ret.Params) > i {
err = value2Field(ret.Params[i].Value, &field)
} else if reflect.TypeOf( rpc ).Elem().Field(i).Tag.Get("default") != "" {
err = value2Field( createValue( reflect.TypeOf(rpc).Elem().Field(i).Type.Kind(), reflect.TypeOf( rpc ).Elem().Field(i).Tag.Get("default")), &field)
}
if err != nil {
return err
}
Expand All @@ -80,6 +86,16 @@ func xml2RPC(xmlraw string, rpc interface{}) error {
return nil
}

func createValue( kind reflect.Kind, val string ) value {
v := value{}
if kind == reflect.Bool {
v.Boolean = val
} else if kind == reflect.Int {
v.Int = val
}
return v
}

// getFaultResponse converts faultValue to Fault.
func getFaultResponse(fault faultValue) Fault {
var (
Expand Down