Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PyCSW3 upgrade #12535

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

PyCSW3 upgrade #12535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
403733f
PyCSW3 upgrade
Gpetrak Aug 29, 2024
0e4b0f4
requirements.txt update
Gpetrak Aug 29, 2024
a5c5f6b
setup.cfg update
Gpetrak Aug 29, 2024
3734a26
fixing typos
Gpetrak Aug 30, 2024
657c76c
update requirements.txt and setup.cfg
Gpetrak Aug 30, 2024
10accde
Update .clabot
Gpetrak Aug 30, 2024
6a0f591
fixing bugs reported by tests
Gpetrak Aug 30, 2024
080f60f
update the .clabot
Gpetrak Aug 30, 2024
dbff4cc
update the .clabot
Gpetrak Aug 30, 2024
69f7922
update the .clabot
Gpetrak Aug 30, 2024
0145f3b
Merge branch 'master' into pycsw3_Upgrade
Gpetrak Aug 30, 2024
66f0953
.clabot update
Gpetrak Aug 30, 2024
6f6f920
update a test
Gpetrak Aug 30, 2024
7a09ea7
update a test
Gpetrak Aug 30, 2024
f756bce
Adapting a catalogue/tests/<test> to PyCSW3
Gpetrak Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clabot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
"ahmdthr",
"fvicent",
"RegisSinjari",
"Gpetrak",
"Gpetrak"
]
}
3 changes: 2 additions & 1 deletion geonode/catalogue/backends/pycsw_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@
"pretty_print": "true",
"domainquerytype": "range",
"domaincounts": "true",
"profiles": "apiso,ebrim",
},
"profiles": {"apiso", "ebrim"},
"repository": {
"source": "geonode.catalogue.backends.pycsw_plugin.GeoNodeRepository",
"filter": "uuid IS NOT NULL",
"mappings": os.path.join(os.path.dirname(__file__), "pycsw_local_mappings.py"),
},
"logging": {"level": "ERROR"},
}


Expand Down
11 changes: 10 additions & 1 deletion geonode/catalogue/backends/pycsw_local_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@
"pycsw:MdSource": "csw_mdsource",
"pycsw:InsertDate": "csw_insert_date",
"pycsw:XML": "metadata_xml",
"pycsw:Metadata": "metadata",
"pycsw:MetadataType": "metadata_type",
"pycsw:AnyText": "csw_anytext",
"pycsw:Language": "language",
"pycsw:Title": "title",
"pycsw:Abstract": "raw_abstract",
"pycsw:Edition": "csw_edition",
"pycsw:Keywords": "keyword_csv",
"pycsw:KeywordType": "keywordstype",
"pycsw:Themes": "csw_themes",
"pycsw:Format": "spatial_representation_type_string",
"pycsw:Source": "source",
"pycsw:Date": "date",
Expand All @@ -45,7 +49,6 @@
"pycsw:RevisionDate": "date",
"pycsw:CreationDate": "date",
"pycsw:PublicationDate": "date",
"pycsw:Organization": "organizationname",
"pycsw:OrganizationName": "organizationname",
"pycsw:SecurityConstraints": "securityconstraints",
"pycsw:ParentIdentifier": "parentidentifier",
Expand Down Expand Up @@ -78,6 +81,12 @@
"pycsw:Publisher": "publisher",
"pycsw:Contributor": "contributor",
"pycsw:Relation": "relation",
"pycsw:Platform": "platform",
"pycsw:Instrument": "instrument",
"pycsw:SensorType": "sensortype",
"pycsw:CloudCover": "cloudcover",
"pycsw:Bands": "bands",
"pycsw:Links": "download_links",
"pycsw:Contacts": "contacts",
},
}
2 changes: 1 addition & 1 deletion geonode/catalogue/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def test_given_a_request_for_multiple_dataset_should_return_multiple_value_in_xm
request = self.__request_factory_multiple()
response = csw_global_dispatch(request, self.dataset_filter_multiple)
root = ET.fromstring(response.content)
actual = root.find("{http://www.opengis.net/cat/csw/2.0.2}SearchResults").attrib["numberOfRecordsReturned"]
actual = root.find("{http://www.opengis.net/cat/csw/2.0.2}SearchResults").attrib["numberOfRecordsMatched"]
self.assertEqual(2, int(actual))

@staticmethod
Expand Down
12 changes: 6 additions & 6 deletions geonode/catalogue/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@ def opensearch_dispatch(request):
"""OpenSearch wrapper"""

