Changeset 525 for Dev/trunk/src/server/bin/upgrade-db-1-to-2.js

Timestamp:

03/19/14 21:33:13 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Allow empty subcodes.
• Use HTTPResult exclusively on server (no more q).
• Set readonly & disabled on ourselves as well in _ComplexValueMixin
• Split server into several modules.
• Check codes on the variable level, not question level.
• We can add modules in design documents now.

File:

• Dev/trunk/src/server/bin/upgrade-db-1-to-2.js (modified) (1 diff)

Dev/trunk/src/server/bin/upgrade-db-1-to-2.js

@@ -1 +1 @@
 var env = require('../env')
+  , HTTPResult = require('../util/http-result')
   , upgradeCouch = require('../config/upgrade-couchdb')
   , cryptoken = require('../util/crypto-token')
-  , Q = require('q')
   ;
 upgradeCouch(env.couchServerURL,env.dbName,function(doc){
-    if ( (doc.type === 'Response' || doc.type === 'SurveyRun') && !doc.secret ) {
-        return cryptoken(8).then(function(token){
+    if ( (doc.type === 'Response' || doc.type === 'SurveyRun') &&
+         !doc.secret ) {
+        return cryptoken()
+        .then(function(token){
             doc.secret = token;
             return doc;
         });
     } else {
-        return Q.reject();
+        return new HTTPResult(-1);
     }
 }).then(function(res){