Merge branch 'release-v2.2-dgu' of github.com:datagovuk/ckan into rel…

…ease-v2.2-dgu
datagovuk · Nov 25, 2015 · d61f4da · d61f4da
2 parents c4e05e9 + c8427e0
commit d61f4da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ckan/config/resource_formats.json b/ckan/config/resource_formats.json
@@ -18,7 +18,7 @@
   ["MDB", "Access Database", "application/x-msaccess", []],
   ["NetCDF", "NetCDF File", "application/netcdf", []],
   ["ArcGIS Map Service", "ArcGIS Map Service", "ArcGIS Map Service", ["arcgis map service"]],
-  ["TSV", "Tab Separated Values File", "text/tsv", []],
+  ["TSV", "Tab Separated Values File", "text/tab-separated-values", ["text/tsv"]],
   ["WFS", "Web Feature Service", null, []],
   ["ArcGIS Online Map", "ArcGIS Online Map", "ArcGIS Online Map", ["web map application"]],
   ["Perl", "Perl Script", "text/x-perl", []],
@@ -48,13 +48,14 @@
   ["WMS", "Web Mapping Service", "WMS", ["wms"]],
   ["SVG", "SVG vector image", "image/svg+xml", ["svg"]],
   ["PPT", "Powerpoint Presentation", "application/vnd.ms-powerpoint", []],
+  ["ODP", "OpenDocument Presentation", "application/vnd.oasis.opendocument.presentation", []], 
   ["JPEG", "JPG Image File", "image/jpeg", ["jpeg", "jpg"]],
   ["SPARQL", "SPARQL end-point", "application/sparql-results+xml", []],
   ["GIF", "GIF Image File", "image/gif", []],
   ["RDF", "RDF", "application/rdf+xml", ["rdf/xml"]],
   ["E00", " ARC/INFO interchange file format", "application/x-e00", []],
   ["PDF", "PDF File", "application/pdf", []],
-  ["CSV", "Comma Separated Values File", "text/csv", ["text/comma-separated-values", "application/csv"]],
+  ["CSV", "Comma Separated Values File", "text/csv", ["text/comma-separated-values"]],
   ["ODC", "OpenDocument Chart", "application/vnd.oasis.opendocument.chart", []],
   ["Atom Feed", "Atom Feed", "application/atom+xml", []],
   ["MrSID", "MrSID", "image/x-mrsid", []],
@@ -68,5 +69,7 @@
   ["PNG", "PNG Image File", "image/png", []],
   ["RSS", "RSS feed", "application/rss+xml", []],
   ["GeoJSON", "Geographic JavaScript Object Notation", null, []],
-  ["SHP", "Shapefile", null, ["esri shapefile"]]
+  ["SHP", "Shapefile", null, ["esri shapefile"]],
+  ["TORRENT", "Torrent", "application/x-bittorrent", []],
+  ["ICS", "iCalendar", "text/calendar", ["ifb", "iCal"]]
 ]
diff --git a/ckan/tests/__init__.py b/ckan/tests/__init__.py
@@ -301,7 +301,8 @@ def __init__(self):
         from ckan import plugins
         if not is_search_supported():
             raise SkipTest("Search not supported")
-        plugins.load('synchronous_search')
+        if not plugins.plugin_loaded("synchronous_search"):
+            plugins.load('synchronous_search')
 
     @classmethod
     def index(cls):