ctx = {
"shortname": settings.PYCSW["CONFIGURATION"]["metadata:main"]["identification_title"],
"description": settings.PYCSW["CONFIGURATION"]["metadata:main"]["identification_abstract"],
"developer": settings.PYCSW["CONFIGURATION"]["metadata:main"]["contact_name"],
"contact": settings.PYCSW["CONFIGURATION"]["metadata:main"]["contact_email"],
"attribution": settings.PYCSW["CONFIGURATION"]["metadata:main"]["provider_name"],
"tags": settings.PYCSW["CONFIGURATION"]["metadata:main"]["identification_keywords"].replace(",", " "),
"shortname": settings.PYCSW["CONFIGURATION"]["metadata"]["identification"]["title"],
"description": settings.PYCSW["CONFIGURATION"]["metadata"]["identification"]["description"],
"developer": settings.PYCSW["CONFIGURATION"]["metadata"]["contact"]["name"],
"contact": settings.PYCSW["CONFIGURATION"]["metadata"]["contact"]["email"],
"attribution": settings.PYCSW["CONFIGURATION"]["metadata"]["provider"]["name"],
"tags": settings.PYCSW["CONFIGURATION"]["metadata"]["identification"]["keywords"].replace(",", " "),
"url": settings.SITEURL.rstrip("/") if settings.SITEURL.startswith("http") else settings.SITEURL,
}

Expand Down
2 changes: 1 addition & 1 deletion geonode/layers/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def dataset_feature_catalogue(request, layername, template="../../catalogue/temp
context_dict = {
"dataset": layer,
"attributes": attributes,
"metadata": settings.PYCSW["CONFIGURATION"]["metadata:main"],
"metadata": settings.PYCSW["CONFIGURATION"]["metadata"],
}
register_event(request, "view", layer)
return render(request, template, context=context_dict, content_type="application/xml")
Expand Down
75 changes: 42 additions & 33 deletions geonode/local_settings.py.geoserver.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ PYCSW = {
"home": ".",
"url": CATALOGUE["default"]["URL"],
"encoding": "UTF-8",
"language": LANGUAGE_CODE,
"language": LANGUAGE_CODE if LANGUAGE_CODE in ("en", "fr", "el") else "en",
"maxrecords": "20",
"pretty_print": "true",
# 'domainquerytype': 'range',
Expand All @@ -191,43 +191,52 @@ PYCSW = {
"allowed_ips": "*",
# 'csw_harvest_pagesize': '10',
},
"metadata:main": {
"identification_title": "GeoNode Catalogue",
"identification_abstract": "GeoNode is an open source platform"
" that facilitates the creation, sharing, and collaborative use"
" of geospatial data",
"identification_keywords": "sdi, catalogue, discovery, metadata," " GeoNode",
"identification_keywords_type": "theme",
"identification_fees": "None",
"identification_accessconstraints": "None",
"provider_name": "Organization Name",
"provider_url": SITEURL,
"contact_name": "Lastname, Firstname",
"contact_position": "Position Title",
"contact_address": "Mailing Address",
"contact_city": "City",
"contact_stateorprovince": "Administrative Area",
"contact_postalcode": "Zip or Postal Code",
"contact_country": "Country",
"contact_phone": "+xx-xxx-xxx-xxxx",
"contact_fax": "+xx-xxx-xxx-xxxx",
"contact_email": "Email Address",
"contact_url": "Contact URL",
"contact_hours": "Hours of Service",
"contact_instructions": "During hours of service. Off on " "weekends.",
"contact_role": "pointOfContact",
},
"metadata:inspire": {
"enabled": "true",
"metadata": {
"inspire": {
"enabled": True,
"languages_supported": "eng,gre",
"default_language": "eng",
"date": "YYYY-MM-DD",
"gemet_keywords": "Utility and governmental services",
"conformity_service": "notEvaluated",
"contact_name": "Organization Name",
"contact_email": "Email Address",
"temp_extent": "YYYY-MM-DD/YYYY-MM-DD",
},
"temp_extent": {
"begin": "YYYY-MM-DD",
"end": "YYYY-MM-DD"
},
},
"identification": {
"title": "GeoNode Catalogue",
"description": "GeoNode is an open source platform"
" that facilitates the creation, sharing, and collaborative use"
" of geospatial data",
"keywords": "sdi, catalogue, discovery, metadata," " GeoNode",
"keywords_type": "theme",
"fees": "None",
"accessconstraints": "None",
},
"provider": {
"name": "Organization Name",
"url": SITEURL,
},
"contact": {
"name": "Lastname, Firstname",
"position": "Position Title",
"address": "Mailing Address",
"city": "City",
"stateorprovince": "Administrative Area",
"postalcode": "Zip or Postal Code",
"country": "Country",
"phone": "+xx-xxx-xxx-xxxx",
"fax": "+xx-xxx-xxx-xxxx",
"email": "Email Address",
"url": "Contact URL",
"hours": "Hours of Service",
"instructions": "During hours of service. Off on " "weekends.",
"role": "pointOfContact",
}
}
}
}

