- Fixed url paths

geosolutions-it · Jul 12, 2019 · a8b4151 · a8b4151
1 parent fed104c
commit a8b4151
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/src/geoserver/catalog.py b/src/geoserver/catalog.py
@@ -276,7 +276,6 @@ def save(self, obj, content_type="application/xml"):
         href = urlparse(obj.href)
         netloc = urlparse(self.service_url).netloc
         rest_url = href._replace(netloc=netloc).geturl()
-        # rest_url = obj.href
         data = obj.message()
 
         headers = {
@@ -345,7 +344,6 @@ def get_store(self, name, workspace=None):
           Will return None if no store is found.
           Will raise an error if more than one store with the same name is found.
         '''
-
         stores = self.get_stores(workspaces=[workspace], names=name)
         return self._return_first_item(stores)
 
@@ -886,20 +884,21 @@ def get_resources(self, names=None, stores=None, workspaces=None):
         Will always return an array.
         '''
         if not stores:
-            stores = self.get_stores(
-                names=names,
+            _stores = self.get_stores(
                 workspaces=workspaces
             )
+        elif not isinstance(stores, list):
+            _stores = [stores]
+        else:
+            _stores = stores
 
         resources = []
-        for s in stores:
+        for s in _stores:
             try:
                 if isinstance(s, basestring):
-                    s = self._return_first_item(
-                        self.get_stores(
-                            names=s,
-                            workspaces=workspaces
-                        )
+                    s = self.get_store(
+                        s,
+                        workspace=workspaces[0] if workspaces else None
                     )
                 resources.extend(s.get_resources())
             except FailedRequestError:

diff --git a/src/geoserver/layer.py b/src/geoserver/layer.py
@@ -120,7 +120,7 @@ def __init__(self, catalog, name):
     @property
     def href(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "layers/{}.xml".format(self.name)
         )
 

diff --git a/src/geoserver/layergroup.py b/src/geoserver/layergroup.py
@@ -109,7 +109,7 @@ def href(self):
             workspace_name = getattr(self.workspace, 'name', self.workspace)
             path_parts = "workspaces/{}/{}".format(workspace_name, path_parts)
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             path_parts
         )
 

diff --git a/src/geoserver/resource.py b/src/geoserver/resource.py
@@ -111,8 +111,6 @@ def store(self):
 
     @property
     def href(self):
-        if self._href:
-            return self._href
         url = build_url(
             self.catalog.service_url,
             [
@@ -124,6 +122,7 @@ def href(self):
                 self.name + ".xml"
             ]
         )
+        return url or self._href
 
 
 class FeatureType(_ResourceBase):
@@ -275,7 +274,7 @@ def __init__(self, catalog, workspace, store, name):
     @property
     def href(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "workspaces/{}/wmsstores/{}/wmslayers/{}.xml".format(
                 self.workspace.name,
                 self.store.name,

diff --git a/src/geoserver/workspace.py b/src/geoserver/workspace.py
@@ -40,28 +40,28 @@ def name(self):
     @property
     def href(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "workspaces/{}.xml".format(self.name)
         )
 
     @property
     def coveragestore_url(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "workspaces/{}/coveragestores.xml".format(self.name)
         )
 
     @property
     def datastore_url(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "workspaces/{}/datastores.xml".format(self.name)
         )
 
     @property
     def wmsstore_url(self):
         return urljoin(
-            self.catalog.service_url,
+            "{}/".format(self.catalog.service_url),
             "workspaces/{}/wmsstores.xml".format(self.name)
         )