changing the key structure

koopjs · Jul 1, 2015 · fa4a491 · fa4a491
1 parent 33fea48
commit fa4a491
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.4] - 2016-07-1
+### Changed
+* Using a different key struction for db and exports
+
 ## [1.1.3] - 2016-07-01
 ### Changed
 * Bumping the version because previous publish was wrong

diff --git a/controller/index.js b/controller/index.js
@@ -78,7 +78,7 @@ var Controller = function (OpenData, BaseController) {
             var stringedParams = JSON.stringify(req.params)
             var toHash = stringedParams + JSON.stringify(req.query)
             var key = crypto.createHash('md5').update(toHash).digest('hex')
-            var dir = 'OpenData' + '/' + req.params.id + crypto.createHash('md5').update(stringedParams).digest('hex')
+            var dir = 'OpenData' + '/' + req.params.id + '/' + crypto.createHash('md5').update(stringedParams).digest('hex')
             var filePath = ['files', dir, key].join('/')
             var fileName = key + '.' + req.params.format
             OpenData.files.exists(filePath, fileName, function (exists, path) {

diff --git a/models/OpenData.js b/models/OpenData.js
@@ -48,7 +48,7 @@ var OpenData = function (koop) {
   openData.getResource = function (host, hostId, params, options, callback) {
     params.layer = 0
     // delete the mehod param or else we get inconsistent hash keys depending on the request
-    var key = hostId + ':' + hash.MD5(_.omit(params, 'method'))
+    var key = hostId + '_' + hash.MD5(_.omit(params, 'method'))
     // check the cache for data with this type & id
     koop.Cache.get(type, key, options || {layer: 0}, function (err, entry) {
       if (err) {
@@ -309,7 +309,7 @@ var OpenData = function (koop) {
     delete params.method
     params.layer = 0
     var stringedParams = JSON.stringify(params)
-    var dir = 'OpenData' + '/' + params.id + crypto.createHash('md5').update(stringedParams).digest('hex')
+    var dir = 'OpenData' + '/' + params.id + '/' + crypto.createHash('md5').update(stringedParams).digest('hex')
     var key = hostId + ':' + hash.MD5(_.omit(params, 'method'))
     koop.Cache.remove(type, key, {}, function (err, res) {
       if (err) return callback(err)

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "koop-opendata",
   "description": "An ArcGIS Open Data Provider for Koop",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "author": "Daniel Fenton",
   "contributors": ["Courtney Claessens"],
   "bugs": {