bugfixes

artsmia · Nov 24, 2014 · 39ec7c3 · 39ec7c3
1 parent 652311e
commit 39ec7c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/adapters/mia-api.js b/adapters/mia-api.js
@@ -5,7 +5,7 @@ function maxDimensionForImage(id, cb) {
   rcli = require('redis').createClient()
   rcli.hget('object:'+Math.floor(id/1000), id, function(err, json) {
     var json = JSON.parse(json)
-    if(json.image == 'invalid') {
+    if(json == null || json.image == 'invalid') {
       cb('invalid image')
     } else {
       cb(null, Math.max(json.image_width, json.image_height))
@@ -18,10 +18,10 @@ module.exports = function(imageId, options, callback) {
     if(err) return callback(err)
 
     var imageUrl = 'http://api.artsmia.org/images/'+imageId+'/'+maxDimension+'/full.jpg',
-        imageFile = options.imagedirectory + '/' + imageId + '.jpg'
+        imageFile = options.imagedirectory + imageId + '.jpg'
 
     httpget.get({url: imageUrl}, imageFile, function(error, result) {
-      if(error || result == undefined) { return cb([error, result]) }
+      if(error || result == undefined) { return callback([error, result]) }
 
       var saw = exec([options.tilesaw+'/tilesaw.sh', imageFile], function(err, out, code) {
         if(code == 0) {

diff --git a/index.js b/index.js
@@ -59,3 +59,4 @@ app.get('/', manifest)
 
 http.createServer(app).listen(process.env.PORT || 8887);
 console.log('tilesaw running on ' + (process.env.PORT || 8887))
+console.log('.')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,4 @@ app.get('/', manifest)

		http.createServer(app).listen(process.env.PORT \|\| 8887);
		console.log('tilesaw running on ' + (process.env.PORT \|\| 8887))
		console.log('.')