use institution as project for submit_contribution

materialsproject · May 15, 2015 · 1722be7 · 1722be7
1 parent 1d709ab
commit 1722be7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/mpcontribs/builders.py b/mpcontribs/builders.py
@@ -117,25 +117,19 @@ def build(self, cids=None):
             plot_cids = doc['contrib_ids']
             for cid in doc['contrib_ids']:
                 if cids is not None and cid not in cids: continue
-                tree_contrib = self.contrib_coll.find_one(
-                    {'contribution_id': cid}, {
-                        'content.data': 0, 'content.plots': 0, '_id': 0
-                    }
-                )
-                table_contrib = self.contrib_coll.find_one(
-                    {'contribution_id': cid}, { 'content.data': 1, '_id': 0 }
-                )
-                author = Author.parse_author(tree_contrib['contributor_email'])
-                project = str(author.name).translate(None, '.').replace(' ','_')
+                contrib = self.contrib_coll.find_one({'contribution_id': cid})
+                author = Author.parse_author(contrib['contributor_email'])
+                project = str(author.name).translate(None, '.').replace(' ','_') \
+                        if 'project' not in contrib else contrib['project']
                 logging.info(doc['_id'])
                 all_data = {}
-                if tree_contrib['content']:
+                if contrib['content']:
                     all_data.update({
-                        'contributed_data.%s.tree_data.%d' % (project, cid): tree_contrib['content'],
+                        'contributed_data.%s.tree_data.%d' % (project, cid): contrib['content'],
                     })
-                if 'data' in table_contrib['content']:
+                if 'data' in contrib['content']:
                     table_columns, table_rows = None, None
-                    raw_data = table_contrib['content']['data']
+                    raw_data = contrib['content']['data']
                     if isinstance(raw_data, dict):
                         table_columns = [ { 'title': k } for k in raw_data ]
                         table_rows = [

diff --git a/mpcontribs/rest.py b/mpcontribs/rest.py
@@ -82,7 +82,7 @@ def delete_contributions(self, crit):
         return self.contributions.remove(crit)
 
     def submit_contribution(self, mpfile, contributor_email, cids=None,
-        fake_it=False, insert=False):
+        fake_it=False, insert=False, project=None):
         """submit user data to `materials.contributions` collection
 
         Args:
@@ -111,6 +111,7 @@ def submit_contribution(self, mpfile, contributor_email, cids=None,
                 'contributed_at': datetime.datetime.utcnow().isoformat(),
                 'mp_cat_id': mp_cat_id, 'content': v
             }
+            if project is not None: doc['project'] = project
             if insert:
                 logging.info('inserting {} ...'.format(doc['contribution_id']))
                 #self.contributions.replace_one({'contribution_id': cid}, doc, upsert=True)