Merge branch 'reduce_logs' of https://github.com/cesine/FieldDBWebServer into reduce_logs

Author: fieldlinguist

.gitignore

@@ -19,7 +19,6 @@ audio_stimuli
 .classpath
 proguard.cfg
 
-public/components
 node_modules
 gen
 dist

app/components/App/index.jsx

@@ -4,6 +4,7 @@ import Helmet from 'react-helmet'
 import Q from 'q'
 import React, { Component } from 'react'
 
+FieldDBObject.todo = function () {};
 FieldDBObject.warn = function () {};
 FieldDBObject.confirm = function (message, optionalLocale) {
   const deferred = Q.defer()

lib/corpus.js

@@ -41,15 +41,15 @@ var getCorpusMask = function(dbname, next) {
     corpusMask.team.corpus = corpusMask;
     corpusMask.connection = corpusMask.connection || {};
     corpusMask.team.fetch(config.corpus.url + "/" + validateIdentifier.identifier).then(function() {
-      console.log(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
-      console.log(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
-      console.log(new Date() + "  TODO consider saving corpus.json with the team inside.");
+      // console.log(new Date() + " owners's gravatar in this database " + corpusMask.team.gravatar, corpusMask.startYear);
+      // console.log(new Date() + " corpus connection's gravatar in this database " + corpusMask.connection.gravatar);
+      // console.log(new Date() + "  TODO consider saving corpus.json with the team inside.");
       deferred.resolve(corpusMask);
     }, function(err) {
-      console.log("error fetching corpus team", err);
+      console.log(new Date() + "error fetching corpus team", err);
       deferred.resolve(corpusMask);
     }).fail(function(err) {
-      console.log("error fetching corpus team", err);
+      console.log(new Date() + "error fetching corpus team", err);
       deferred.resolve(corpusMask);
     });
   }, next).fail(next);
@@ -114,7 +114,7 @@ var getCorpusMaskFromTitleAsUrl = function(userMask, titleAsUrl, next) {
   }
 
   var bestMatch  = matchingCorpusConnections[0];
-  console.log(new Date() + " user's default gravatar " + userMask.gravatar);
+  // console.log(new Date() + " user's default gravatar " + userMask.gravatar);
   userMask.corpora.debug(new Date() + " best match " + bestMatch.dbname);
   return getCorpusMask(bestMatch.dbname, next);
 };

lib/user.js

@@ -83,15 +83,15 @@ var getUserMask = function getUserMask(username, next) {
         userPrivate.userMask.corpora.push(corpusMask.connection);
         return corpusMask.connection;
       }).fail(function(err) {
-        console.log("failed to fetchcorpus mask", err);
+        console.log(new Date() + "failed to fetchcorpus mask", err);
         corpusMask.connection.websiteUrl = corpusMask.connection.websiteUrl || "/" + corpusConnection.dbname.replace("-", "/");
         userPrivate.userMask.corpora.push(corpusConnection);
       }));
     });
 
     console.log(new Date() + " Waiting for " + promises.length + " to download details");
     Q.allSettled(promises).done(function(results) {
-      console.log(new Date() + " TODO Consider saving in the user to avoid making requests again ", results.length);
+      // console.log(new Date() + " TODO Consider saving in the user to avoid making requests again ", results.length);
       console.log(new Date() + " userPrivate.userMask.corpora.titles ", userPrivate.userMask.corpora.map(function(mask) {
         return mask.title;
       }));

public/components/fielddb/.bower.json

@@ -0,0 +1,78 @@
+{
+  "name": "fielddb",
+  "version": "4.4.22",
+  "homepage": "http://fielddb.github.io/FieldDB/",
+  "bugs": {
+    "url": "https://github.com/FieldDB/FieldDB/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/FieldDB/FieldDB.git"
+  },
+  "authors": [
+    "cesine <cesine@yahoo.com>",
+    "trisapeace <trisapeace@gmail.com>",
+    "hisakonog <hisakonog@gmail.com>",
+    "Emmy Cathcart <maryellencathcart@gmail.com>",
+    "Tobin Skinner <tobin.skinner@gmail.com>",
+    "Yuliya Manyakina <yulia.manyakina@gmail.com>",
+    "Elise <elise.mcclay@gmail.com>",
+    "Josh Horner <josh.horner@gmail.com>",
+    "gretchenmcc <gretchen.mcculloch@gmail.com>",
+    "jrwdunham <jrwdunham@gmail.com>",
+    "ghazan <gay.hazan@gmail.com>",
+    "Fieldlinguist <info@fieldlinguist.com>",
+    "zazoo <kimdan.ng@gmail.com>",
+    "louisa-bielig <louisa.bielig@gmail.com>",
+    "lingllama <lingllama@lingsync.org>",
+    "geekrax <rakshit@thetechtime.com>",
+    "Yogurt1206 <sunx4@miamioh.edu>",
+    "Pablo Duboue <pablo.duboue@gmail.com>",
+    "Oriana <oriana.kilbourn-ceron@mail.mcgill.ca>"
+  ],
+  "license": "Apache-2.0",
+  "ignore": [
+    "Gruntfile.js",
+    "angular_client",
+    "api",
+    "backbone_client",
+    "bower.json",
+    "bower_components",
+    "build",
+    "map_reduce_activities",
+    "map_reduce_cleaning",
+    "map_reduce_unused",
+    "map_reduce_data",
+    "map_reduce_export",
+    "map_reduce_learnx",
+    "map_reduce_lexicon",
+    "couchapp_minified",
+    "docs",
+    "install_linux_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
+    "install_mac_download_and_set_up_fielddb_servers_for_new_developers_quick_start.sh",
+    "manifest.json",
+    "node_modules",
+    "package.json",
+    "raw",
+    "release",
+    "sample_data",
+    "scripts",
+    "test-reports",
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {},
+  "main": "fielddb.js",
+  "_release": "4.4.22",
+  "_resolution": {
+    "type": "version",
+    "tag": "v4.4.22",
+    "commit": "90a11b30f345c1375d4d4bbaefaf52dad1b3f510"
+  },
+  "_source": "https://github.com/OpenSourceFieldlinguistics/bower-fielddb.git",
+  "_target": "^4.4.22",
+  "_originalSource": "fielddb"
+}