working commit
This commit is contained in:
+3
-3
@@ -239,10 +239,10 @@ func (hand *Handler) DeleteCollection(rctx *router.Context) {
|
||||
params := &operator.DeleteColletionParams{
|
||||
Path: cpath,
|
||||
}
|
||||
err := rctx.BindQuery(params)
|
||||
err := rctx.BindQuery(params)
|
||||
if err != nil {
|
||||
hand.logg.Errorf("DeleteColletion binding error: %v", err)
|
||||
rctx.SetStatus(http.StatusInternalServerError)
|
||||
hand.logg.Errorf("DeleteColletion binding error: %v", err)
|
||||
rctx.SetStatus(http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -358,8 +358,8 @@ func (oper *Operator) ListCollections(ctx context.Context, operID string, param
|
||||
|
||||
// DeleteColletion
|
||||
type DeleteColletionParams struct {
|
||||
Path string
|
||||
IsPattern bool `params:"isPattern"`
|
||||
Path string
|
||||
IsPattern bool `params:"isPattern"`
|
||||
}
|
||||
type DeleteColletionResult struct {
|
||||
Files []descr.File `json:"collection,omitempty"`
|
||||
|
||||
@@ -428,9 +428,9 @@ func (util *FileUtil) listCollections(common *CommonFileParams, params *ListColl
|
||||
|
||||
// DeleteCollection
|
||||
type DeleteCollectionParams struct {
|
||||
Path string
|
||||
Detail bool
|
||||
Recursive bool
|
||||
Path string
|
||||
Detail bool
|
||||
Recursive bool
|
||||
}
|
||||
|
||||
type DeleteCollectionResult struct {
|
||||
|
||||
+6
-8
@@ -16,10 +16,10 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"net/url"
|
||||
|
||||
"mstore/app/descr"
|
||||
"mstore/pkg/auxhttp"
|
||||
@@ -336,13 +336,11 @@ func (cli *Client) DeleteCollection(ctx context.Context, catalogURI string, isPa
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
if isPattern {
|
||||
values := url.Values{}
|
||||
values.Add("isPattern","true")
|
||||
catalogURI = catalogURI + "?" + values.Encode()
|
||||
}
|
||||
|
||||
|
||||
if isPattern {
|
||||
values := url.Values{}
|
||||
values.Add("isPattern", "true")
|
||||
catalogURI = catalogURI + "?" + values.Encode()
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodDelete, catalogURI, nil)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user