Merge pull request #229 from B2SHARE/ui/keywords

when depositing, the submitter adds keywords, not tags
EUDAT-B2SHARE · Apr 4, 2014 · 5789c35 · 5789c35
2 parents 870dd76 + 197bb58
commit 5789c35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/simplestore/lib/simplestore_marc_handler.py b/simplestore/lib/simplestore_marc_handler.py
@@ -67,8 +67,8 @@ def add_basic_fields(rec, form, email):
             record_add_field(rec, '540', subfields=[('a', remove_html_markup(form['licence']))])
         record_add_field(rec, '520', subfields=[('a', remove_html_markup(form['description']))])
 
-        if form['tags']:
-            for kw in form['tags'].split(','):
+        if form['keywords']:
+            for kw in form['keywords'].split(','):
                 if kw and not kw.isspace():
                     record_add_field(rec, '653',
                                  ind1='1',

diff --git a/simplestore/lib/simplestore_model/model.py b/simplestore/lib/simplestore_model/model.py
@@ -52,7 +52,7 @@ class SubmissionMetadata(db.Model):
     publisher = db.Column(db.String(128), default=publisher_default)
     publication_date = db.Column('publication_year', db.Date(),
                                  default=publication_date_now)
-    tags = db.Column(db.String(256))  # split on ,
+    keywords = db.Column(db.String(256))  # split on ,
 
     # optional
     contributors = db.Column(db.String(256))  # split on ;
@@ -63,7 +63,7 @@ class SubmissionMetadata(db.Model):
     version = db.Column(db.String(128))
 
     basic_fields = ['title', 'description', 'creator', 'open_access',
-                    'licence', 'publisher', 'publication_date','language', 'tags']
+                    'licence', 'publisher', 'publication_date','language', 'keywords']
     optional_fields = ['contributors', 'resource_type',
                        'alternate_identifier', 'version']
 
@@ -124,10 +124,10 @@ def __init__(self):
                            'Apache v2 or Commercial); if no licence applies ' +\
                            'leave this field blank.'
         }
-        self.field_args['tags'] = {
+        self.field_args['keywords'] = {
             'placeholder': "keyword1, keyword2, ...",
             'description':
-            'A comma separated list of tags (keywords) that ' +\
+            'A comma separated list of keywords that ' +\
             'characterize the content.'
         }
         self.field_args['open_access'] = {