--- a/ckanext/datagovau/templates/package/read.rdf +++ b/ckanext/datagovau/templates/package/read.rdf @@ -24,7 +24,17 @@ <dct:issued>${c.pkg_dict['metadata_created']}</dct:issued> <dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified> <dct:language>en</dct:language> + +<py:choose> + <py:when test="c.pkg_dict.get('license_url',None)"> <dct:license>${c.pkg_dict['license_url']}</dct:license> + <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/> + </py:when> + <py:otherwise> + <dct:license>${c.pkg_dict['license_id']}</dct:license> + <dct:rights rdf:resource="${c.pkg_dict['license_id']}"/> + </py:otherwise> +</py:choose> <py:for each="tag_dict in c.pkg_dict.get('tags',[])"> <dcat:keyword>${ tag_dict["name"] }</dcat:keyword> </py:for> @@ -44,7 +54,7 @@ <owl:sameAs rdf:resource="urn:uuid:${rsc_dict.get('id')}"/> <dct:description>${rsc_dict.get('description')}</dct:description> <dcat:accessURL rdf:resource="${ rsc_dict.get('url') }"/> - <dct:created>${rsc_dict.get('revision_timestamp')}</dct:created> + <dct:created>${rsc_dict.get('created')}</dct:created> <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified> <dcat:byteSize py:if="rsc_dict.get('size')">${rsc_dict.get('size')}</dcat:byteSize> <dcat:mediaType py:if="rsc_dict.get('mimetype')">${rsc_dict.get('mimetype')}</dcat:mediaType> @@ -69,27 +79,25 @@ <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name> </rdf:Description> </dct:creator> - <dct:contributor - py:with="username = h.get_action('package_activity_list',{'id':c.pkg_dict['id']})[0]['user_id']"> + <dct:contributor> <rdf:Description> - <foaf:name>${h.get_action("user_show",{"id":username})["display_name"]}</foaf:name> - <foaf:mbox py:if="h.get_action('user_show',{'id':username}).get('email', None)" - rdf:resource="mailto:${h.get_action('user_show',{'id':username})['email']}"/> + <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name> + <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)" + rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/> </rdf:Description> </dct:contributor> - <dct:rights py:if="c.pkg_dict.get('license_url', None)" rdf:resource="${c.pkg_dict['license_url']}"/> - <foaf:homepage py:if="c.pkg_dict.get('DCTERMS.Source.URI')">${c.pkg_dict.get('DCTERMS.Source.URI') } + <foaf:homepage py:if="h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI')">${h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI') } </foaf:homepage> <dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint> <dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial> - <dct:spatial py:if="c.pkg_dict.get('Geospatial Coverage')">${ c.pkg_dict.get('Geospatial Coverage') }</dct:spatial> + <dct:spatial py:if="h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage') }</dct:spatial> <aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri> - <aglsterms:AglsJuri py:if="c.pkg_dict.get('AGLSTERMS.Jurisdiction')">${ c.pkg_dict.get('AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri> - <dct:temporal py:if="c.pkg_dict.temporal_coverage">${ c.pkg_dict.temporal_coverage }</dct:temporal> - <dct:temporal py:if="c.pkg_dict.get('Temporal Coverage')">${ c.pkg_dict.get('Temporal Coverage') }</dct:temporal> + <aglsterms:AglsJuri py:if="h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction')">${ h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri> + <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal> + <dct:temporal py:if="h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage') }</dct:temporal> <dct:relation py:if="c.pkg_dict.get('data_state')"> <rdf:Description> <rdfs:label>Data State</rdfs:label> @@ -103,17 +111,17 @@ <rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value> </rdf:Description> </dct:relation> - <dct:relation py:if="c.pkg_dict.get('Update Frequency')"> + <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency')"> <rdf:Description> <rdfs:label>Update Frequency</rdfs:label> - <rdf:value>${ c.pkg_dict.get('Update Frequency') }</rdf:value> + <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency') }</rdf:value> </rdf:Description> </dct:relation> - <dct:relation py:if="c.pkg_dict.get('Agency Program')"> + <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Agency Program')"> <rdf:Description> <rdfs:label>Agency Program</rdfs:label> - <rdf:value>${ c.pkg_dict.get('Agency Program') }</rdf:value> + <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Agency Program') }</rdf:value> </rdf:Description> </dct:relation> <dct:relation py:if="c.pkg_dict.get('agency_program')"> @@ -123,10 +131,10 @@ </rdf:Description> </dct:relation> - <dct:relation py:if="c.pkg_dict.get('Granularity')"> + <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Granularity')"> <rdf:Description> <rdfs:label>Data Granularity</rdfs:label> - <rdf:value>${ c.pkg_dict.get('Granularity') }</rdf:value> + <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Granularity') }</rdf:value> </rdf:Description> </dct:relation> <dct:relation py:if="c.pkg_dict.get('granularity')">