Merge pull request #98 from OpenGeoMetadata/97-json-format

Ensure that the format param is always appended to paged catalog urls
OpenGeoMetadata · Sep 18, 2020 · 5d766aa · 5d766aa
2 parents 3578842 + a58ee6c
commit 5d766aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/geo_combine/geo_blacklight_harvester.rb b/lib/geo_combine/geo_blacklight_harvester.rb
@@ -146,6 +146,7 @@ def documents
 
           url = response.dig('links', 'next')
           break unless url
+          url = "#{url}&format=json"
           self.page += 1
           puts "Fetching page #{page} @ #{url}" if GeoCombine::GeoBlacklightHarvester.config[:debug]
           begin

diff --git a/spec/lib/geo_combine/geo_blacklight_harvester_spec.rb b/spec/lib/geo_combine/geo_blacklight_harvester_spec.rb
@@ -148,7 +148,7 @@
     before do
       allow(RSolr).to receive(:connect).and_return(stub_solr_connection)
       expect(Net::HTTP).to receive(:get).with(
-        URI('https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2')
+        URI('https://example.com/catalog.json?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&per_page=100&page=2&format=json')
       ).and_return(second_results_response.to_json)
     end
 
@@ -157,7 +157,7 @@
           { 'links' => { 'self' => 'https://example.com/catalog/abc-123' } },
           { 'links' => { 'self' => 'https://example.com/catalog/abc-321' } }
         ],
-        'links' => { 'next' => 'https://example.com?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&format=json&per_page=100&page=2' }
+        'links' => { 'next' => 'https://example.com/catalog.json?f%5Bdct_provenance_s%5D%5B%5D=INSTITUTION&per_page=100&page=2' }
       }
     end