Expand Down Expand Up @@ -274,10 +283,10 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == "mapstore":
pycsw_config = PYCSW["CONFIGURATION"]
if pycsw_config:
pycsw_catalogue = {
("%s" % pycsw_config["metadata:main"]["identification_title"]): {
("%s" % pycsw_config["metadata"]["identification"]): {
"url": CATALOGUE["default"]["URL"],
"type": "csw",
"title": pycsw_config["metadata:main"]["identification_title"],
"title": pycsw_config["metadata"]["identification"]["title"],
"autoload": True,
}
}
Expand Down
85 changes: 47 additions & 38 deletions geonode/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,42 +1141,51 @@
"allowed_ips": "*",
# 'csw_harvest_pagesize': '10',
},
"metadata:main": {
"identification_title": "GeoNode Catalogue",
"identification_abstract": "GeoNode is an open source platform"
" that facilitates the creation, sharing, and collaborative use"
" of geospatial data",
"identification_keywords": "sdi, catalogue, discovery, metadata," " GeoNode",
"identification_keywords_type": "theme",
"identification_fees": "None",
"identification_accessconstraints": "None",
"provider_name": "Organization Name",
"provider_url": SITEURL,
"contact_name": "Lastname, Firstname",
"contact_position": "Position Title",
"contact_address": "Mailing Address",
"contact_city": "City",
"contact_stateorprovince": "Administrative Area",
"contact_postalcode": "Zip or Postal Code",
"contact_country": "Country",
"contact_phone": "+xx-xxx-xxx-xxxx",
"contact_fax": "+xx-xxx-xxx-xxxx",
"contact_email": "Email Address",
"contact_url": "Contact URL",
"contact_hours": "Hours of Service",
"contact_instructions": "During hours of service. Off on " "weekends.",
"contact_role": "pointOfContact",
},
"metadata:inspire": {
"enabled": "true",
"languages_supported": "eng,gre",
"default_language": "eng",
"date": "YYYY-MM-DD",
"gemet_keywords": "Utility and governmental services",
"conformity_service": "notEvaluated",
"contact_name": "Organization Name",
"contact_email": "Email Address",
"temp_extent": "YYYY-MM-DD/YYYY-MM-DD",
"metadata": {
"inspire": {
"enabled": True,
"languages_supported": "eng,gre",
"default_language": "eng",
"date": "YYYY-MM-DD",
"gemet_keywords": "Utility and governmental services",
"conformity_service": "notEvaluated",
"contact_name": "Organization Name",
"contact_email": "Email Address",
"temp_extent": {
"begin": "YYYY-MM-DD",
"end": "YYYY-MM-DD",
},
},
"identification": {
"title": "GeoNode Catalogue",
"description": "GeoNode is an open source platform"
" that facilitates the creation, sharing, and collaborative use"
" of geospatial data",
"keywords": "sdi, catalogue, discovery, metadata," " GeoNode",
"keywords_type": "theme",
"fees": "None",
"accessconstraints": "None",
},
"provider": {
"name": "Organization Name",
"url": SITEURL,
},
"contact": {
"name": "Lastname, Firstname",
"position": "Position Title",
"address": "Mailing Address",
"city": "City",
"stateorprovince": "Administrative Area",
"postalcode": "Zip or Postal Code",
"country": "Country",
"phone": "+xx-xxx-xxx-xxxx",
"fax": "+xx-xxx-xxx-xxxx",
"email": "Email Address",
"url": "Contact URL",
"hours": "Hours of Service",
"instructions": "During hours of service. Off on " "weekends.",
"role": "pointOfContact",
},
},
}
}
Expand Down Expand Up @@ -1460,10 +1469,10 @@ def get_geonode_catalogue_service():
pycsw_config = PYCSW["CONFIGURATION"]
if pycsw_config:
pycsw_catalogue = {
f"{pycsw_config['metadata:main']['identification_title']}": {
f"{pycsw_config['metadata']['identification']}": {
"url": CATALOGUE["default"]["URL"],
"type": "csw",
"title": pycsw_config["metadata:main"]["identification_title"],
"title": pycsw_config["metadata"]["identification"]["title"],
"autoload": True,
"layerOptions": {"tileSize": DEFAULT_TILE_SIZE},
}
Expand Down
6 changes: 3 additions & 3 deletions geonode/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@
site_url = settings.SITEURL.rstrip("/") if settings.SITEURL.startswith("http") else settings.SITEURL
json_data = {}
json_data["siteurl"] = site_url
json_data["name"] = settings.PYCSW["CONFIGURATION"]["metadata:main"]["identification_title"]
json_data["name"] = settings.PYCSW["CONFIGURATION"]["metadata"]["identification"]["title"]

Check warning on line 119 in geonode/views.py

View check run for this annotation

Codecov / codecov/patch

geonode/views.py#L119 

Added line #L119 was not covered by tests

json_data["poc"] = {
"name": settings.PYCSW["CONFIGURATION"]["metadata:main"]["contact_name"],
"email": settings.PYCSW["CONFIGURATION"]["metadata:main"]["contact_email"],
"name": settings.PYCSW["CONFIGURATION"]["metadata"]["contact"]["name"],
"email": settings.PYCSW["CONFIGURATION"]["metadata"]["contact"]["email"],
"twitter": f"https://twitter.com/{settings.TWITTER_SITE}",
}

Expand Down
Loading
Loading