Change the Originator column to contain data from the custodian field

This closes issue #12.

python/medin/dws.py

@@ -267,7 +267,7 @@ def to_list(field):
                 'topic-category': i.TopicCategory,
                 'lineage': i.Lineage,
                 'public-access': i.LimitationsPublicAccess,
-                'originator': i.DataOriginator,
+                'custodian': i.DataCustodian,
                 'format': i.OriginalFormatName,
                 'online-resource': i.ResourceLocator,
                 'parameters': to_list(i.Parameters)}
@@ -305,7 +305,7 @@ class OrderAnalyser(object):
     _field_map = {'updated': 'DatasetMetadataUpdateDate',
                   'title': 'DiscoveryTitle',
                   'online-resource': 'ResourceLocator',
-                  'originator': 'DataCenter'}
+                  'custodian': 'DataCenter'}
 
     def __init__(self, field, ascending):
         try:

python/medin/views.py

@@ -112,7 +112,7 @@ def get_query(environ, from_referrer=False):
             else:
                 qsl = ''
 
-    fields = ('updated', 'originator', 'title', 'online-resource')
+    fields = ('updated', 'custodian', 'title', 'online-resource')
     return Query(qsl, get_areas(environ), fields, get_vocab(environ), get_db(environ))
 
 def get_areas(environ):
@@ -755,7 +755,7 @@ def __call__(self, environ, start_response):
                 'Authors',
                 'URL',
                 'Abstract',
-                'Originator',
+                'Custodian',
                 'Resource type',
                 'Topic category',
                 'Lineage',
@@ -775,7 +775,7 @@ def __call__(self, environ, start_response):
                 '; '.join(result['authors']),
                 url,
                 result['abstract'],
-                result['originator'],
+                result['custodian'],
                 result['resource-type'],
                 result['topic-category'],
                 result['lineage'],

templates/atom/catalogue/base.xml

@@ -63,7 +63,7 @@
   <entry>
     <title>${result['title'] | x}</title>
     <author>
-      <name>${result['originator'] | x}</name>
+      <name>${result['custodian'] | x}</name>
     </author>
     <updated>${isoformat(result['updated'])}</updated>
     <link href="${script_root}/${self.attr.template}/catalogue/${result['id'] | x}"/>

templates/common/feeds.xml

@@ -65,7 +65,7 @@ if bboxes:
 </%def>
 
 <%def name="content(entry)">
-&lt;strong&gt;Originator:&lt;/strong&gt; ${entry['originator'] | x}&lt;br/&gt;
+&lt;strong&gt;Custodian:&lt;/strong&gt; ${entry['custodian'] | x}&lt;br/&gt;
 &lt;strong&gt;Last updated:&lt;/strong&gt; ${dateformat(entry['updated']) | x}
 &lt;p&gt;${entry['abstract'] | x}&lt;/p&gt;
 </%def>

templates/full/catalogue.html

@@ -334,7 +334,7 @@ <h4 class="box"><a href="javascript:toggle_fieldset('geographic-coverage')" titl
   <thead>
   <tr>
     <th colspan="2">${sort_links('Title', 'title')}</th>
-    <th>${sort_links('Originator', 'originator')}</th>
+    <th>${sort_links('Custodian', 'custodian')}</th>
     <th>${sort_links('Metadata update date', 'updated')}</th>
     <th>${sort_links('Online resource', 'online-resource')}</th>
   </tr>
@@ -351,7 +351,7 @@ <h4 class="box"><a href="javascript:toggle_fieldset('geographic-coverage')" titl
   %endif
     <td>${start_index+i}.</td>
     <td><a href="${script_root}/full/catalogue/${res['id'] | x}" title="${res['title'] | x}">${res['title'] | x}</a></td>
-    <td>${res['originator'] | x}</td>
+    <td>${res['custodian'] | x}</td>
     <td>${res['updated'].strftime("%a %d %b %Y")}</td>
     <td>
 % if res['online-resource']:

templates/light/catalogue.html

@@ -187,7 +187,7 @@ <h3>Related searches</h3>
 %endif
 ">
   <strong>${start_index+i}.</strong> <a href="${script_root}/light/catalogue/${res['id'] | x}" title="${res['title'] | x}">${res['title'] | x}</a>
-  <div title="Originator">${res['originator'] | x}</div>
+  <div title="Custodian">${res['custodian'] | x}</div>
   <div title="Metadata update date"><em>${res['updated'].strftime("%a %d %b %Y")}</em></div>
 </div>
 % endfor
@@ -201,7 +201,7 @@ <h3>Related searches</h3>
   <input type="hidden" name="${k}" value="${v | h}"/>
 % endfor
   <select name="s">
-% for cid, name in (('updated', 'Metadata update date'), ('title', 'Title'), ('originator', 'Originator')):
+% for cid, name in (('updated', 'Metadata update date'), ('title', 'Title'), ('custodian', 'Custodian')):
   % for i, order in enumerate(('desc', 'asc')):
   <% value = '%s,%d' % (cid, i) %>\
     <option value="${value}"\