Fix: Fix Version, Fix GetList

Author: sp

_examples/getExamples.go

@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	px "github.com/pitwch/go-wrapper-proffix-restapi/proffixrest"
 	"log"
 	"net/url"
+
+	px "github.com/pitwch/go-wrapper-proffix-restapi/proffixrest"
 )
 
-//Put Client in Function
+// Put Client in Function
 func Connect() (pxrest *px.Client, err error) {
 
 	//Use PROFFIX Demo Logins as Example

proffixrest/client.go

@@ -14,7 +14,7 @@ import (
 
 // Version of Wrapper
 const (
-	Version = "1.13.20"
+	Version = "1.13.22"
 )
 
 // DefaultHTTPTransport is an http.RoundTripper that has DisableKeepAlives set true.
@@ -70,7 +70,7 @@ func NewClient(RestURL string, apiUser string, apiPassword string, apiDatabase s
 
 	// Default to v3
 	if options.Version == "" {
-		options.Version = "v3"
+		options.Version = "v4"
 	}
 
 	if options.APIPrefix == "" {

proffixrest/client_test.go

@@ -8,15 +8,20 @@ import (
 	"testing"
 )
 
-//Define struct (AdressNr as string just for convenience)
+// Define struct (AdressNr as string just for convenience)
 type Adresse struct {
 	AdressNr string `json:"AdressNr,omitempty"`
 	Name     string `json:"Name,omitempty"`
 	Ort      string `json:"Ort,omitempty"`
 	PLZ      string `json:"PLZ,omitempty"`
+	Land     Land   `json:"Land,omitempty"`
 }
 
-//Connect function
+type Land struct {
+	LandNr string `json:"LandNr,omitempty"`
+}
+
+// Connect function
 func ConnectTest(modules []string) (pxrest *Client, err error) {
 
 	//Use PROFFIX Public Demo Login as Example (REMOVED - As offical demo often is outdated)
@@ -46,7 +51,7 @@ func ConnectTest(modules []string) (pxrest *Client, err error) {
 	return pxrest, err
 }
 
-//Helper function for checking if is type Options
+// Helper function for checking if is type Options
 func isOption(t interface{}) bool {
 	switch t.(type) {
 	case Options:
@@ -56,7 +61,7 @@ func isOption(t interface{}) bool {
 	}
 }
 
-//Helper function for checking if is type Client
+// Helper function for checking if is type Client
 func isClient(t interface{}) bool {
 	switch t.(type) {
 	case Client:
@@ -66,7 +71,7 @@ func isClient(t interface{}) bool {
 	}
 }
 
-//Test all Requests in one Session
+// Test all Requests in one Session
 func TestClient_Requests(t *testing.T) {
 
 	//New Context
@@ -75,7 +80,7 @@ func TestClient_Requests(t *testing.T) {
 	//POST TESTs
 
 	//Fill struct with Demo Data
-	var data = Adresse{Name: "Muster GmbH", Ort: "Zürich", PLZ: "8000"}
+	var data = Adresse{Name: "Muster GmbH", Ort: "Zürich", PLZ: "8000", Land: Land{LandNr: "CH"}}
 
 	//Connect
 	pxrest, _ := ConnectTest([]string{"VOL"})
@@ -206,7 +211,7 @@ func TestClient_Requests(t *testing.T) {
 
 }
 
-//Test all Requests in one Session
+// Test all Requests in one Session
 func TestClient_AdvancedFilters(t *testing.T) {
 
 	//New Context
@@ -277,7 +282,7 @@ func TestClient_AdvancedFilters(t *testing.T) {
 
 }
 
-//Test Get Database with Key from Options
+// Test Get Database with Key from Options
 func TestGetDatabase(t *testing.T) {
 
 	//New Context
@@ -318,7 +323,7 @@ func TestGetDatabase(t *testing.T) {
 	}
 }
 
-//Test Get Info with Key set in Function
+// Test Get Info with Key set in Function
 func TestGetInfo(t *testing.T) {
 
 	//New Context
@@ -352,7 +357,7 @@ func TestGetInfo(t *testing.T) {
 
 }
 
-//Check structs
+// Check structs
 func TestStructs(t *testing.T) {
 
 	//New Context

proffixrest/list.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	"strconv"
-	"strings"
 )
 
 func (c *Client) GetList(ctx context.Context, listenr int, body interface{}) (io.ReadCloser, http.Header, int, error) {
@@ -24,17 +23,14 @@ func (c *Client) GetList(ctx context.Context, listenr int, body interface{}) (io
 	//If Log enabled log URL
 	logDebug(ctx, c, fmt.Sprintf("Got Download URL from PROFFIX REST-API: %v, PxSession-ID: %v", downloadLocation, PxSessionId))
 
-	//Remove Path from Response -> replace with empty string
-	cleanLocation := strings.Replace(downloadLocation, c.restURL.String(), "", -1)
-
-	downloadFile, headersDownload, statusDownload, err := c.Get(ctx, cleanLocation, nil)
+	downloadFile, headersDownload, statusDownload, err := c.Get(ctx, downloadLocation, nil)
 
 	if headersDownload == nil {
 		headersDownload = http.Header{}
 	}
 
 	//If Log enabled log URL
-	logDebug(ctx, c, fmt.Sprintf("Downloaded File from '%v' with Content-Length: %v, PxSession-ID: %v", cleanLocation, headersDownload.Get("Content-Length"), PxSessionId))
+	logDebug(ctx, c, fmt.Sprintf("Downloaded File from '%v' with Content-Length: %v, PxSession-ID: %v", downloadLocation, headersDownload.Get("Content-Length"), PxSessionId))
 
 	return downloadFile, headersDownload, statusDownload, err