use conditionapplyingtoaccessanduse to populate oa-records:rights (#1078)

* use conditionapplyingtoaccessanduse to populate oa-records:rights

suggestion for #1077

* null check for md.rights

Author: pvgenuchten

pycsw/core/metadata.py

@@ -1670,7 +1670,7 @@ def _parse_dc(context, repos, exml):
     _set(context, recobj, 'pycsw:AlternateTitle', md.alternative)
     _set(context, recobj, 'pycsw:Abstract', md.abstract)
 
-    if len(md.subjects) > 0 and None not in md.subjects:
+    if md.subjects is not None and len(md.subjects) > 0 and None not in md.subjects:
         _set(context, recobj, 'pycsw:Keywords', ','.join(md.subjects))
 
     _set(context, recobj, 'pycsw:ParentIdentifier', md.ispartof)
@@ -1682,6 +1682,8 @@ def _parse_dc(context, repos, exml):
     _set(context, recobj, 'pycsw:Publisher', md.publisher)
     _set(context, recobj, 'pycsw:Contributor', md.contributor)
     _set(context, recobj, 'pycsw:OrganizationName', md.rightsholder)
+    if md.rights is not None and len(md.rights) > 0 and None not in md.rights:
+        _set(context, recobj, 'pycsw:ConditionApplyingToAccessAndUse', ','.join(md.rights))
     _set(context, recobj, 'pycsw:AccessConstraints', md.accessrights)
     _set(context, recobj, 'pycsw:OtherConstraints', md.license)
     _set(context, recobj, 'pycsw:Date', md.date)

pycsw/ogc/api/records.py

@@ -1201,6 +1201,10 @@ def record2json(record, url, collection, mode='ogcapi-records'):
             record.otherconstraints = [record.otherconstraints]
             record_dict['properties']['license'] = ", ".join(record.otherconstraints)
 
+    if record.conditionapplyingtoaccessanduse:
+        if isinstance(record.conditionapplyingtoaccessanduse, str) and record.conditionapplyingtoaccessanduse not in [None, 'None']:
+            record_dict['properties']['rights'] = record.conditionapplyingtoaccessanduse
+
     record_dict['properties']['updated'] = record.insert_date
 
     if record.type: