Merge remote-tracking branch 'upstream/wms_new_layer_factories_clean'

Author: pacesm

eoxserver/resources/coverages/management/commands/eoxs_collection_delete.py

@@ -71,7 +71,7 @@ class Command(CommandOutputMixIn, BaseCommand):
     @nested_commit_on_success
     def handle(self, *args, **kwargs):
         identifier = kwargs['identifier']
-        if identifier:
+        if not identifier:
             raise CommandError("Missing the mandatory collection identifier.")
 
         try:
@@ -104,7 +104,7 @@ def _delete_collection(self, collection, recursive, force):
                     sub_collection, recursive, force
                 )
 
-        if not force and collection.eo_objects.exist():
+        if not force and collection.eo_objects.count() > 0:
             raise CommandError(
                 "Collection '%s' is not empty." % collection.identifier
             )

eoxserver/services/gdal/wcs/referenceable_dataset_renderer.py

@@ -132,7 +132,7 @@ def render(self, params):
             ) for i, path in enumerate(out_ds.GetFileList())
         ]
 
-        if params.mediatype.startswith("multipart"):
+        if params.mediatype and params.mediatype.startswith("multipart"):
             reference = "cid:coverage/%s" % result_set[0].filename
 
             if subsets.has_x and subsets.has_y:

eoxserver/services/result.py

@@ -188,7 +188,7 @@ class to be used. It must be capable to work with iterators.
     else:
         boundary = None
         content_type = result_set[0].content_type or "application/octet-stream"
-        headers = get_headers(result_set[0])
+        headers = tuple(get_headers(result_set[0]))
 
 
     def response_iterator(items, boundary=None):