adjust usage of DBS_URL as base url

dmwm · Apr 7, 2021 · 2b473a3 · 2b473a3
1 parent 21731d5
commit 2b473a3
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/services/helpers.go b/services/helpers.go
@@ -26,10 +26,13 @@ func DBSUrl(inst string) string {
 	if burl == "" { // case of dasgoclient
 		burl = "https://cmsweb.cern.ch:8443"
 	}
-	surl := fmt.Sprintf("%s/dbs/%s/DBSReader", burl, inst)
 	if v != "" {
-		surl = v
+		if strings.Contains(v, "DBSReader") {
+			return v
+		}
+		burl = v
 	}
+	surl := fmt.Sprintf("%s/dbs/%s/DBSReader", burl, inst)
 	return surl
 }
 func PhedexUrl() string {
@@ -38,10 +41,10 @@ func PhedexUrl() string {
 	if burl == "" { // case of dasgoclient
 		burl = "https://cmsweb.cern.ch:8443"
 	}
-	surl := fmt.Sprintf("%s/phedex/datasvc/json/prod", burl)
 	if v != "" {
-		surl = v
+		burl = v
 	}
+	surl := fmt.Sprintf("%s/phedex/datasvc/json/prod", burl)
 	return surl
 }
 func SitedbUrl() string {