From 5dcb42fb2f17de60d0d07617956e01490d4f4e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Prunayre?= Date: Thu, 2 Jun 2016 14:59:36 +0200 Subject: [PATCH] Formatting / pom.xml and XSL. --- cachingxslt/pom.xml | 118 +- common/pom.xml | 272 +- .../fao/geonet/utils/xmltest/dependant2.xsl | 14 +- .../geonet/utils/xmltest/xsl/dependant1.xsl | 10 +- .../utils/xmltest/xsl/nested/dependant3.xsl | 10 +- .../org/fao/geonet/utils/xmltest/xsl/test.xsl | 20 +- core/pom.xml | 964 +- csw-server/pom.xml | 133 +- cswtest/resources/com/occamlab/te/compile.xsl | 1673 +-- .../resources/com/occamlab/te/ext/config.xsl | 30 +- .../com/occamlab/te/ext/session_info.xsl | 25 +- cswtest/resources/com/occamlab/te/formfn.xsl | 120 +- .../com/occamlab/te/generate_dxsl.xsl | 465 +- .../com/occamlab/te/logstyles/default.xsl | 485 +- cswtest/resources/com/occamlab/te/main.xsl | 166 +- docs/pom.xml | 4 +- docs/schema-doc/pom.xml | 10 +- .../main/resources/config-editor-to-rst.xsl | 78 +- .../src/main/resources/rst-writer.xsl | 63 +- domain/pom.xml | 325 +- e2e-tests/pom.xml | 912 +- events/pom.xml | 15 +- harvesters/pom.xml | 149 +- healthmonitor/pom.xml | 131 +- inspire-atom/pom.xml | 250 +- jmeter/pom.xml | 12 +- oaipmh/pom.xml | 111 +- pom.xml | 356 +- release/pom.xml | 8 +- schemas-test/pom.xml | 175 +- schemas/config-editor-doc.xsl | 137 +- schemas/csw-record/pom.xml | 4 +- .../main/plugin/csw-record/convert/oai_dc.xsl | 78 +- .../csw-record/convert/xml_csw-record.xsl | 23 +- .../csw-record/extract-date-modified.xsl | 20 +- .../main/plugin/csw-record/extract-gml.xsl | 71 +- .../plugin/csw-record/extract-thumbnails.xsl | 15 +- .../main/plugin/csw-record/extract-uuid.xsl | 19 +- .../csw-record/index-fields/default.xsl | 267 +- .../index-fields/language-default.xsl | 43 +- .../plugin/csw-record/layout/tpl-brief.xsl | 9 +- .../main/plugin/csw-record/layout/tpl-rdf.xsl | 12 +- .../csw-record/present/csw/csw-brief.xsl | 60 +- .../csw-record/present/csw/csw-full.xsl | 41 +- .../csw-record/present/csw/csw-summary.xsl | 216 +- .../csw-record/present/metadata-edit.xsl | 65 +- .../csw-record/present/metadata-fop.xsl | 12 +- .../csw-record/present/metadata-rdf.xsl | 12 +- .../csw-record/present/metadata-view.xsl | 10 +- .../plugin/csw-record/present/metadata.xsl | 59 +- .../main/plugin/csw-record/set-thumbnail.xsl | 33 +- .../src/main/plugin/csw-record/set-uuid.xsl | 106 +- .../plugin/csw-record/unset-thumbnail.xsl | 35 +- .../plugin/csw-record/update-fixed-info.xsl | 197 +- schemas/dublin-core/pom.xml | 4 +- .../plugin/dublin-core/convert/oai_dc.xsl | 77 +- .../dublin-core/extract-date-modified.xsl | 15 +- .../main/plugin/dublin-core/extract-gml.xsl | 54 +- .../plugin/dublin-core/extract-relations.xsl | 4 +- .../plugin/dublin-core/extract-thumbnails.xsl | 8 +- .../main/plugin/dublin-core/extract-uuid.xsl | 14 +- .../dublin-core/formatter/xsl-view/view.xsl | 22 +- .../dublin-core/index-fields/default.xsl | 31 +- .../index-fields/language-default.xsl | 43 +- .../plugin/dublin-core/layout/dispatcher.xsl | 9 +- .../plugin/dublin-core/layout/evaluate.xsl | 13 +- .../main/plugin/dublin-core/layout/layout.xsl | 78 +- .../plugin/dublin-core/layout/rdf-tpl.xsl | 36 +- .../plugin/dublin-core/layout/tpl-brief.xsl | 6 +- .../plugin/dublin-core/layout/tpl-rdf.xsl | 19 +- .../plugin/dublin-core/layout/utility-fn.xsl | 6 +- .../dublin-core/layout/utility-vacuum.xsl | 8 +- .../dublin-core/present/csw/csw-brief.xsl | 62 +- .../dublin-core/present/csw/csw-full.xsl | 82 +- .../dublin-core/present/csw/csw-summary.xsl | 226 +- .../dublin-core/present/csw/own-brief.xsl | 6 +- .../dublin-core/present/csw/own-full.xsl | 6 +- .../dublin-core/present/csw/own-summary.xsl | 6 +- .../dublin-core/present/metadata-edit.xsl | 362 +- .../dublin-core/present/metadata-fop.xsl | 12 +- .../dublin-core/present/metadata-rdf.xsl | 36 +- .../dublin-core/present/metadata-view.xsl | 6 +- .../plugin/dublin-core/present/metadata.xsl | 333 +- .../massive-content-update-clean-changes.xsl | 6 +- ...massive-content-update-extract-changes.xsl | 18 +- .../process/massive-search-and-replace.xsl | 16 +- .../dublin-core/process/onlinesrc-add.xsl | 10 +- .../dublin-core/process/onlinesrc-remove.xsl | 8 +- .../plugin/dublin-core/process/parent-add.xsl | 8 +- .../dublin-core/process/parent-remove.xsl | 6 +- .../plugin/dublin-core/process/vacuum.xsl | 13 +- .../main/plugin/dublin-core/set-thumbnail.xsl | 36 +- .../src/main/plugin/dublin-core/set-uuid.xsl | 82 +- .../src/main/plugin/dublin-core/suggest.xsl | 18 +- .../plugin/dublin-core/unset-thumbnail.xsl | 36 +- .../plugin/dublin-core/update-fixed-info.xsl | 4 +- schemas/iso19110/pom.xml | 4 +- .../main/plugin/iso19110/convert/oai_dc.xsl | 78 +- .../plugin/iso19110/extract-date-modified.xsl | 16 +- .../src/main/plugin/iso19110/extract-gml.xsl | 11 +- .../plugin/iso19110/extract-thumbnails.xsl | 6 +- .../src/main/plugin/iso19110/extract-uuid.xsl | 14 +- .../iso19110/formatter/xsl-view/view.xsl | 25 +- .../plugin/iso19110/index-fields/default.xsl | 251 +- .../index-fields/language-default.xsl | 43 +- .../plugin/iso19110/layout/dispatcher.xsl | 15 +- .../main/plugin/iso19110/layout/evaluate.xsl | 20 +- .../iso19110/layout/layout-custom-fields.xsl | 28 +- .../main/plugin/iso19110/layout/layout.xsl | 77 +- .../main/plugin/iso19110/layout/tpl-brief.xsl | 10 +- .../main/plugin/iso19110/layout/tpl-rdf.xsl | 58 +- .../plugin/iso19110/layout/utility-fn.xsl | 14 +- .../plugin/iso19110/present/csw/csw-brief.xsl | 97 +- .../plugin/iso19110/present/csw/csw-full.xsl | 154 +- .../iso19110/present/csw/csw-summary.xsl | 156 +- .../plugin/iso19110/present/csw/gfc-brief.xsl | 8 +- .../plugin/iso19110/present/csw/gfc-full.xsl | 8 +- .../iso19110/present/csw/gfc-summary.xsl | 18 +- .../plugin/iso19110/present/csw/own-brief.xsl | 6 +- .../plugin/iso19110/present/csw/own-full.xsl | 6 +- .../iso19110/present/csw/own-summary.xsl | 6 +- .../plugin/iso19110/present/metadata-edit.xsl | 1159 ++- .../plugin/iso19110/present/metadata-fop.xsl | 16 +- .../plugin/iso19110/present/metadata-rdf.xsl | 58 +- .../plugin/iso19110/present/metadata-view.xsl | 544 +- .../main/plugin/iso19110/present/metadata.xsl | 1174 ++- .../process/iso19110_2011_schema_update.xsl | 121 +- .../main/plugin/iso19110/set-thumbnail.xsl | 35 +- .../src/main/plugin/iso19110/set-uuid.xsl | 61 +- .../main/plugin/iso19110/unset-thumbnail.xsl | 42 +- .../plugin/iso19110/update-fixed-info.xsl | 238 +- schemas/iso19139/pom.xml | 4 +- .../convert/19119ToJZKitRepository.xsl | 91 +- .../OGCCSWGetCapabilities-to-19119.xsl | 637 +- ...SWGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- .../OGCSOSGetCapabilities-to-19119.xsl | 1084 +- ...OSGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- .../OGCSOSGetCapabilitiesLayer-to-19139.xsl | 1193 ++- ...CSGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- .../OGCWCSGetCapabilitiesLayer-to-19139.xsl | 14 +- ...FSGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- .../OGCWFSGetCapabilitiesLayer-to-19139.xsl | 14 +- ...MSGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- .../OGCWMSGetCapabilitiesLayer-to-19139.xsl | 14 +- ...PSGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- .../OGCWxSGetCapabilities-to-19119.xsl | 697 +- .../OGCWxSGetCapabilitiesLayer-to-19139.xsl | 898 +- .../identification.xsl | 1769 ++-- .../ref-system.xsl | 44 +- .../resp-party.xsl | 356 +- .../CDMCoords-to-ISO19139Keywords.xsl | 116 +- .../convert/ThreddsDIFToISO/DIFToISO.xsl | 6643 ++++++------ .../ThreddsToFragments/netcdf-attributes.xsl | 1565 +-- .../ThreddsToFragments/thredds-metadata.xsl | 1507 +-- .../ThreddsToFragments/thredds/utils.xsl | 201 +- .../deegree22_philosopher_fragments.xsl | 383 +- .../geoserver_boundary_fragments.xsl | 331 +- .../src/main/plugin/iso19139/convert/dcat.xsl | 66 +- .../plugin/iso19139/convert/functions.xsl | 266 +- .../main/plugin/iso19139/convert/oai_dc.xsl | 251 +- .../convert/thesaurus-transformation.xsl | 78 +- .../plugin/iso19139/extract-atom-feed.xsl | 31 +- .../plugin/iso19139/extract-datasetid.xsl | 17 +- .../extract-datasetinfo-from-service-feed.xsl | 34 +- .../main/plugin/iso19139/extract-datasets.xsl | 24 +- .../plugin/iso19139/extract-date-modified.xsl | 12 +- .../src/main/plugin/iso19139/extract-gml.xsl | 84 +- .../plugin/iso19139/extract-relations.xsl | 60 +- .../plugin/iso19139/extract-thumbnails.xsl | 47 +- .../src/main/plugin/iso19139/extract-type.xsl | 15 +- .../src/main/plugin/iso19139/extract-uuid.xsl | 14 +- .../iso19139/formatter/xsl-view/view.xsl | 61 +- .../plugin/iso19139/index-fields/default.xsl | 1516 +-- .../index-fields/index-subtemplate-fields.xsl | 32 +- .../index-fields/language-default.xsl | 871 +- .../plugin/iso19139/layout/dispatcher.xsl | 21 +- .../main/plugin/iso19139/layout/evaluate.xsl | 26 +- .../layout/layout-custom-fields-date.xsl | 21 +- .../layout/layout-custom-fields-keywords.xsl | 71 +- .../layout/layout-custom-fields-sds.xsl | 120 +- .../iso19139/layout/layout-custom-fields.xsl | 47 +- .../main/plugin/iso19139/layout/layout.xsl | 188 +- .../main/plugin/iso19139/layout/tpl-brief.xsl | 41 +- .../main/plugin/iso19139/layout/tpl-rdf.xsl | 494 +- .../plugin/iso19139/layout/utility-fn.xsl | 22 +- .../layout/utility-tpl-multilingual.xsl | 88 +- .../plugin/iso19139/layout/utility-tpl.xsl | 67 +- .../plugin/iso19139/layout/utility-vacuum.xsl | 12 +- .../plugin/iso19139/present/csw/csw-brief.xsl | 182 +- .../plugin/iso19139/present/csw/csw-full.xsl | 705 +- .../iso19139/present/csw/csw-summary.xsl | 254 +- .../iso19139/present/csw/dcat-brief.xsl | 66 +- .../plugin/iso19139/present/csw/dcat-full.xsl | 17 +- .../iso19139/present/csw/dcat-summary.xsl | 17 +- .../plugin/iso19139/present/csw/gmd-brief.xsl | 170 +- .../plugin/iso19139/present/csw/gmd-full.xsl | 53 +- .../iso19139/present/csw/gmd-summary.xsl | 418 +- .../plugin/iso19139/present/csw/own-brief.xsl | 2 +- .../plugin/iso19139/present/csw/own-full.xsl | 2 +- .../iso19139/present/csw/own-summary.xsl | 2 +- .../plugin/iso19139/present/metadata-edit.xsl | 3554 ++++--- .../plugin/iso19139/present/metadata-fop.xsl | 72 +- .../plugin/iso19139/present/metadata-geo.xsl | 354 +- .../iso19139/present/metadata-inspire.xsl | 1035 +- .../plugin/iso19139/present/metadata-rdf.xsl | 494 +- .../present/metadata-subtemplates.xsl | 48 +- .../iso19139/present/metadata-utils.xsl | 921 +- .../plugin/iso19139/present/metadata-view.xsl | 428 +- .../main/plugin/iso19139/present/metadata.xsl | 9151 +++++++++-------- .../process/add-extent-from-geokeywords.xsl | 53 +- .../iso19139/process/add-info-from-wms.xsl | 97 +- .../iso19139/process/add-resource-id.xsl | 184 +- .../process/add-service-info-from-wxs.xsl | 181 +- .../plugin/iso19139/process/anonymizer.xsl | 109 +- .../iso19139/process/contact-updater.xsl | 10 +- .../plugin/iso19139/process/dataset-add.xsl | 452 +- .../iso19139/process/datasets-remove.xsl | 32 +- .../plugin/iso19139/process/fcats-add.xsl | 150 +- .../plugin/iso19139/process/fcats-remove.xsl | 42 +- .../fix-xlink-location-on-keywords.xsl | 68 +- .../process/inspire-add-conformity.xsl | 206 +- .../process/inspire-add-dq-toporeport.xsl | 83 +- .../inspire-themes-and-topiccategory.xsl | 752 +- .../process/keywords-comma-exploder.xsl | 105 +- .../iso19139/process/keywords-mapper.xsl | 105 +- .../iso19139/process/linked-data-checker.xsl | 53 +- .../massive-content-update-clean-changes.xsl | 6 +- ...massive-content-update-extract-changes.xsl | 22 +- .../process/massive-content-update.xsl | 329 +- .../process/massive-search-and-replace.xsl | 25 +- .../plugin/iso19139/process/onlinesrc-add.xsl | 19 +- .../iso19139/process/onlinesrc-remove.xsl | 41 +- .../plugin/iso19139/process/parent-add.xsl | 105 +- .../plugin/iso19139/process/parent-remove.xsl | 24 +- .../iso19139/process/process-utility.xsl | 31 +- .../process/related-metadata-checker.xsl | 58 +- .../process/scale-denominator-formatter.xsl | 40 +- .../iso19139/process/sds-add-dataquality.xsl | 139 +- .../process/sds-add-qualityofservice.xsl | 216 +- .../iso19139/process/sds-fix-category.xsl | 40 +- .../plugin/iso19139/process/service-add.xsl | 6 +- .../iso19139/process/services-remove.xsl | 36 +- .../plugin/iso19139/process/sibling-add.xsl | 265 +- .../iso19139/process/sibling-remove.xsl | 30 +- .../plugin/iso19139/process/source-add.xsl | 25 +- .../plugin/iso19139/process/source-remove.xsl | 26 +- .../plugin/iso19139/process/thumbnail-add.xsl | 22 +- .../iso19139/process/thumbnail-linker.xsl | 13 +- .../iso19139/process/thumbnail-remove.xsl | 6 +- .../iso19139/process/update-onlineSrc.xsl | 178 +- .../iso19139/process/url-host-relocator.xsl | 64 +- .../main/plugin/iso19139/process/vacuum.xsl | 11 +- .../iso19139/process/xlinks-href-update.xsl | 35 +- .../main/plugin/iso19139/set-thumbnail.xsl | 322 +- .../src/main/plugin/iso19139/set-uuid.xsl | 76 +- .../src/main/plugin/iso19139/suggest.xsl | 42 +- .../main/plugin/iso19139/unset-thumbnail.xsl | 49 +- .../update-child-from-parent-info.xsl | 464 +- .../plugin/iso19139/update-fixed-info.xsl | 799 +- schemas/pom.xml | 18 +- schemas/schema-core/pom.xml | 4 +- sde/pom.xml | 18 +- services/pom.xml | 243 +- .../services/metadata/format/functions.xsl | 10 +- .../metadata/format/resource-test/test.xsl | 10 +- .../format/xsl-test-formatter/view.xsl | 28 +- web-ui-docs/generate-jeeves-services-doc.xsl | 81 +- web-ui-docs/pom.xml | 7 +- web-ui/pom.xml | 291 +- web/pom.xml | 508 +- .../crosswalks/RecordModel/meta_to_html.xsl | 63 +- .../crosswalks/RecordModel/meta_to_sutrs.xsl | 19 +- .../crosswalks/RecordModel/meta_to_usmarc.xsl | 18 +- .../crosswalks/RecordModel/meta_to_xml.xsl | 40 +- .../crosswalks/RecordModel/xml_to_html.xsl | 218 +- .../schematron/iso_abstract_expand.xsl | 552 +- .../classes/schematron/iso_dsdl_include.xsl | 2298 +++-- .../iso_schematron_message_xslt2.xsl | 74 +- .../iso_schematron_skeleton_for_saxon.xsl | 4224 ++++---- .../classes/schematron/iso_svrl_for_xslt2.xsl | 1254 +-- .../data/formatter/xslt/render-functions.xsl | 6 +- .../data/formatter/xslt/render-layout.xsl | 15 +- .../data/formatter/xslt/render-variables.xsl | 7 +- .../node-utils/generate-spring-config.xsl | 94 +- .../WEB-INF/node-utils/register-node.xsl | 66 +- .../iso19115-to-iso19139/app-schema.xsl | 135 +- .../iso19115-to-iso19139/citation.xsl | 359 +- .../iso19115-to-iso19139/content.xsl | 707 +- .../iso19115-to-iso19139/data-quality.xsl | 953 +- .../iso19115-to-iso19139/distribution.xsl | 446 +- .../iso19115-to-iso19139/extension.xsl | 285 +- .../iso19115-to-iso19139/extent.xsl | 384 +- .../iso19115-to-iso19139/identification.xsl | 1188 ++- .../conversion/iso19115-to-iso19139/main.xsl | 516 +- .../iso19115-to-iso19139/ref-system.xsl | 28 +- .../iso19115-to-iso19139/resp-party.xsl | 481 +- .../iso19115-to-iso19139/spat-rep-types.xsl | 600 +- .../iso19115-to-iso19139/unmapped.xsl | 372 +- .../conversion/oai_dc-to-dublin-core/main.xsl | 29 +- .../schematronscripts/skeleton1-5.xsl | 1038 +- .../htmlCache/schematronscripts/verbid.xsl | 296 +- web/src/main/webapp/xml/csw/cql-to-filter.xsl | 218 +- .../main/webapp/xml/csw/filter-to-lucene.xsl | 721 +- .../xml/mappings/Metadata_to_xml_brief.xsl | 53 +- .../xml/mappings/Metadata_to_xml_full.xsl | 33 +- .../xml/mappings/Metadata_to_xml_summary.xsl | 166 +- .../main/webapp/xml/search/lucene-utils.xsl | 388 +- web/src/main/webapp/xml/search/lucene.xsl | 1309 +-- web/src/main/webapp/xml/search/parser.xsl | 448 +- .../main/webapp/xml/search/z3950Client.xsl | 465 +- .../main/webapp/xml/search/z3950Server.xsl | 876 +- web/src/main/webapp/xsl/admin-logo-add.xsl | 4 +- web/src/main/webapp/xsl/blanks.xsl | 2 +- .../xsl/blanks/metadata-schema01-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema02-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema03-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema04-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema05-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema06-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema07-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema08-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema09-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema10-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema11-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema12-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema13-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema14-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema15-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema16-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema17-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema18-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema19-rdf.xsl | 2 +- .../xsl/blanks/metadata-schema20-rdf.xsl | 2 +- .../19115to19139/19115-to-19139.xsl | 461 +- .../conversion/19115to19139/app-schema.xsl | 135 +- .../xsl/conversion/19115to19139/citation.xsl | 359 +- .../xsl/conversion/19115to19139/content.xsl | 695 +- .../conversion/19115to19139/data-quality.xsl | 953 +- .../conversion/19115to19139/distribution.xsl | 446 +- .../xsl/conversion/19115to19139/extension.xsl | 285 +- .../xsl/conversion/19115to19139/extent.xsl | 384 +- .../19115to19139/identification.xsl | 1182 ++- .../conversion/19115to19139/ref-system.xsl | 28 +- .../conversion/19115to19139/resp-party.xsl | 481 +- .../19115to19139/spat-rep-types.xsl | 600 +- .../xsl/conversion/19115to19139/unmapped.xsl | 372 +- .../conversion/DIFtoISO19139/DIF-ISO-2.1.xsl | 6643 ++++++------ .../DIFtoISO19139/DIF-ISO-ANZLIC-2.1.xsl | 6948 +++++++------ .../OGCSLDtoISO19139/OGCSLD-to-ISO19139.xsl | 235 +- .../OGCSLDtoISO19139/identification.xsl | 152 +- .../OGCWFStoISO19110/OGCWFS-to-ISO19110.xsl | 375 +- .../OGCWMC-OR-OWSC-to-ISO19139.xsl | 203 +- .../OGCWMCtoISO19139/identification.xsl | 142 +- .../OGCWMCtoISO19139/resp-party.xsl | 60 +- .../OGCCSWGetCapabilities-to-19119.xsl | 562 +- .../OGCSOSGetCapabilities-to-19119.xsl | 1084 +- .../OGCSOSGetCapabilitiesLayer-to-19139.xsl | 1193 ++- .../OGCWCSGetCapabilitiesLayer-to-19139.xsl | 14 +- .../OGCWFSGetCapabilitiesLayer-to-19139.xsl | 14 +- .../OGCWMSGetCapabilitiesLayer-to-19139.xsl | 14 +- .../OGCWxSGetCapabilities-to-19119.xsl | 525 +- .../OGCWxSGetCapabilitiesLayer-to-19139.xsl | 898 +- .../identification.xsl | 1476 +-- .../ref-system.xsl | 36 +- .../resp-party.xsl | 346 +- .../ThreddsCatalog-to-19119.xsl | 380 +- .../ThreddsCatalogto19119/identification.xsl | 894 +- .../ThreddsCatalogto19119/ref-system.xsl | 33 +- .../ThreddsCatalogto19119/resp-party.xsl | 344 +- .../CDMCoords-to-ISO19139Keywords.xsl | 116 +- .../webapp/xsl/conversion/export/xml_dc.xsl | 18 +- .../webapp/xsl/conversion/export/xml_fgdc.xsl | 18 +- .../xsl/conversion/export/xml_iso19110.xsl | 4 +- .../export/xml_iso19115_to_19139.xsl | 60 +- .../export/xml_iso19115arccatalog.xsl | 4234 ++++---- .../xsl/conversion/export/xml_iso19139.xsl | 39 +- .../xsl/conversion/import/Add-gmd-prefix.xsl | 34 +- .../import/ArcCatalog8_to_ISO19115.xsl | 4285 ++++---- .../import/CDMCoords-to-ISO19139Keywords.xsl | 13 +- .../import/Convert_CSW-CITE_test_metadata.xsl | 79 +- .../xsl/conversion/import/DIF-to-ISO19139.xsl | 13 +- .../import/ISO19115-to-ISO19139.xsl | 15 +- ...SWGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- .../conversion/import/OGCSLD-to-ISO19139.xsl | 13 +- ...OSGetCapabilities-to-ISO19119_ISO19139.xsl | 12 +- ...CSGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- .../OGCWFSDescribeFeatureType-to-ISO19110.xsl | 12 +- ...FSGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- .../import/OGCWMC-OR-OWSC-to-ISO19139.xsl | 13 +- ...MSGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- ...PSGetCapabilities-to-ISO19119_ISO19139.xsl | 14 +- ...xSGetCapabilities-to-ISO19119_ISO19139.xsl | 15 +- .../ThreddsCatalog-to-ISO19119_ISO19139.xsl | 13 +- .../webapp/xsl/conversion/import/gmiTogmd.xsl | 131 +- web/src/main/webapp/xsl/crs.xsl | 63 +- web/src/main/webapp/xsl/error-embedded.xsl | 29 +- web/src/main/webapp/xsl/error-modal.xsl | 27 +- web/src/main/webapp/xsl/error-xml.xsl | 12 +- .../webapp/xsl/extjs-feedback-response.xsl | 15 +- web/src/main/webapp/xsl/extracttext.xsl | 12 +- .../webapp/xsl/file-download-disclaimer.xsl | 191 +- .../main/webapp/xsl/file-download-list.xsl | 301 +- web/src/main/webapp/xsl/file-download.xsl | 99 +- web/src/main/webapp/xsl/header.xsl | 121 +- web/src/main/webapp/xsl/infomodal.xsl | 44 +- web/src/main/webapp/xsl/kml.xsl | 501 +- web/src/main/webapp/xsl/layout-pdf.xsl | 52 +- web/src/main/webapp/xsl/main-error-xml.xsl | 24 +- .../webapp/xsl/metadata-batch-results.xsl | 136 +- .../webapp/xsl/metadata-batchownership.xsl | 145 +- web/src/main/webapp/xsl/metadata-brief.xsl | 12 +- web/src/main/webapp/xsl/metadata-category.xsl | 159 +- web/src/main/webapp/xsl/metadata-children.xsl | 291 +- web/src/main/webapp/xsl/metadata-controls.xsl | 315 +- .../webapp/xsl/metadata-create-thesaurus.xsl | 122 +- .../main/webapp/xsl/metadata-fop-utils.xsl | 72 +- web/src/main/webapp/xsl/metadata-fop.xsl | 215 +- .../xsl/metadata-formatter/identity.xsl | 16 +- .../webapp/xsl/metadata-insert-form-utils.xsl | 288 +- .../webapp/xsl/metadata-license-annex.xsl | 862 +- web/src/main/webapp/xsl/metadata-status.xsl | 172 +- .../main/webapp/xsl/metadata-tab-utils.xsl | 373 +- web/src/main/webapp/xsl/metadata-utils.xsl | 517 +- web/src/main/webapp/xsl/metadata.xsl | 4012 ++++---- web/src/main/webapp/xsl/metadata/common.xsl | 4 +- web/src/main/webapp/xsl/metadata/controls.xsl | 132 +- .../xsl/metadata/edit/edit-embedded.xsl | 9 +- .../main/webapp/xsl/metadata/edit/edit.xsl | 38 +- .../xsl/metadata/file-upload-results.xsl | 12 +- .../main/webapp/xsl/metadata/layout-pdf.xsl | 52 +- .../webapp/xsl/metadata/layout-simple.xsl | 34 +- .../main/webapp/xsl/metadata/layout-xml.xsl | 103 +- web/src/main/webapp/xsl/metadata/layout.xsl | 937 +- .../webapp/xsl/metadata/md-insert-results.xsl | 14 +- web/src/main/webapp/xsl/metadata/relation.xsl | 28 +- .../xsl/metadata/replace/replace-results.xsl | 209 +- .../webapp/xsl/metadata/replace/replace.xsl | 74 +- .../main/webapp/xsl/metadata/tab-utils.xsl | 41 +- .../main/webapp/xsl/metadata/thumbnail.xsl | 32 +- web/src/main/webapp/xsl/metadata/utility.xsl | 192 +- .../main/webapp/xsl/metadata/validate-fn.xsl | 106 +- web/src/main/webapp/xsl/metadata/validate.xsl | 69 +- .../main/webapp/xsl/metadata/view/view.xsl | 18 +- web/src/main/webapp/xsl/modal.xsl | 84 +- web/src/main/webapp/xsl/plain-file.xsl | 8 +- web/src/main/webapp/xsl/portal-categories.xsl | 32 +- web/src/main/webapp/xsl/portal-featured.xsl | 18 +- web/src/main/webapp/xsl/portal-full.xsl | 22 +- web/src/main/webapp/xsl/portal-get.xsl | 20 +- .../main/webapp/xsl/portal-latest-updated.xsl | 18 +- .../main/webapp/xsl/portal-present-fop.xsl | 13 +- web/src/main/webapp/xsl/portal-present.xsl | 46 +- web/src/main/webapp/xsl/portal-search.xsl | 20 +- web/src/main/webapp/xsl/portal-sources.xsl | 22 +- .../main/webapp/xsl/registration-error.xsl | 20 +- web/src/main/webapp/xsl/registration-info.xsl | 93 +- .../webapp/xsl/registration-prof-email.xsl | 116 +- .../webapp/xsl/registration-pwd-email.xsl | 107 +- .../webapp/xsl/schema-xsl-edit-loader.xsl | 46 +- .../main/webapp/xsl/schema-xsl-rdf-loader.xsl | 40 +- .../xsl/schema-xsl-relations-loader.xsl | 46 +- web/src/main/webapp/xsl/text-utilities.xsl | 694 +- web/src/main/webapp/xsl/thesaurus/convert.xsl | 113 +- .../thesaurus/thesaurus-autosearchlist.xsl | 24 +- .../xsl/thesaurus/thesaurus-keywordlist.xsl | 102 +- web/src/main/webapp/xsl/utils-fn.xsl | 92 +- web/src/main/webapp/xsl/utils.xsl | 376 +- web/src/main/webapp/xsl/validate-fn.xsl | 95 +- web/src/main/webapp/xsl/validate.xsl | 62 +- web/src/main/webapp/xsl/validation.xsl | 255 +- web/src/main/webapp/xsl/xml-error.xsl | 26 +- .../main/webapp/xsl/xml/harvesting/arcsde.xsl | 98 +- .../main/webapp/xsl/xml/harvesting/common.xsl | 248 +- .../main/webapp/xsl/xml/harvesting/csw.xsl | 101 +- .../webapp/xsl/xml/harvesting/filesystem.xsl | 98 +- .../webapp/xsl/xml/harvesting/geoPREST.xsl | 54 +- .../webapp/xsl/xml/harvesting/geonetwork.xsl | 138 +- .../xsl/xml/harvesting/geonetwork20.xsl | 82 +- .../xsl/xml/harvesting/geonetwork30.xsl | 138 +- .../main/webapp/xsl/xml/harvesting/oaipmh.xsl | 92 +- .../main/webapp/xsl/xml/harvesting/ogcwxs.xsl | 86 +- .../xsl/xml/harvesting/sort-harvesters.xsl | 30 +- .../webapp/xsl/xml/harvesting/thredds.xsl | 142 +- .../main/webapp/xsl/xml/harvesting/webdav.xsl | 48 +- .../webapp/xsl/xml/harvesting/wfsfeatures.xsl | 86 +- .../main/webapp/xsl/xml/harvesting/z3950.xsl | 48 +- .../webapp/xsl/xml/harvesting/z3950Config.xsl | 92 +- web/src/main/webapp/xsl/xml/info.xsl | 415 +- .../webapp/xslt/base-layout-cssjs-loader.xsl | 132 +- web/src/main/webapp/xslt/base-layout-nojs.xsl | 27 +- web/src/main/webapp/xslt/base-layout.xsl | 39 +- .../common/base-variables-metadata-editor.xsl | 21 +- .../xslt/common/base-variables-metadata.xsl | 55 +- .../webapp/xslt/common/base-variables.xsl | 62 +- web/src/main/webapp/xslt/common/error.xsl | 12 +- .../webapp/xslt/common/functions-core.xsl | 59 +- .../webapp/xslt/common/functions-metadata.xsl | 165 +- .../main/webapp/xslt/common/functions-ui.xsl | 9 +- .../xslt/common/profiles-loader-relations.xsl | 46 +- ...iles-loader-subtemplate-transformation.xsl | 7 +- ...ofiles-loader-thesaurus-transformation.xsl | 8 +- .../xslt/common/profiles-loader-tpl-brief.xsl | 38 +- .../xslt/common/profiles-loader-tpl-csv.xsl | 15 +- .../xslt/common/profiles-loader-tpl-rdf.xsl | 15 +- .../webapp/xslt/common/profiles-loader.xsl | 4 +- .../xslt/common/utility-tpl-metadata.xsl | 66 +- .../main/webapp/xslt/common/utility-tpl.xsl | 8 +- web/src/main/webapp/xslt/error/error-json.xsl | 53 +- web/src/main/webapp/xslt/error/error-xml.xsl | 12 +- .../account/password-changed-email.xsl | 84 +- .../account/password-forgotten-email.xsl | 59 +- .../account/registration-prof-email.xsl | 106 +- .../account/registration-pwd-email.xsl | 99 +- .../webapp/xslt/services/csv/csv-search.xsl | 103 +- .../main/webapp/xslt/services/dcat/rdf.xsl | 174 +- .../main/webapp/xslt/services/i18n-for-js.xsl | 12 +- .../xslt/services/inspire-atom/opensearch.xsl | 283 +- .../xslt/services/metadata/relation.xsl | 30 +- .../xslt/services/metadata/validate-fn.xsl | 67 +- .../xslt/services/metadata/validate.xsl | 382 +- .../webapp/xslt/services/pdf/metadata-fop.xsl | 202 +- .../xslt/services/pdf/portal-present-fop.xsl | 6 +- .../services/reports/reportCommon-output.xsl | 116 +- .../reports/reportDataDownloads-output.xsl | 46 +- .../reports/reportDataUploads-output.xsl | 46 +- .../reports/reportInternal-output.xsl | 46 +- .../services/reports/reportUpdated-output.xsl | 46 +- .../services/reports/reportUsers-output.xsl | 46 +- .../webapp/xslt/services/rss/opensearch.xsl | 11 +- .../webapp/xslt/services/rss/rss-search.xsl | 21 +- .../webapp/xslt/services/rss/rss-utils.xsl | 466 +- .../webapp/xslt/services/sitemap/robots.xsl | 12 +- .../webapp/xslt/services/sitemap/sitemap.xsl | 103 +- .../xslt/services/sru/portal-srusearch.xsl | 19 +- .../services/statistics/to-csv_from_java.xsl | 47 +- .../xslt/services/subtemplate/convert.xsl | 16 +- .../main/webapp/xslt/services/suggestions.xsl | 41 +- .../xslt/services/thesaurus/convert.xsl | 27 +- .../xslt/services/thesaurus/to-jskos.xsl | 112 +- .../main/webapp/xslt/skin/default/skin.xsl | 106 +- web/src/main/webapp/xslt/ui-admin/admin.xsl | 7 +- .../main/webapp/xslt/ui-admin/contactus.xsl | 4 +- .../main/webapp/xslt/ui-admin/new-account.xsl | 4 +- .../webapp/xslt/ui-admin/new-password.xsl | 4 +- .../xslt/ui-admin/node-change-warning.xsl | 77 +- web/src/main/webapp/xslt/ui-admin/signin.xsl | 4 +- .../xslt/ui-metadata/edit/edit-embedded.xsl | 41 +- .../webapp/xslt/ui-metadata/edit/edit.xsl | 48 +- .../main/webapp/xslt/ui-metadata/editor.xsl | 6 +- .../xslt/ui-metadata/form-builder-xml.xsl | 20 +- .../webapp/xslt/ui-metadata/form-builder.xsl | 388 +- .../xslt/ui-metadata/form-configurator.xsl | 37 +- .../xslt/ui-metadata/formatter/identity.xsl | 10 +- .../webapp/xslt/ui-metadata/menu-builder.xsl | 63 +- .../main/webapp/xslt/ui-metadata/menu-fn.xsl | 14 +- .../xslt/ui-metadata/tpl-metadata-view.xsl | 251 +- .../ui-metadata/view/formatter-viewer.xsl | 6 +- .../webapp/xslt/ui-metadata/view/view.xsl | 29 +- .../main/webapp/xslt/ui-metadata/viewer.xsl | 18 +- .../webapp/xslt/ui-search/search-nojs.xsl | 94 +- web/src/main/webapp/xslt/ui-search/search.xsl | 5 +- web/src/main/webapp/xslt/ui/error-page.xsl | 72 +- web/src/main/webapp/xslt/ui/error.xsl | 6 +- .../webapp/xslt/ui/service-not-allowed.xsl | 9 +- wro4j/pom.xml | 209 +- 565 files changed, 75604 insertions(+), 67975 deletions(-) diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index 1a778237fdf..08ee49cb122 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -22,71 +22,73 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + -4.0.0 + 4.0.0 - - org.geonetwork-opensource - geonetwork - 3.1.0-SNAPSHOT - + + org.geonetwork-opensource + geonetwork + 3.1.0-SNAPSHOT + - - - - org.geonetwork-opensource - cachingxslt - jar - Caching xslt module - + + + + org.geonetwork-opensource + cachingxslt + jar + Caching xslt module + Caching xslt project. - - - General Public License (GPL) - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - repo - - + + + General Public License (GPL) + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + repo + + - - - log4j - log4j - - - net.sf.saxon - saxon - - - ${project.groupId} - common - ${project.version} - - + + + log4j + log4j + + + net.sf.saxon + saxon + + + ${project.groupId} + common + ${project.version} + + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/common/pom.xml b/common/pom.xml index 9c67f2a80b9..eb5b3ddcc86 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -22,150 +22,152 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + -4.0.0 + 4.0.0 - - org.geonetwork-opensource - geonetwork - 3.1.0-SNAPSHOT - + + org.geonetwork-opensource + geonetwork + 3.1.0-SNAPSHOT + - - - - common - jar - common utils - + + + + common + jar + common utils + Utility classes used by many or all geonetwork modules. - - - General Public License (GPL) - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - repo - - + + + General Public License (GPL) + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + repo + + - - - org.jdom - jdom - - - jdbm - jdbm - - - log4j - log4j - - - org.apache.jcs - jcs - - - net.sf.saxon - saxon - - - globus - cog-jglobus - - - xerces - xercesImpl - - - xml-resolver - xml-resolver-patched - - - jaxen - jaxen - - - jsch - jsch - - - commons-io - commons-io - - - com.google.guava - guava - - - org.quartz-scheduler - quartz - - - org.apache.xmlgraphics - fop - - - commons-lang - commons-lang - - - org.apache.httpcomponents - httpclient - - - com.googlecode.juniversalchardet - juniversalchardet - - - org.springframework - spring-web - - - org.springframework - spring-test - compile - - - org.eclipse.core - org.eclipse.core.runtime - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - xom - xom - - + + + org.jdom + jdom + + + jdbm + jdbm + + + log4j + log4j + + + org.apache.jcs + jcs + + + net.sf.saxon + saxon + + + globus + cog-jglobus + + + xerces + xercesImpl + + + xml-resolver + xml-resolver-patched + + + jaxen + jaxen + + + jsch + jsch + + + commons-io + commons-io + + + com.google.guava + guava + + + org.quartz-scheduler + quartz + + + org.apache.xmlgraphics + fop + + + commons-lang + commons-lang + + + org.apache.httpcomponents + httpclient + + + com.googlecode.juniversalchardet + juniversalchardet + + + org.springframework + spring-web + + + org.springframework + spring-test + compile + + + org.eclipse.core + org.eclipse.core.runtime + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + xom + xom + + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/common/src/test/resources/org/fao/geonet/utils/xmltest/dependant2.xsl b/common/src/test/resources/org/fao/geonet/utils/xmltest/dependant2.xsl index 09e2fab2ad2..7481a915e4f 100644 --- a/common/src/test/resources/org/fao/geonet/utils/xmltest/dependant2.xsl +++ b/common/src/test/resources/org/fao/geonet/utils/xmltest/dependant2.xsl @@ -21,11 +21,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - dep2 - - + + + + dep2 + + - \ No newline at end of file + diff --git a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/dependant1.xsl b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/dependant1.xsl index 4d9c81d50bd..3aedfa7fe20 100644 --- a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/dependant1.xsl +++ b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/dependant1.xsl @@ -21,10 +21,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - dep1 - + + dep1 + - \ No newline at end of file + diff --git a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/nested/dependant3.xsl b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/nested/dependant3.xsl index 833b61e9dc9..901d21e1613 100644 --- a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/nested/dependant3.xsl +++ b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/nested/dependant3.xsl @@ -21,9 +21,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - dep3 - + + + dep3 + - \ No newline at end of file + diff --git a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/test.xsl b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/test.xsl index 3799669541f..2110e63ad61 100644 --- a/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/test.xsl +++ b/common/src/test/resources/org/fao/geonet/utils/xmltest/xsl/test.xsl @@ -21,15 +21,15 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - + + + - - - - - - + + + + + + - \ No newline at end of file + diff --git a/core/pom.xml b/core/pom.xml index 6912ad13a6d..e894ef4dc13 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,511 +22,511 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - core - GeoNetwork core + core + GeoNetwork core - - - - org.tuckey - urlrewritefilter - 3.2.0 - + + + + org.tuckey + urlrewritefilter + 3.2.0 + - - org.eclipse.jetty - jetty-servlet - + + org.eclipse.jetty + jetty-servlet + - - xalan - xalan - - - net.sf.saxon - saxon-dom - - - org.openrdf - openrdf-model - - - org.openrdf - openrdf-util - - - org.openrdf - sesame - - - org.openrdf - rio - - - org.springframework - spring-context - - - org.springframework - spring-context-support - - - org.springframework - spring-orm - - - org.springframework - spring-tx - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.springframework.security - spring-security-ldap - - - org.springframework.security - spring-security-web - - - org.springframework.security - spring-security-cas - - - org.springframework.security - spring-security-config - + + xalan + xalan + + + net.sf.saxon + saxon-dom + + + org.openrdf + openrdf-model + + + org.openrdf + openrdf-util + + + org.openrdf + sesame + + + org.openrdf + rio + + + org.springframework + spring-context + + + org.springframework + spring-context-support + + + org.springframework + spring-orm + + + org.springframework + spring-tx + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.springframework.security + spring-security-ldap + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-cas + + + org.springframework.security + spring-security-config + - - - com.yammer.metrics - metrics-core - - - com.yammer.metrics - metrics-servlet - - - com.yammer.metrics - metrics-web - - - com.yammer.metrics - metrics-log4j - + + + com.yammer.metrics + metrics-core + + + com.yammer.metrics + metrics-servlet + + + com.yammer.metrics + metrics-web + + + com.yammer.metrics + metrics-log4j + - - org.apache.xmlgraphics - fop - - - org.apache.jcs - jcs - + + org.apache.xmlgraphics + fop + + + org.apache.jcs + jcs + - - commons-dbcp - commons-dbcp - - - commons-pool - commons-pool - + + commons-dbcp + commons-dbcp + + + commons-pool + commons-pool + - - - org.dspace - cql-java - - - org.jzkit - a2j - - - marc4j - marc4j - + + + org.dspace + cql-java + + + org.jzkit + a2j + + + marc4j + marc4j + - - org.geotools - gt-api - - - org.geotools - gt-xml - - - org.geotools.xsd - gt-xsd-gml3 - - - org.geotools - gt-cql - - - org.geotools - gt-shapefile - - - org.geotools.xsd - gt-xsd-filter - - - org.geotools - gt-epsg-extension - - - org.geotools - gt-referencing - - - org.geotools - gt-epsg-hsql - + + org.geotools + gt-api + + + org.geotools + gt-xml + + + org.geotools.xsd + gt-xsd-gml3 + + + org.geotools + gt-cql + + + org.geotools + gt-shapefile + + + org.geotools.xsd + gt-xsd-filter + + + org.geotools + gt-epsg-extension + + + org.geotools + gt-referencing + + + org.geotools + gt-epsg-hsql + - - com.vividsolutions - jts - - - org.apache.lucene - lucene-analyzers-common - - - org.apache.lucene - lucene-misc - - - org.apache.lucene - lucene-queries - - - org.apache.lucene - lucene-queryparser - - - org.apache.lucene - lucene-facet - - - pcj - pcj - - - batik - batik-ext - - - org.apache.httpcomponents - httpclient - - - commons-net - commons-net - - - org.apache.commons - commons-email - - - avalon-framework - avalon-framework-api - - - org.apache.avalon.framework - avalon-framework-impl - 4.3.1 - - - commons-digester - commons-digester - - - commons-io - commons-io - - - org.apache.xmlgraphics - xmlgraphics-commons - - - commons-fileupload - commons-fileupload - - - commons-collections - commons-collections - - - com.h2database - h2 - - - postgresql - postgresql - - - org.postgis - postgis-jdbc - - - mysql - mysql-connector-java - - - eu.medsea.mimeutil - mime-util - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - jaxen - jaxen - - - com.google.guava - guava - - - junit - junit - - - org.mockito - mockito-all - test - - - org.springframework - spring-test - - - ${project.groupId} - domain - ${project.version} - tests - test - + + com.vividsolutions + jts + + + org.apache.lucene + lucene-analyzers-common + + + org.apache.lucene + lucene-misc + + + org.apache.lucene + lucene-queries + + + org.apache.lucene + lucene-queryparser + + + org.apache.lucene + lucene-facet + + + pcj + pcj + + + batik + batik-ext + + + org.apache.httpcomponents + httpclient + + + commons-net + commons-net + + + org.apache.commons + commons-email + + + avalon-framework + avalon-framework-api + + + org.apache.avalon.framework + avalon-framework-impl + 4.3.1 + + + commons-digester + commons-digester + + + commons-io + commons-io + + + org.apache.xmlgraphics + xmlgraphics-commons + + + commons-fileupload + commons-fileupload + + + commons-collections + commons-collections + + + com.h2database + h2 + + + postgresql + postgresql + + + org.postgis + postgis-jdbc + + + mysql + mysql-connector-java + + + eu.medsea.mimeutil + mime-util + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-api + + + jaxen + jaxen + + + com.google.guava + guava + + + junit + junit + + + org.mockito + mockito-all + test + + + org.springframework + spring-test + + + ${project.groupId} + domain + ${project.version} + tests + test + - - ${project.groupId} - events - ${project.version} - + + ${project.groupId} + events + ${project.version} + - - org.tmatesoft.svnkit - svnkit - + + org.tmatesoft.svnkit + svnkit + - - - org.mapfish.print - print-lib - ${print-lib.version} - - - commons-httpclient - commons-httpclient - - - com.codahale.metrics - metrics-core - - - com.codahale.metrics - metrics-log4j - - - com.codahale.metrics - metrics-servlet - - - com.codahale.metrics - metrics-servlets - - - com.codahale.metrics - metrics-httpclient - - - com.google.guava - guava - - - org.springframework - spring-context - - - org.springframework - spring-web - - - xalan - xalan - - - com.vividsolutions - jts - - - + + + org.mapfish.print + print-lib + ${print-lib.version} + + + commons-httpclient + commons-httpclient + + + com.codahale.metrics + metrics-core + + + com.codahale.metrics + metrics-log4j + + + com.codahale.metrics + metrics-servlet + + + com.codahale.metrics + metrics-servlets + + + com.codahale.metrics + metrics-httpclient + + + com.google.guava + guava + + + org.springframework + spring-context + + + org.springframework + spring-web + + + xalan + xalan + + + com.vividsolutions + jts + + + - - - - ${project.groupId} - oaipmh - ${project.version} - - - ${project.groupId} - domain - ${project.version} - - - ${project.groupId} - cachingxslt - ${project.version} - - - ${project.groupId} - schema-iso19139 - ${project.version} - - - ${project.groupId} - dummy-api - ${project.version} - + + + + ${project.groupId} + oaipmh + ${project.version} + + + ${project.groupId} + domain + ${project.version} + + + ${project.groupId} + cachingxslt + ${project.version} + + + ${project.groupId} + schema-iso19139 + ${project.version} + + + ${project.groupId} + dummy-api + ${project.version} + - - - dlib - dlib - - - lizard - lizard-tiff - - - jzkit - jzkit-core - 3.r260.geonetwork.patch.1 - - - jzkit - jzkit-service - 3.r260.geonetwork.patch.1 - - - jzkit - jzkit-z3950-server - 3.r260.geonetwork.patch.1 - - - jzkit - jzkit-z3950-plugin - 3.r260.geonetwork.patch.1 - - - edu.ucar - netcdf - 4.0.patch - + + + dlib + dlib + + + lizard + lizard-tiff + + + jzkit + jzkit-core + 3.r260.geonetwork.patch.1 + + + jzkit + jzkit-service + 3.r260.geonetwork.patch.1 + + + jzkit + jzkit-z3950-server + 3.r260.geonetwork.patch.1 + + + jzkit + jzkit-z3950-plugin + 3.r260.geonetwork.patch.1 + + + edu.ucar + netcdf + 4.0.patch + - - - com.cybozu.labs - langdetect - - - net.arnx.jsonic - jsonic - 1.2.0 - - - - opendap - opendap - 2.1 - + + + com.cybozu.labs + langdetect + + + net.arnx.jsonic + jsonic + 1.2.0 + + + + opendap + opendap + 2.1 + - - org.jsoup - jsoup - 0.2.2 - + + org.jsoup + jsoup + 0.2.2 + - - - org.owasp.esapi - esapi - 2.1.0 - + + + org.owasp.esapi + esapi + 2.1.0 + - + - + + + + maven-jar-plugin + 2.5 + + + test-jar + + test-jar + + + + + + + + + + run-static-analysis + + + !skipTests + + + - - maven-jar-plugin - 2.5 - - - test-jar - - test-jar - - - - + + org.codehaus.mojo + findbugs-maven-plugin + - - - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + + + ${basedir}/.. + diff --git a/csw-server/pom.xml b/csw-server/pom.xml index 45963f58327..9c4b402a6ee 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -22,76 +22,77 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - csw-server - GeoNetwork CSW server + csw-server + GeoNetwork CSW server - - - ${project.groupId} - core - ${project.version} - - - ${project.groupId} - domain - ${project.version} - tests - test - - - ${project.groupId} - core - ${project.version} - tests - test - - - org.springframework - spring-test - + + + ${project.groupId} + core + ${project.version} + + + ${project.groupId} + domain + ${project.version} + tests + test + + + ${project.groupId} + core + ${project.version} + tests + test + + + org.springframework + spring-test + - - org.jdom - jdom - 1.1.2 - + + org.jdom + jdom + 1.1.2 + - - commons-lang - commons-lang - 2.6 - - + + commons-lang + commons-lang + 2.6 + + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/cswtest/resources/com/occamlab/te/compile.xsl b/cswtest/resources/com/occamlab/te/compile.xsl index aa5a6b36cab..9bcb9df1d03 100644 --- a/cswtest/resources/com/occamlab/te/compile.xsl +++ b/cswtest/resources/com/occamlab/te/compile.xsl @@ -3,11 +3,11 @@ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - the specific language governing rights and limitations under the License. + the specific language governing rights and limitations under the License. The Original Code is TEAM Engine. @@ -20,821 +20,858 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - - - - - - - - ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - < - - > - - - < - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - - - - 2 - - - - 1 - - - - 0 - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - concat(' - - _', - - - - - position() - - ) - - - - - - - - - - - - - - - - - {local-name()} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:txsl="http://www.w3.org/1999/XSL/Transform/target" + xmlns:ctl="http://www.occamlab.com/ctl" + xmlns:te="java:com.occamlab.te.TECore" + xmlns:saxon="http://saxon.sf.net/" + xmlns:math="java:java.lang.Math" + exclude-result-prefixes="math" + version="2.0"> + + + + + + + + + ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + < + + > + + + < + + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + + + + 2 + + + + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + concat(' + + _', + + + + + position() + + ) + + + + + + + + + + + + + + + + + + + {local-name()} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cswtest/resources/com/occamlab/te/ext/config.xsl b/cswtest/resources/com/occamlab/te/ext/config.xsl index 36109d45d4a..f05a661aed4 100644 --- a/cswtest/resources/com/occamlab/te/ext/config.xsl +++ b/cswtest/resources/com/occamlab/te/ext/config.xsl @@ -3,26 +3,24 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:txsl="http://www.w3.org/1999/XSL/Transform/target" xmlns:ctl="http://www.occamlab.com/ctl" - xmlns:te="java:com.occamlab.te.TECore" xmlns:conf="java:com.occamlab.te.web.Config" - xmlns:saxon="http://saxon.sf.net/" version="2.0"> - - - + + + - - - + + + + + + + + + + + - - - - - - - - diff --git a/cswtest/resources/com/occamlab/te/ext/session_info.xsl b/cswtest/resources/com/occamlab/te/ext/session_info.xsl index 186b70fba56..6ec06d8ca47 100644 --- a/cswtest/resources/com/occamlab/te/ext/session_info.xsl +++ b/cswtest/resources/com/occamlab/te/ext/session_info.xsl @@ -4,19 +4,22 @@ xmlns:txsl="http://www.w3.org/1999/XSL/Transform/target" xmlns:ctl="http://www.occamlab.com/ctl" xmlns:te="java:com.occamlab.te.TECore" - xmlns:saxon="http://saxon.sf.net/" version="2.0"> - - - + + + + + + + + + + + + + + - - - - - - - diff --git a/cswtest/resources/com/occamlab/te/formfn.xsl b/cswtest/resources/com/occamlab/te/formfn.xsl index 98db5df279b..4fd87696fb4 100644 --- a/cswtest/resources/com/occamlab/te/formfn.xsl +++ b/cswtest/resources/com/occamlab/te/formfn.xsl @@ -3,11 +3,11 @@ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - the specific language governing rights and limitations under the License. + the specific language governing rights and limitations under the License. The Original Code is TEAM Engine. @@ -20,62 +20,64 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - - - - - + + + + + + - - - - <xsl:value-of select="$title"/> - - - - - - -
- - test - - - - - - -
- - -
- - test - - - - - - -
- - - - -
- - test - - - - - - -
- - - - - + + + + + <xsl:value-of select="$title"/> + + + + + + + +
+ + test + + + + + + +
+ + +
+ + test + + + + + + +
+ + + + +
+ + test + + + + + + +
+ + + + + diff --git a/cswtest/resources/com/occamlab/te/generate_dxsl.xsl b/cswtest/resources/com/occamlab/te/generate_dxsl.xsl index daae55023cc..fe4871a0a99 100644 --- a/cswtest/resources/com/occamlab/te/generate_dxsl.xsl +++ b/cswtest/resources/com/occamlab/te/generate_dxsl.xsl @@ -3,11 +3,11 @@ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - the specific language governing rights and limitations under the License. + the specific language governing rights and limitations under the License. The Original Code is TEAM Engine. @@ -20,235 +20,236 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - - - - - - - ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <test local-name=" - - " prefix=" - - " namespace-uri=" - - "> - - - <assertion> - - </assertion> - - <comment> - - </comment> - - - - <link - - title=" - - " - - > - - </link> - - - </test> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:txsl="http://www.w3.org/1999/XSL/Transform/target" + xmlns:ctl="http://www.occamlab.com/ctl" + xmlns:te="java:com.occamlab.te.TECore" + version="2.0"> + + + + + + + + ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <test local-name=" + + " prefix=" + + " namespace-uri=" + + "> + + + <assertion> + + </assertion> + + <comment> + + </comment> + + + + <link + + title=" + + " + + > + + </link> + + + </test> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cswtest/resources/com/occamlab/te/logstyles/default.xsl b/cswtest/resources/com/occamlab/te/logstyles/default.xsl index 2fc57cd5724..daccb5c38d0 100644 --- a/cswtest/resources/com/occamlab/te/logstyles/default.xsl +++ b/cswtest/resources/com/occamlab/te/logstyles/default.xsl @@ -4,11 +4,11 @@ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - the specific language governing rights and limitations under the License. + the specific language governing rights and limitations under the License. The Original Code is TEAM Engine. @@ -21,262 +21,267 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - + xmlns:te="java:com.occamlab.te.TECore" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="2.0"> + + - - + + - - - - - - - & - - - - - - - - - - - - - - - + + + + + + + & + + + + + + + + + + + + + + + - - - - - - - - - & - ? - - - - - - - + + + + + + + + + & + ? + + + + + + + - - - + + + - + - - Sessions: - - - - + + Sessions: + + + + - - - - - - Failed and did not complete - Failed - Did not complete - Failed (Inherited Failure) - Warning - Passed - - - - - - - - - + + + + + + Failed and did not complete + Failed + Did not complete + Failed (Inherited Failure) + Warning + Passed + + + + + + + + + - - - - - Failed - Failed (Inherited Failure) - Warning - Passed - Test execution did not complete - - - - + + + + + Failed + Failed (Inherited Failure) + Warning + Passed + Test execution did not complete + + + + - - + + - + - - - - Value: - - - - - - - - - - - + + + + Value: + + + + + + + + + + + - - Context: - - Value: - - - - - - - - - - - - + + Context: + + Value: + + + + + + + + + + + + - - - - + + + + - - Request - - : - Method: - - - URL: - - - - - - - - - - - - - - Body: - - - - - - - - - - - - - - - - - - - + + Request + + : + Method: + + + URL: + + + + + + + + + + + + + + Body: + + + + + + + + + + + + + + + + + + + - - Response - - - - : - - - - - - - - - - - - + + Response + + + + : + + + + + + + + + + + + - - Parse - - : - - + + Parse + + : + + - - - - - Failed and did not complete - Failed - Did not complete - Failed (Inherited Failure) - Warning - Passed - - - - + + + + + Failed and + did not complete + + Failed + Did not complete + Failed (Inherited Failure) + + Warning + Passed + + + + - - Form - - : - - - - - + + Form + + : + + + + + - - - + + + - + diff --git a/cswtest/resources/com/occamlab/te/main.xsl b/cswtest/resources/com/occamlab/te/main.xsl index d1ddecde4d7..47f68eb6415 100644 --- a/cswtest/resources/com/occamlab/te/main.xsl +++ b/cswtest/resources/com/occamlab/te/main.xsl @@ -3,11 +3,11 @@ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for - the specific language governing rights and limitations under the License. + the specific language governing rights and limitations under the License. The Original Code is TEAM Engine. @@ -20,83 +20,87 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:txsl="http://www.w3.org/1999/XSL/Transform/target" + xmlns:te="java:com.occamlab.te.TECore" + version="2.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/pom.xml b/docs/pom.xml index 80ac13c4bd9..120ec9676a0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,8 +21,8 @@ ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, ~ Rome - Italy. email: geonetwork@osgeo.org --> - geonetwork diff --git a/docs/schema-doc/pom.xml b/docs/schema-doc/pom.xml index 7522b6f28e2..51b5045cefe 100644 --- a/docs/schema-doc/pom.xml +++ b/docs/schema-doc/pom.xml @@ -21,8 +21,8 @@ ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, ~ Rome - Italy. email: geonetwork@osgeo.org --> - 4.0.0 org.geonetwork-opensource @@ -93,7 +93,7 @@ + implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper"> schema-ident\.xml$ @item@.rst @@ -130,7 +130,7 @@ + implementation="org.codehaus.plexus.components.io.filemappers.RegExpFileMapper"> schema-ident\.xml$ @item@.rst @@ -211,4 +211,4 @@ true UTF-8 - \ No newline at end of file + diff --git a/docs/schema-doc/src/main/resources/config-editor-to-rst.xsl b/docs/schema-doc/src/main/resources/config-editor-to-rst.xsl index 948d6e494e1..7d40a0d5b92 100644 --- a/docs/schema-doc/src/main/resources/config-editor-to-rst.xsl +++ b/docs/schema-doc/src/main/resources/config-editor-to-rst.xsl @@ -22,16 +22,15 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:gns="http://geonetwork-opensource.org/schemas/schema-ident" + xmlns:gndoc="http://geonetwork-opensource.org/doc" + exclude-result-prefixes="xs" + version="2.0"> - @@ -85,7 +84,6 @@ select="$sc/gns:standardUrl[@xml:lang = $iso2lang or not(@xml:lang)]"/> - @@ -116,7 +114,9 @@ - * + * @@ -141,7 +141,8 @@ - * + * @@ -155,11 +156,14 @@ - * Missing label for + * Missing label for + + - + @@ -183,7 +187,8 @@ - + @@ -224,7 +227,8 @@ - + @@ -288,20 +292,20 @@ - + - - - + @@ -322,7 +326,8 @@ - + @@ -334,8 +339,6 @@ - - @@ -355,13 +358,16 @@ - + - * Missing section name for + * Missing section name for + + - + @@ -434,8 +441,6 @@ - - @@ -449,7 +454,8 @@ - + @@ -497,8 +503,6 @@ - - @@ -513,18 +517,18 @@ - - - - - - + + + + @@ -596,4 +600,4 @@ '* ', label, ' (', code, '): ', normalize-space(description) ))"/> - \ No newline at end of file + diff --git a/docs/schema-doc/src/main/resources/rst-writer.xsl b/docs/schema-doc/src/main/resources/rst-writer.xsl index dcd2533814f..2a4f1f98366 100644 --- a/docs/schema-doc/src/main/resources/rst-writer.xsl +++ b/docs/schema-doc/src/main/resources/rst-writer.xsl @@ -40,8 +40,8 @@ encoding="utf-8" escape-uri-attributes="yes"/> - @@ -67,7 +67,10 @@ - + + + + @@ -85,7 +88,7 @@ :: + select="replace(normalize-space($value), '\*', '\\*')"/> @@ -93,12 +96,12 @@ - + - @@ -109,7 +112,8 @@ - .. _: + .. _: .. _: @@ -126,10 +130,11 @@ - :ref:`` + :ref:`` - :ref:`` + :ref:`` @@ -140,20 +145,21 @@ + xmlns:file="java.io.File" + test="file:exists(file:new(concat($folder, '/', $image)))"> .. figure:: - * Missing figure + * Missing figure + + - @@ -163,7 +169,6 @@ - - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - domain - GeoNetwork domain + domain + GeoNetwork domain - - - ${project.groupId} - common - ${project.version} - - - org.apache.lucene - lucene-core - - - com.vividsolutions - jts - - - com.google.guava - guava - - - joda-time - joda-time - + + + ${project.groupId} + common + ${project.version} + + + org.apache.lucene + lucene-core + + + com.vividsolutions + jts + + + com.google.guava + guava + + + joda-time + joda-time + - - - org.hibernate - hibernate-jpamodelgen - 1.2.0.Final - - - org.hibernate - hibernate-entitymanager - - - org.hibernate - hibernate-ehcache - - - org.springframework - spring-context - - - org.springframework - spring-aspects - - - org.springframework - spring-orm - - - org.springframework - spring-tx - - - org.springframework.data - spring-data-jpa - - - org.springframework - spring-test - test - - - org.springframework.security - spring-security-core - - - org.springframework.security - spring-security-ldap - - - com.fasterxml.jackson.core - jackson-annotations - - - com.h2database - h2 - test - - + + + org.hibernate + hibernate-jpamodelgen + 1.2.0.Final + + + org.hibernate + hibernate-entitymanager + + + org.hibernate + hibernate-ehcache + + + org.springframework + spring-context + + + org.springframework + spring-aspects + + + org.springframework + spring-orm + + + org.springframework + spring-tx + + + org.springframework.data + spring-data-jpa + + + org.springframework + spring-test + test + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-ldap + + + com.fasterxml.jackson.core + jackson-annotations + + + com.h2database + h2 + test + + - + + + + maven-jar-plugin + 2.5 + + + test-jar + + test-jar + + + + + + + org.bsc.maven + maven-processor-plugin + + + process + + process + + generate-sources + + target/metamodel + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9 + + + add-source + generate-sources + + add-source + + + + target/metamodel + + + + + + + + + + run-static-analysis + + + !skipTests + + + - - maven-jar-plugin - 2.5 - - - test-jar - - test-jar - - - - - - - org.bsc.maven - maven-processor-plugin - - - process - - process - - generate-sources - - target/metamodel - - org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9 - - - add-source - generate-sources - - add-source - - - - target/metamodel - - - - - + + org.codehaus.mojo + findbugs-maven-plugin + - - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + + + ${basedir}/.. + diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml index 9926d3d0dc7..d71bf3b60a5 100644 --- a/e2e-tests/pom.xml +++ b/e2e-tests/pom.xml @@ -22,479 +22,481 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - 4.0.0 - - org.geonetwork-opensource - geonetwork - 3.1.0-SNAPSHOT - - e2e-tests - pom - GeoNetwork E2E Javascript Tests - GeoNetwork integration test suite. - - - General Public License (GPL) - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - repo - - + + 4.0.0 + + org.geonetwork-opensource + geonetwork + 3.1.0-SNAPSHOT + + e2e-tests + pom + GeoNetwork E2E Javascript Tests + GeoNetwork integration test suite. + + + General Public License (GPL) + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + repo + + - - firefox - ${basedir}/target/protractor - to be calculated by groovy plugin - // ----- How to setup Selenium ----- - // - // There are three ways to specify how to use Selenium. Specify one of the - // following: - // - // 1. seleniumServerJar - to start Selenium Standalone locally. - // 2. seleniumAddress - to connect to a Selenium server which is already - // running. - // 3. sauceUser/sauceKey - to use remote Selenium servers via SauceLabs. + + firefox + ${basedir}/target/protractor + to be calculated by groovy plugin + // ----- How to setup Selenium ----- + // + // There are three ways to specify how to use Selenium. Specify one of the + // following: + // + // 1. seleniumServerJar - to start Selenium Standalone locally. + // 2. seleniumAddress - to connect to a Selenium server which is already + // running. + // 3. sauceUser/sauceKey - to use remote Selenium servers via SauceLabs. - // The location of the selenium standalone server .jar file. - seleniumServerJar: '@seleniumJar@', + // The location of the selenium standalone server .jar file. + seleniumServerJar: '@seleniumJar@', - // Chromedriver location is used to help the selenium standalone server - // find chromedriver. - // - // The binaries are in the chromedriver submodule and the correct driver - // is selected by the maven profile activated by the current platform - chromeDriver: '@chromedriver@', + // Chromedriver location is used to help the selenium standalone server + // find chromedriver. + // + // The binaries are in the chromedriver submodule and the correct driver + // is selected by the maven profile activated by the current platform + chromeDriver: '@chromedriver@', - // than the maximum time your application needs to stabilize between tasks. - allScriptsTimeout: 11000, + // than the maximum time your application needs to stabilize between tasks. + allScriptsTimeout: 11000, - // ----- Capabilities to be passed to the webdriver instance ---- - // - // For a full list of available capabilities, see - // https://code.google.com/p/selenium/wiki/DesiredCapabilities - // and - // https://code.google.com/p/selenium/source/browse/javascript/webdriver/capabilities.js - capabilities: { - 'browserName': '@browserName@' - // Config for phantomjs is not working - // 'browserName': 'phantomjs', - // 'phantomjs.binary.path': './node_modules/phantomjs/bin/phantomjs' - }, + // ----- Capabilities to be passed to the webdriver instance ---- + // + // For a full list of available capabilities, see + // https://code.google.com/p/selenium/wiki/DesiredCapabilities + // and + // https://code.google.com/p/selenium/source/browse/javascript/webdriver/capabilities.js + capabilities: { + 'browserName': '@browserName@' + // Config for phantomjs is not working + // 'browserName': 'phantomjs', + // 'phantomjs.binary.path': './node_modules/phantomjs/bin/phantomjs' + }, - // ----- More information for your tests ---- - // - // A base URL for your application under test. Calls to protractor.get() - // with relative paths will be prepended with this. - baseUrl: 'http://localhost:${appPort}/geonetwork/srv/eng/', + // ----- More information for your tests ---- + // + // A base URL for your application under test. Calls to protractor.get() + // with relative paths will be prepended with this. + baseUrl: 'http://localhost:${appPort}/geonetwork/srv/eng/', - // ----- Options to be passed to minijasminenode ----- - // - // See the full list at https://github.com/juliemr/minijasminenode - jasmineNodeOpts: { - // onComplete will be called just before the driver quits. - onComplete: null, - // If true, display spec names. - isVerbose: false, - // If true, print colors to the terminal. - showColors: false, - // If true, include stack traces in failures. - includeStackTrace: true, - // Default time to wait in ms before a test fails. - defaultTimeoutInterval: 30000 - } - + // ----- Options to be passed to minijasminenode ----- + // + // See the full list at https://github.com/juliemr/minijasminenode + jasmineNodeOpts: { + // onComplete will be called just before the driver quits. + onComplete: null, + // If true, display spec names. + isVerbose: false, + // If true, print colors to the terminal. + showColors: false, + // If true, include stack traces in failures. + includeStackTrace: true, + // Default time to wait in ms before a test fails. + defaultTimeoutInterval: 30000 + } + - 8844 - 8843 - 8012 - ${project.build.directory}/geonetworkWar - - + 8844 + 8843 + 8012 + ${project.build.directory}/geonetworkWar + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + ${project.basedir} + + *.db + jcs_caching/** + logs/** + + + + + + + + + + e2eTests + + - - org.apache.maven.plugins - maven-clean-plugin + + org.apache.maven.plugins + maven-resources-plugin + + + protractor-config-first-copy + process-test-resources + + copy-resources + - - - ${project.basedir} - - *.db - jcs_caching/** - logs/** - - - + + ${*} + + ${project.build.outputDirectory}/combinedProtractorTemplate + + + + protractorConfig + true + + - - - - - - e2eTests - - - - - org.apache.maven.plugins - maven-resources-plugin - - - protractor-config-first-copy - process-test-resources - - copy-resources - - - - ${*} - - ${project.build.outputDirectory}/combinedProtractorTemplate - - - protractorConfig - true - - - - - - protractor-config-second-copy - process-test-resources - - copy-resources - - - - ${protractorConfig} - - - ${project.build.outputDirectory}/combinedProtractorTemplate - true - - - - - - - - com.github.eirslett - frontend-maven-plugin - 0.0.11 - - - - install node and npm - - install-node-and-npm - - generate-resources - - ${node.version} - ${npm.version} - - + + + protractor-config-second-copy + process-test-resources + + copy-resources + + + + ${protractorConfig} + + + ${project.build.outputDirectory}/combinedProtractorTemplate + + true + + + + + + + + com.github.eirslett + frontend-maven-plugin + 0.0.11 - - npm download modules - - npm - - generate-resources - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - run_protractor_admin_tests - - exec - - integration-test - - ${project.basedir}/node/node - - ${project.basedir}/node_modules/protractor/lib/cli.js - ${protractorConfig}/test-admin-cfg.js - - ${project.basedir} - - - - - - - - - org.codehaus.gmaven - groovy-maven-plugin - 2.0 - - - - Find Selenium Jar - - execute - - process-test-resources - - - if (file.name.startsWith("selenium-server-standalone")) { - jarsFound << file - } - } + + + install node and npm + + install-node-and-npm + + generate-resources + + ${node.version} + ${npm.version} + + - if (jarsFound.isEmpty()) { - throw new AssertionError("No selenium jar found in $base") - } + + npm download modules + + npm + + generate-resources + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + run_protractor_admin_tests + + exec + + integration-test + + ${project.basedir}/node/node + + ${project.basedir}/node_modules/protractor/lib/cli.js + ${protractorConfig}/test-admin-cfg.js + + ${project.basedir} + + + + + + + + + org.codehaus.gmaven + groovy-maven-plugin + 2.0 + + + + Find Selenium Jar + + execute + + process-test-resources + + + if (file.name.startsWith("selenium-server-standalone")) { + jarsFound << file + } + } + if (jarsFound.isEmpty()) { + throw new AssertionError("No selenium jar found in $base") + } - ]]> - - - - - Create Test Data Directory - - execute - - generate-resources - - + + + + + Create Test Data Directory + + execute + + generate-resources + + - def xml = new groovy.xml.MarkupBuilder(writer) - xml.overrides { - spring { - set (bean: "jdbcDataSource", property:"Url", value:"jdbc:h2:${datadir.path}/e2egeonetwork;LOCK_TIMEOUT=20000;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE") - } - } + // edit the configuration so that the h2 database is created in the workspace (so it is correctly cleaned up after runs) + def overridesFile = new File(datadir, 'e2e-tests-overrides.xml') + overridesFile.withWriter { writer -> + def xml = new groovy.xml.MarkupBuilder(writer) + xml.overrides { + spring { + set(bean: "jdbcDataSource", property: "Url", value: "jdbc:h2:${datadir.path}/e2egeonetwork;LOCK_TIMEOUT=20000;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE") } - System.setProperty('geonetwork.jeeves.configuration.overrides.file', overridesFile.absolutePath) - ]]> - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy-geonetwork-war - generate-test-resources - - unpack - - - - - - - ${project.groupId} - web-app - ${project.version} - war - - - ${geonetworkWar} - true - - - - org.mortbay.jetty - jetty-maven-plugin - - ${project.basedir}/../web/jetty-context.xml - - - ${appPort} - 60000 - 20000 - - - ${sslAppPort} - ${project.basedir}/../web/keystore.jks - password - password - ${project.basedir}/../web/keystore.jks - password - 60000 - 20000 - - - ${geonetworkWar} - - /geonetwork - - GEONETWORK_E2E_TEST_STOP - ${jetty.stop.port} - - - - start-jetty - pre-integration-test - - run-exploded - - - 0 - true - - - - stop-jetty - post-integration-test - - stop - - - - - - - - - windows - - - windows - - - - chrome - ${basedir}/chromedriver/win32/chromedriver.exe - - - - linux32 - - - linux - x86 - - - - firefox - ${basedir}/chromedriver/linux32/chromedrivere - - - - linuxAmd64 - - - linux - amd64 - - - - firefox - ${basedir}/chromedriver/linux64/chromedriver - - - - linux64_64 - - - linux - x86_64 - - - - firefox - ${basedir}/chromedriver/linux64/chromedriver - - - - mac - - - mac - - - - safari - ${basedir}/chromedriver/mac32/chromedriver - - - - chrome - - chrome - - - - ie - - - windows - - - - - chrome - - - - safari - - - mac - - - - safari - - - + } + } + System.setProperty('geonetwork.jeeves.configuration.overrides.file', overridesFile.absolutePath) + ]]> + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + copy-geonetwork-war + generate-test-resources + + unpack + + + + + + + ${project.groupId} + web-app + ${project.version} + war + + + ${geonetworkWar} + true + + + + org.mortbay.jetty + jetty-maven-plugin + + ${project.basedir}/../web/jetty-context.xml + + + ${appPort} + 60000 + 20000 + + + ${sslAppPort} + ${project.basedir}/../web/keystore.jks + password + password + ${project.basedir}/../web/keystore.jks + password + 60000 + 20000 + + + ${geonetworkWar} + + /geonetwork + + GEONETWORK_E2E_TEST_STOP + ${jetty.stop.port} + + + + start-jetty + pre-integration-test + + run-exploded + + + 0 + true + + + + stop-jetty + post-integration-test + + stop + + + + + + + + + windows + + + windows + + + + chrome + ${basedir}/chromedriver/win32/chromedriver.exe + + + + linux32 + + + linux + x86 + + + + firefox + ${basedir}/chromedriver/linux32/chromedrivere + + + + linuxAmd64 + + + linux + amd64 + + + + firefox + ${basedir}/chromedriver/linux64/chromedriver + + + + linux64_64 + + + linux + x86_64 + + + + firefox + ${basedir}/chromedriver/linux64/chromedriver + + + + mac + + + mac + + + + safari + ${basedir}/chromedriver/mac32/chromedriver + + + + chrome + + chrome + + + + ie + + + windows + + + + + chrome + + + + safari + + + mac + + + + safari + + + diff --git a/events/pom.xml b/events/pom.xml index f2107b6822b..b92c3554c51 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -21,8 +21,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + 4.0.0 geonetwork @@ -37,13 +38,13 @@ http://geonetwork-opensource.org - org.springframework - spring-context + org.springframework + spring-context - ${project.groupId} - domain - ${project.version} + ${project.groupId} + domain + ${project.version} diff --git a/harvesters/pom.xml b/harvesters/pom.xml index f4867415e4c..4bd3749e103 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -22,82 +22,83 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - harvesters - GeoNetwork harvesters + harvesters + GeoNetwork harvesters - - - org.geonetwork-opensource - core - ${project.version} - - - org.geonetwork-opensource - csw-server - ${project.version} - - - com.github.lookfirst - sardine - - - org.springframework - spring-test - - - org.mockito - mockito-all - - - com.h2database - h2 - test - - - ${project.groupId} - domain - ${project.version} - tests - test - - - ${project.groupId} - core - ${project.version} - tests - test - + + + org.geonetwork-opensource + core + ${project.version} + + + org.geonetwork-opensource + csw-server + ${project.version} + + + com.github.lookfirst + sardine + + + org.springframework + spring-test + + + org.mockito + mockito-all + + + com.h2database + h2 + test + + + ${project.groupId} + domain + ${project.version} + tests + test + + + ${project.groupId} + core + ${project.version} + tests + test + - + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index 603f43a041a..3db2657b471 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -22,76 +22,77 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - health-monitor - GeoNetwork health monitor + health-monitor + GeoNetwork health monitor - + - - org.geonetwork-opensource - core - ${project.version} - + + org.geonetwork-opensource + core + ${project.version} + - - ${project.groupId} - csw-server - ${project.version} - - - ${project.groupId} - harvesters - ${project.version} - + + ${project.groupId} + csw-server + ${project.version} + + + ${project.groupId} + harvesters + ${project.version} + - - - com.yammer.metrics - metrics-core - - - com.yammer.metrics - metrics-servlet - - - com.yammer.metrics - metrics-web - - - com.yammer.metrics - metrics-log4j - + + + com.yammer.metrics + metrics-core + + + com.yammer.metrics + metrics-servlet + + + com.yammer.metrics + metrics-web + + + com.yammer.metrics + metrics-log4j + - + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index b08598d9547..6ef18304771 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -22,137 +22,137 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 - inspire-atom - GeoNetwork INSPIRE Atom + inspire-atom + GeoNetwork INSPIRE Atom - - - ${project.groupId} - core - ${project.version} - + + + ${project.groupId} + core + ${project.version} + - - ${project.groupId} - common - ${project.version} - + + ${project.groupId} + common + ${project.version} + - - ${project.groupId} - services - ${project.version} - + + ${project.groupId} + services + ${project.version} + - - - org.hibernate - hibernate-jpamodelgen - 1.2.0.Final - - - org.hibernate - hibernate-entitymanager - - - org.springframework - spring-context - - - org.springframework - spring-orm - - - org.springframework - spring-tx - - - org.springframework.data - spring-data-jpa - - - org.springframework - spring-test - test - - - org.springframework.security - spring-security-core - - - com.h2database - h2 - test - - + + + org.hibernate + hibernate-jpamodelgen + 1.2.0.Final + + + org.hibernate + hibernate-entitymanager + + + org.springframework + spring-context + + + org.springframework + spring-orm + + + org.springframework + spring-tx + + + org.springframework.data + spring-data-jpa + + + org.springframework + spring-test + test + + + org.springframework.security + spring-security-core + + + com.h2database + h2 + test + + - - - - maven-jar-plugin - 2.5 - - - test-jar - - test-jar - - - - - - - org.bsc.maven - maven-processor-plugin - - - process - - process - - generate-sources - - target/metamodel - - org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.9.1 - - - add-source - generate-sources - - add-source - - - - target/metamodel - - - - - - - + + + + maven-jar-plugin + 2.5 + + + test-jar + + test-jar + + + + + + + org.bsc.maven + maven-processor-plugin + + + process + + process + + generate-sources + + target/metamodel + + org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.9.1 + + + add-source + generate-sources + + add-source + + + + target/metamodel + + + + + + + - - ${basedir}/.. - + + ${basedir}/.. + diff --git a/jmeter/pom.xml b/jmeter/pom.xml index 61a429159ad..b20bfddee8a 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -22,7 +22,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + 4.0.0 org.geonetwork-opensource @@ -47,7 +49,7 @@ admin /geonetwork/srv/eng /geonetwork/srv/eng - + ${basedir}/target/geonetworkWar @@ -91,7 +93,7 @@ ${basedir}/target/site-web - + @@ -102,7 +104,9 @@ 1.1.0 Performance Report - The following reports are the result from running the jmeter testplan ${basedir}/src/main/resources/jmeter_test_plan.jmx + The following reports are the result from running the jmeter testplan + ${basedir}/src/main/resources/jmeter_test_plan.jmx + target/site-web true true diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index d4f3372cd99..3292068eb83 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -21,70 +21,71 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - 4.0.0 + 4.0.0 - - org.geonetwork-opensource - geonetwork - 3.1.0-SNAPSHOT - + + org.geonetwork-opensource + geonetwork + 3.1.0-SNAPSHOT + - - - - org.geonetwork-opensource - oaipmh - jar - Oaipmh modules - + + + + org.geonetwork-opensource + oaipmh + jar + Oaipmh modules + Oaipmh project. - - - General Public License (GPL) - http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt - repo - - + + + General Public License (GPL) + http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + repo + + - - - org.apache.httpcomponents - httpclient - - - ${project.groupId} - domain - ${project.version} - - + + + org.apache.httpcomponents + httpclient + + + ${project.groupId} + domain + ${project.version} + + - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - - - ${basedir}/.. - + + + run-static-analysis + + + !skipTests + + + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + + + + ${basedir}/.. + diff --git a/pom.xml b/pom.xml index 30a43852a1f..25d09eeb528 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,9 @@ ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, ~ Rome - Italy. email: geonetwork@osgeo.org --> - + 4.0.0 org.geonetwork-opensource @@ -31,7 +33,8 @@ GeoNetwork opensource GeoNetwork opensource is a standards based, Free and Open Source catalog application to manage spatially referenced - resources through the web. + resources through the web. + http://geonetwork-opensource.org @@ -57,7 +60,8 @@ geonetwork-users-fr@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geonetwork-users-fr https://lists.sourceforge.net/lists/options/geonetwork-users-fr - http://osgeo-org.1560.x6.nabble.com/GeoNetwork-users-francophone-f3880536.html + http://osgeo-org.1560.x6.nabble.com/GeoNetwork-users-francophone-f3880536.html + Usuarios (es) @@ -114,16 +118,16 @@ - - org.codehaus.mojo - jslint-maven-plugin - 1.0.1 - - - org.bsc.maven - maven-processor-plugin + + org.codehaus.mojo + jslint-maven-plugin + 1.0.1 + + + org.bsc.maven + maven-processor-plugin 2.2.3 - + org.apache.maven.plugins maven-resources-plugin @@ -149,16 +153,16 @@ exec-maven-plugin 1.2 - - org.apache.maven.plugins - maven-release-plugin - 2.0 - - - org.mortbay.jetty - jetty-maven-plugin - ${jetty.version} - + + org.apache.maven.plugins + maven-release-plugin + 2.0 + + + org.mortbay.jetty + jetty-maven-plugin + ${jetty.version} + org.codehaus.mojo findbugs-maven-plugin @@ -168,20 +172,21 @@ Default true true - ${rootProjectDir}/code_quality/findbugs-excludes.xml + ${rootProjectDir}/code_quality/findbugs-excludes.xml + false false - + org.apache.maven.plugins @@ -223,7 +228,8 @@ 1.7 true UTF-8 - -proc:none + -proc:none + @@ -290,40 +296,40 @@ ${project.build.directory}/release - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - -Dfile.encoding=UTF-8 -Xmx512M - - alphabetical - true - 4 - - **/*PerformanceTest.java - - - - - org.zeroturnaround - jrebel-maven-plugin - 1.1.5 - - false - true - - - - generate-rebel-xml - process-resources - - generate - - - - + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + -Dfile.encoding=UTF-8 -Xmx512M + + alphabetical + true + 4 + + **/*PerformanceTest.java + + + + + org.zeroturnaround + jrebel-maven-plugin + 1.1.5 + + false + true + + + + generate-rebel-xml + process-resources + + generate + + + + @@ -368,17 +374,17 @@ jts 1.13 - - com.github.lookfirst - sardine - 5.1-GEONETWORK - + + com.github.lookfirst + sardine + 5.1-GEONETWORK + - - org.codehaus.groovy - groovy-all - 2.3.7 - + + org.codehaus.groovy + groovy-all + 2.3.7 + @@ -510,11 +516,11 @@ batik-ext 1.6 - - org.slf4j - slf4j-api - 1.7.5 - + + org.slf4j + slf4j-api + 1.7.5 + org.slf4j slf4j-log4j12 @@ -535,8 +541,8 @@ xercesImpl 2.11.0 - + xml-resolver xml-resolver-patched @@ -590,11 +596,11 @@ 2.5.3 --> - - org.eclipse.core - org.eclipse.core.runtime - 3.7.0 - + + org.eclipse.core + org.eclipse.core.runtime + 3.7.0 + @@ -801,7 +807,7 @@ junit junit 4.10 - test + test org.mockito @@ -825,9 +831,9 @@ - - - + + + org.postgis @@ -876,16 +882,16 @@ spring-context ${spring.version} - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + org.springframework spring-context-support @@ -895,24 +901,24 @@ org.springframework.security spring-security-core ${spring.security.version} - - - org.springframework - spring-expression - - - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - + + + org.springframework + spring-expression + + + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + org.springframework.security spring-security-cas ${spring.security.version} @@ -932,62 +938,62 @@ spring-security-web ${spring.security.version} - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-aspects - ${spring.version} - + + org.springframework + spring-test + ${spring.version} + test + + + org.springframework + spring-aspects + ${spring.version} + - - - org.hibernate - hibernate-entitymanager - 4.3.6.Final - - - org.hibernate - hibernate-ehcache - 4.3.6.Final - - - org.springframework.data - spring-data-jpa - 1.4.1.RELEASE - + + + org.hibernate + hibernate-entitymanager + 4.3.6.Final + + + org.hibernate + hibernate-ehcache + 4.3.6.Final + + + org.springframework.data + spring-data-jpa + 1.4.1.RELEASE + - + com.google.code.findbugs jsr305 2.0.1 - net.sf.json-lib - json-lib - 2.4 - jdk15 + net.sf.json-lib + json-lib + 2.4 + jdk15 - xom - xom - 1.1 + xom + xom + 1.1 + + + org.xhtmlrenderer + flying-saucer-pdf-itext5 + ${flying-saucer} + + + com.itextpdf + itextpdf + + - - org.xhtmlrenderer - flying-saucer-pdf-itext5 - ${flying-saucer} - - - com.itextpdf - itextpdf - - - com.fasterxml.jackson.core @@ -1027,12 +1033,12 @@ test - - com.google.jimfs - jimfs - 1.0 - test - + + com.google.jimfs + jimfs + 1.0 + test + @@ -1056,7 +1062,7 @@ Boundless repository http://repo.boundlessgeo.com/main/ - + false diff --git a/release/pom.xml b/release/pom.xml index 62e84e05bfc..071151af7ba 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -1,6 +1,6 @@ - + 4.0.0 @@ -18,7 +18,7 @@ release jar Release module - Use to create distribution packages. + Use to create distribution packages. diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index 5ee9056d2d2..e6956d38b94 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -22,96 +22,97 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - geonetwork - org.geonetwork-opensource - 3.1.0-SNAPSHOT - - 4.0.0 - jar + + + geonetwork + org.geonetwork-opensource + 3.1.0-SNAPSHOT + + 4.0.0 + jar - schema-tests - Tests for schema plugins + schema-tests + Tests for schema plugins - - - org.codehaus.groovy - groovy-all - - - ${project.groupId} - services - ${project.version} - test - - - ${project.groupId} - services - ${project.version} - tests - test - - - ${project.groupId} - core - ${project.version} - tests - test - - - ${project.groupId} - domain - ${project.version} - tests - test - - - ${project.groupId} - schema-iso19139 - ${project.version} - - - org.mockito - mockito-all - test - - + + + org.codehaus.groovy + groovy-all + + + ${project.groupId} + services + ${project.version} + test + + + ${project.groupId} + services + ${project.version} + tests + test + + + ${project.groupId} + core + ${project.version} + tests + test + + + ${project.groupId} + domain + ${project.version} + tests + test + + + ${project.groupId} + schema-iso19139 + ${project.version} + + + org.mockito + mockito-all + test + + - + + + + maven-jar-plugin + 2.5 + + + test-jar + + test-jar + + + + + + + + + + run-static-analysis + + + !skipTests + + + - - maven-jar-plugin - 2.5 - - - test-jar - - test-jar - - - - + + org.codehaus.mojo + findbugs-maven-plugin + - - - - - run-static-analysis - - - !skipTests - - - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - - + + + diff --git a/schemas/config-editor-doc.xsl b/schemas/config-editor-doc.xsl index 5189475f132..596ce1e9c51 100644 --- a/schemas/config-editor-doc.xsl +++ b/schemas/config-editor-doc.xsl @@ -23,77 +23,78 @@ --> - - - - - + + + + + - - .. _creating-custom-editor: - Customizing editor - ################## - - - - - .. _creating-custom-editor-: + + .. _creating-custom-editor: + Customizing editor + ################## + + + + + .. _creating-custom-editor-: + + + + + + Attributes: + + + - **** + + + + + + + + + + + - **** + + - - - Attributes: - - - - **** - - - - - - - - - - - - **** - - - - - - - - - - - Child elements: - - - - - , Optional element - - - , Mandatory element - - - , Zero or more - - - , One or more - - - - - + - - - \ No newline at end of file + + + + Child elements: + + - + + , Optional element + + + , Mandatory element + + + , Zero or more + + + , One or more + + + + + + + + + diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index 079a58366db..7904a4b4994 100644 --- a/schemas/csw-record/pom.xml +++ b/schemas/csw-record/pom.xml @@ -1,6 +1,6 @@ - schemas diff --git a/schemas/csw-record/src/main/plugin/csw-record/convert/oai_dc.xsl b/schemas/csw-record/src/main/plugin/csw-record/convert/oai_dc.xsl index 0955223d61b..95e8a280968 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/convert/oai_dc.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/convert/oai_dc.xsl @@ -23,47 +23,45 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/schemas/csw-record/src/main/plugin/csw-record/convert/xml_csw-record.xsl b/schemas/csw-record/src/main/plugin/csw-record/convert/xml_csw-record.xsl index b822ed73a40..98d233eaf73 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/convert/xml_csw-record.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/convert/xml_csw-record.xsl @@ -23,16 +23,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + @@ -40,14 +37,14 @@ - - + + - - - + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/extract-date-modified.xsl b/schemas/csw-record/src/main/plugin/csw-record/extract-date-modified.xsl index 2c8da3e95eb..8e2cafd13fd 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/extract-date-modified.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/extract-date-modified.xsl @@ -22,16 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/extract-gml.xsl b/schemas/csw-record/src/main/plugin/csw-record/extract-gml.xsl index ba78aa40d71..d731d8e75a4 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/extract-gml.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/extract-gml.xsl @@ -22,38 +22,41 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - ,, ,, ,, ,, , - - - - - - + + + + + + + + + + + + + + + + ,, + ,, ,, ,, + , + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/extract-thumbnails.xsl b/schemas/csw-record/src/main/plugin/csw-record/extract-thumbnails.xsl index eab64a05de3..a26c12390a3 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/extract-thumbnails.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/extract-thumbnails.xsl @@ -22,14 +22,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/extract-uuid.xsl b/schemas/csw-record/src/main/plugin/csw-record/extract-uuid.xsl index dd82f878219..b0775c9cb3a 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/extract-uuid.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/extract-uuid.xsl @@ -22,15 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/index-fields/default.xsl b/schemas/csw-record/src/main/plugin/csw-record/index-fields/default.xsl index f5ee266c409..5bac7a513f8 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/index-fields/default.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/index-fields/default.xsl @@ -22,28 +22,28 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - + + + + + + + + + + @@ -51,115 +51,118 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/index-fields/language-default.xsl b/schemas/csw-record/src/main/plugin/csw-record/index-fields/language-default.xsl index 8457fa404f5..5935de653d6 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/index-fields/language-default.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/index-fields/language-default.xsl @@ -23,29 +23,26 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - + + + + + + + + + + + + - - - - - - diff --git a/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-brief.xsl b/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-brief.xsl index 01538203abd..3dbbb4bf1b3 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-brief.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-brief.xsl @@ -23,11 +23,10 @@ --> - - diff --git a/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-rdf.xsl b/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-rdf.xsl index 2172e640c03..1a8f27897f4 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-rdf.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/layout/tpl-rdf.xsl @@ -22,17 +22,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-brief.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-brief.xsl index d80676361e2..a44c9fe38ef 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-brief.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-brief.xsl @@ -22,35 +22,39 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - + - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-full.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-full.xsl index f3c19bd2680..44bdab7692c 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-full.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-full.xsl @@ -23,28 +23,27 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - - - - + - - - - - + + + + + + + + + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-summary.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-summary.xsl index 838d654830e..76d5c77fa64 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-summary.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/csw/csw-summary.xsl @@ -22,99 +22,127 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-edit.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-edit.xsl index 9830238b943..ffbd936d629 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-edit.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-edit.xsl @@ -22,48 +22,43 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - + + + + + + + - - + + - - - - - - - metadata - - metadata - - - + + + + + + + metadata + + metadata + + + - - - - + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-fop.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-fop.xsl index ef46fd0055b..ff3c0a109ed 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-fop.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-fop.xsl @@ -23,13 +23,13 @@ --> - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="xs" + version="2.0"> + - + @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-rdf.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-rdf.xsl index 2172e640c03..1a8f27897f4 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-rdf.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-rdf.xsl @@ -22,17 +22,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-view.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-view.xsl index b027613485a..4ffc2022b54 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/metadata-view.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/metadata-view.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -42,7 +42,7 @@ + select="/root/gui/schemas/iso19139/strings/understandResource"/> diff --git a/schemas/csw-record/src/main/plugin/csw-record/present/metadata.xsl b/schemas/csw-record/src/main/plugin/csw-record/present/metadata.xsl index 3584a2222da..5339bfde3df 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/present/metadata.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/present/metadata.xsl @@ -22,46 +22,41 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - + diff --git a/schemas/csw-record/src/main/plugin/csw-record/set-thumbnail.xsl b/schemas/csw-record/src/main/plugin/csw-record/set-thumbnail.xsl index f9e8991aeb8..44c0656639d 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/set-thumbnail.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/set-thumbnail.xsl @@ -22,24 +22,23 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + - - - - - - - + + + + + + + + + + + + + - - diff --git a/schemas/csw-record/src/main/plugin/csw-record/set-uuid.xsl b/schemas/csw-record/src/main/plugin/csw-record/set-uuid.xsl index a70d49ba615..326d398a581 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/set-uuid.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/set-uuid.xsl @@ -22,63 +22,65 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + - + + + + + + + + + + + - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/csw-record/src/main/plugin/csw-record/unset-thumbnail.xsl b/schemas/csw-record/src/main/plugin/csw-record/unset-thumbnail.xsl index 4491d4779c2..44c0656639d 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/unset-thumbnail.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/unset-thumbnail.xsl @@ -22,24 +22,23 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - diff --git a/schemas/csw-record/src/main/plugin/csw-record/update-fixed-info.xsl b/schemas/csw-record/src/main/plugin/csw-record/update-fixed-info.xsl index bb115886dfd..d7cd02b5970 100644 --- a/schemas/csw-record/src/main/plugin/csw-record/update-fixed-info.xsl +++ b/schemas/csw-record/src/main/plugin/csw-record/update-fixed-info.xsl @@ -22,107 +22,114 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index d69ab4a421a..8afca0fef97 100644 --- a/schemas/dublin-core/pom.xml +++ b/schemas/dublin-core/pom.xml @@ -1,6 +1,6 @@ - schemas diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/convert/oai_dc.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/convert/oai_dc.xsl index 5e960c1f16b..cda90e03910 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/convert/oai_dc.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/convert/oai_dc.xsl @@ -23,46 +23,45 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/extract-date-modified.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/extract-date-modified.xsl index 2fe9919d420..ad79e5bea2e 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/extract-date-modified.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/extract-date-modified.xsl @@ -23,13 +23,14 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/extract-gml.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/extract-gml.xsl index c9d3cb3ca85..8743a77f573 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/extract-gml.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/extract-gml.xsl @@ -22,28 +22,34 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - ,, ,, ,, ,, , - - - - - - + + + + + + + + + + + + + + + + + + ,, + ,, ,, ,, , + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/extract-relations.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/extract-relations.xsl index 366161dac95..26c2e0447bd 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/extract-relations.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/extract-relations.xsl @@ -22,8 +22,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/extract-thumbnails.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/extract-thumbnails.xsl index 5d64634acef..463193a7272 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/extract-thumbnails.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/extract-thumbnails.xsl @@ -23,10 +23,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/extract-uuid.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/extract-uuid.xsl index cac217a7b7e..0b2ff63714a 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/extract-uuid.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/extract-uuid.xsl @@ -23,12 +23,14 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/formatter/xsl-view/view.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/formatter/xsl-view/view.xsl index 09877d02ee0..1bc18f3ace6 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/formatter/xsl-view/view.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/formatter/xsl-view/view.xsl @@ -22,14 +22,12 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - @@ -119,11 +115,6 @@ - - - - - @@ -132,7 +123,9 @@ - + + + @@ -140,8 +133,9 @@ - + - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl index 0de91b68252..0ceaa63d98a 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/default.xsl @@ -22,11 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + xmlns:dct="http://purl.org/dc/terms/" + version="2.0"> - + @@ -99,7 +99,8 @@ - + @@ -129,9 +130,9 @@ - + @@ -151,12 +152,13 @@ - + - - + + @@ -246,11 +247,11 @@ - + - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/language-default.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/language-default.xsl index 8457fa404f5..5935de653d6 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/language-default.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/index-fields/language-default.xsl @@ -23,29 +23,26 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - + + + + + + + + + + + + - - - - - - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl index 7aee8dce3c2..ad7ede6bb2b 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/dispatcher.xsl @@ -22,11 +22,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - @@ -36,7 +33,7 @@ - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl index fa1b80231e5..00d07b2f716 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/evaluate.xsl @@ -22,15 +22,14 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/layout.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/layout.xsl index 9cdba230496..cd62f80d310 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/layout.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/layout.xsl @@ -22,12 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -35,10 +34,10 @@ - + - + @@ -54,11 +53,11 @@ + priority="300"> @@ -66,7 +65,8 @@ - + @@ -80,24 +80,25 @@ - - + - + select="ancestor::node()/gn:child[contains(@name, 'CHOICE_ELEMENT')]"/> + @@ -119,7 +120,7 @@ name(.) = 'dc:relation') and (starts-with(., 'http') or contains(. , 'resources.get') or - contains(., 'file.disclaimer'))]" /> + contains(., 'file.disclaimer'))]"/> @@ -163,7 +164,7 @@ if this element is the last element of its kind. --> + select="ancestor::node()/gn:child[contains(@name, 'CHOICE_ELEMENT')]"/> @@ -191,9 +192,10 @@ - + - + @@ -203,13 +205,13 @@ - + - - + + - + @@ -224,22 +226,22 @@ + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..),'','')/label"/> -
+
- + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/rdf-tpl.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/rdf-tpl.xsl index c6961c02130..e6f9ae15137 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/rdf-tpl.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/rdf-tpl.xsl @@ -22,23 +22,17 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - @@ -46,8 +40,8 @@ - - + + @@ -66,9 +60,9 @@ - + - + - + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-brief.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-brief.xsl index 262b79c5bce..7fbc748877f 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-brief.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-brief.xsl @@ -23,9 +23,9 @@ --> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:gn="http://www.fao.org/geonetwork" xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="xs" version="2.0"> diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-rdf.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-rdf.xsl index 5a8e87a357d..7605e2cb030 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-rdf.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/tpl-rdf.xsl @@ -22,17 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-fn.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-fn.xsl index baeba576a1b..2ef64335d2b 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-fn.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-fn.xsl @@ -22,9 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-vacuum.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-vacuum.xsl index d3acc663805..d089bd021a1 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-vacuum.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/layout/utility-vacuum.xsl @@ -22,12 +22,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-brief.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-brief.xsl index 04b8338522d..634fc12b0a9 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-brief.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-brief.xsl @@ -22,36 +22,40 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - - - + - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-full.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-full.xsl index ec32c7f4fd9..fc587237e7b 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-full.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-full.xsl @@ -23,50 +23,54 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - + - - - - - - - - - - - + - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-summary.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-summary.xsl index bb710daa5f1..2a475f56a02 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-summary.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/csw-summary.xsl @@ -22,104 +22,132 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-brief.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-brief.xsl index ca4d09c683c..aa7d1c92965 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-brief.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-brief.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-full.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-full.xsl index 4efe2589632..6dd90039e08 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-full.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-full.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-summary.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-summary.xsl index 039f8bfd273..72bd0cb69d2 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-summary.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/csw/own-summary.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-edit.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-edit.xsl index aaa46ca49d8..f76a17b6b42 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-edit.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-edit.xsl @@ -22,33 +22,31 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - + + - - + + - - - - - + + + + + - - + + - + @@ -68,7 +66,7 @@ + select="/root/gui/schemas/iso19139/strings/understandResource"/> @@ -76,9 +74,10 @@ - + -   +   @@ -90,8 +89,10 @@ - - + + + @@ -120,80 +121,81 @@ + + + + + + + metadata + + metadata + + + - - - - - - - metadata - - metadata - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - - - + + + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + title @@ -202,69 +204,69 @@ - + - + - + - + - - + + - - - + + + - + - + - + - + - - + + %Y-%m-%d - + - + - + - + - - + + - + @@ -277,23 +279,22 @@ - + - + - - - + + - + + - - - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-fop.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-fop.xsl index c6d203f1dbf..34a586c7023 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-fop.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-fop.xsl @@ -23,13 +23,13 @@ --> - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="xs" + version="2.0"> + - + @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-rdf.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-rdf.xsl index eb18af87719..7bdf8df7bc3 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-rdf.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-rdf.xsl @@ -22,28 +22,22 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - @@ -51,32 +45,38 @@ - - + + - - + + + + - - - + + + + + + + - + - + - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-view.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-view.xsl index 1f904bdcc0a..495275b9a73 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-view.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-view.xsl @@ -22,279 +22,313 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - -
@@ -304,64 +305,87 @@ - - - - - - + + + + + - - + + + + + + + + + <xsl:value-of select="dc:title"/> + + + + + + + + + + + - <xsl:value-of select="dc:title"/> + + <xsl:value-of select="dc:title"/> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - <xsl:value-of select="dc:title"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-fop.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-fop.xsl index 05c5060a03c..5cfaf2f96cd 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-fop.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-fop.xsl @@ -23,13 +23,13 @@ --> - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="xs" + version="2.0"> + - + @@ -40,4 +40,4 @@ - \ No newline at end of file + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-rdf.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-rdf.xsl index c6961c02130..e6f9ae15137 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-rdf.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-rdf.xsl @@ -22,23 +22,17 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - @@ -46,8 +40,8 @@ - - + + @@ -66,9 +60,9 @@ - + - + - + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-view.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-view.xsl index 1100e3ff876..d55a442ddcc 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-view.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata-view.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata.xsl index b5339bc9785..e28a456f1f3 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/present/metadata.xsl @@ -22,112 +22,114 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - - - + + + - + - + - + - + - + - + - + - - - - + + + + - - - - - - + + + + + + + + - + - - + + @@ -136,13 +138,14 @@
- + - @@ -164,7 +167,7 @@ - + @@ -172,8 +175,10 @@ - - + + disabled @@ -181,12 +186,13 @@ - + - + @@ -200,7 +206,7 @@ - + @@ -208,18 +214,27 @@ - - + + + + - bbb + bbb + + + -

+

+ +

@@ -231,52 +246,68 @@ - - - - - - - - <xsl:value-of select="dc:title"/> - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + <xsl:value-of select="dc:title"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -286,25 +317,37 @@ - - - - -
- - - - - - - - - -
+ + + + + + +
+ + + + + + + + + + + + + + + +
- + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-clean-changes.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-clean-changes.xsl index 12e9a32b10b..18cb3a84ae0 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-clean-changes.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-clean-changes.xsl @@ -23,9 +23,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-extract-changes.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-extract-changes.xsl index 5b303aa01cf..067f9a662a4 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-extract-changes.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-content-update-extract-changes.xsl @@ -22,9 +22,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -37,9 +37,15 @@ - - - + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-search-and-replace.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-search-and-replace.xsl index 09654926d72..d86aaeafac0 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-search-and-replace.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/massive-search-and-replace.xsl @@ -22,11 +22,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - @@ -84,8 +82,8 @@ - - + + @@ -106,8 +104,8 @@ - - + + + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="2.0"> @@ -37,7 +37,7 @@ Stylesheet used to update metadata adding a reference to a parent record. + select="dc:*|dct:*[name() != 'dct:references']"/> @@ -58,7 +58,7 @@ Stylesheet used to update metadata adding a reference to a parent record. and URL not already here. --> - + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/onlinesrc-remove.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/onlinesrc-remove.xsl index fd24bd6f557..8e07907dc00 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/onlinesrc-remove.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/onlinesrc-remove.xsl @@ -25,11 +25,11 @@ - + xmlns:geonet="http://www.fao.org/geonetwork" + version="2.0"> diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-add.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-add.xsl index c99b83ddb6c..7161a2facb0 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-add.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-add.xsl @@ -25,11 +25,11 @@ - + xmlns:geonet="http://www.fao.org/geonetwork" + version="2.0"> @@ -38,7 +38,7 @@ Stylesheet used to update metadata adding a reference to a parent record. + select="dc:*|dct:*"/> diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-remove.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-remove.xsl index e604a8bd112..4190ef4fff7 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-remove.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/parent-remove.xsl @@ -25,10 +25,10 @@ - + xmlns:geonet="http://www.fao.org/geonetwork" + version="2.0"> diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/process/vacuum.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/process/vacuum.xsl index 3dc5c4e0436..75532c777af 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/process/vacuum.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/process/vacuum.xsl @@ -23,14 +23,13 @@ --> - + Remove empty elements from this record. @@ -45,12 +44,14 @@ - + + + true - - - \ No newline at end of file + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/set-thumbnail.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/set-thumbnail.xsl index b34415f371e..8a458c113aa 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/set-thumbnail.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/set-thumbnail.xsl @@ -23,22 +23,22 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/set-uuid.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/set-uuid.xsl index 1ad47282f04..d9335b87fa1 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/set-uuid.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/set-uuid.xsl @@ -23,51 +23,53 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + - - - + - + + + + + + + + + + + - - - - - + + + - + + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/suggest.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/suggest.xsl index 3180cc05b82..6426b90965e 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/suggest.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/suggest.xsl @@ -23,26 +23,26 @@ --> + xmlns:saxon="http://saxon.sf.net/" + extension-element-prefixes="saxon" + version="2.0"> - +

vacuum

 - + - + - + @@ -61,5 +61,5 @@ - - \ No newline at end of file + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/unset-thumbnail.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/unset-thumbnail.xsl index beee60872a8..8a458c113aa 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/unset-thumbnail.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/unset-thumbnail.xsl @@ -23,22 +23,22 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/schemas/dublin-core/src/main/plugin/dublin-core/update-fixed-info.xsl b/schemas/dublin-core/src/main/plugin/dublin-core/update-fixed-info.xsl index d881848d5f3..c3fbad2c6b7 100644 --- a/schemas/dublin-core/src/main/plugin/dublin-core/update-fixed-info.xsl +++ b/schemas/dublin-core/src/main/plugin/dublin-core/update-fixed-info.xsl @@ -23,8 +23,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index c59f0bd843e..aa5b9832bb6 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -22,8 +22,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - schemas diff --git a/schemas/iso19110/src/main/plugin/iso19110/convert/oai_dc.xsl b/schemas/iso19110/src/main/plugin/iso19110/convert/oai_dc.xsl index 4b16190ce44..9240300d025 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/convert/oai_dc.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/convert/oai_dc.xsl @@ -23,56 +23,62 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + - + - + - - + + - - - + + + - - - + + + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - - + + + + + + + - + - - - + + + - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/extract-date-modified.xsl b/schemas/iso19110/src/main/plugin/iso19110/extract-date-modified.xsl index 23d4b6d7561..5d7b59fe6fb 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/extract-date-modified.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/extract-date-modified.xsl @@ -23,13 +23,15 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/extract-gml.xsl b/schemas/iso19110/src/main/plugin/iso19110/extract-gml.xsl index 4e86f3d74ab..10512f8f032 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/extract-gml.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/extract-gml.xsl @@ -22,9 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/extract-thumbnails.xsl b/schemas/iso19110/src/main/plugin/iso19110/extract-thumbnails.xsl index 70cb1226384..f5e58f3db80 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/extract-thumbnails.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/extract-thumbnails.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/extract-uuid.xsl b/schemas/iso19110/src/main/plugin/iso19110/extract-uuid.xsl index 8959aa7899e..6fa93981063 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/extract-uuid.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/extract-uuid.xsl @@ -23,12 +23,14 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/formatter/xsl-view/view.xsl b/schemas/iso19110/src/main/plugin/iso19110/formatter/xsl-view/view.xsl index da97544e967..6c0c162ec6e 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/formatter/xsl-view/view.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/formatter/xsl-view/view.xsl @@ -22,21 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - @@ -57,8 +52,6 @@ select="/root/(gfc:FC_FeatureType|gfc:FC_FeatureCatalogue)"/> - - - - - - - - + + + @@ -174,7 +164,8 @@ - + @@ -199,4 +190,4 @@ - \ No newline at end of file + diff --git a/schemas/iso19110/src/main/plugin/iso19110/index-fields/default.xsl b/schemas/iso19110/src/main/plugin/iso19110/index-fields/default.xsl index 8038c4e241d..8bcd5cc673d 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/index-fields/default.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/index-fields/default.xsl @@ -22,145 +22,152 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [ - {"name": "", + [ + + {"name": "", "definition": "", "type": "" - ,"values": [{ + ,"values": [ + { "label": "", "code": "", "definition": ""} - , - ] - } + , + + ] + + } , - ] + + ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/index-fields/language-default.xsl b/schemas/iso19110/src/main/plugin/iso19110/index-fields/language-default.xsl index a87fbb22d09..eb19a508eb7 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/index-fields/language-default.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/index-fields/language-default.xsl @@ -23,29 +23,26 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - - + + + + + + + + + + + + - - - - - - diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/dispatcher.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/dispatcher.xsl index 21af5e0df7e..b776c716d76 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/dispatcher.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/dispatcher.xsl @@ -22,16 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - + + @@ -50,7 +44,6 @@ - diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl index 6e9c8bfd5ee..d8db928b337 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/evaluate.xsl @@ -22,20 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - + - diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/layout-custom-fields.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/layout-custom-fields.xsl index cbc47763401..eeab08bf1fc 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/layout-custom-fields.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/layout-custom-fields.xsl @@ -22,23 +22,21 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + - + @@ -48,14 +46,14 @@ - + - + + @@ -41,19 +41,20 @@ - + - - - + + + select="gn-fn-metadata:getLabel($schema, $name, $labels)/label"/> @@ -77,7 +78,7 @@ @@ -102,7 +103,7 @@ + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> @@ -116,25 +117,24 @@ - + match="*[gco:CharacterString|gco:Date|gco:DateTime|gco:Integer|gco:Decimal| + gco:Boolean|gco:Real|gco:Measure|gco:Length|gco:Distance|gco:Angle| + gco:Scale|gco:RecordType|gmx:MimeFileType|gmd:URL|gco:LocalName]"> + select="gn-fn-metadata:getLabel($elementSchemaIdentifier, name(), $elementSchema, name(..), $isoType, $xpath)"/> @@ -142,17 +142,17 @@ @@ -167,11 +167,11 @@ + --> @@ -180,13 +180,14 @@ - + - @@ -210,7 +211,7 @@ + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> + select="if ($isEditing) then concat(*/gn:element/@ref, '_codeListValue') else ''"/> + select="gn-fn-metadata:getCodeListValues($schema, name(*[@codeListValue]), $codelists)"/> - - @@ -237,7 +236,7 @@ - + [] diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-brief.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-brief.xsl index 74644869cf1..8ef89dea84a 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-brief.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-brief.xsl @@ -23,10 +23,12 @@ --> + xmlns:gn="http://www.fao.org/geonetwork" + xmlns:gfc="http://www.isotc211.org/2005/gfc" + xmlns:gmx="http://www.isotc211.org/2005/gmx" + xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="xs" version="2.0"> diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-rdf.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-rdf.xsl index eb18af87719..7bdf8df7bc3 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-rdf.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/tpl-rdf.xsl @@ -22,28 +22,22 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - @@ -51,32 +45,38 @@ - - + + - - + + + + - - - + + + + + + + - + - + - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/utility-fn.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/utility-fn.xsl index 72b8ce41c3f..691f336ab4e 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/layout/utility-fn.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/layout/utility-fn.xsl @@ -22,18 +22,18 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -43,7 +43,7 @@ + select="gn-fn-metadata:getFieldType($editorConfig, $name, $childName)"/> diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-brief.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-brief.xsl index 0cb83e2e441..bf8d6d9a07f 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-brief.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-brief.xsl @@ -22,51 +22,56 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - FeatureCatalogue - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + FeatureCatalogue + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-full.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-full.xsl index f198dcf8b0f..b9ab6cd90f1 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-full.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-full.xsl @@ -22,78 +22,86 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - FeatureCatalogue - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + FeatureCatalogue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-summary.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-summary.xsl index 447c73f5d04..b4e63c181cd 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-summary.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/csw-summary.xsl @@ -22,74 +22,88 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - FeatureCatalogue - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + FeatureCatalogue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-brief.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-brief.xsl index df73568e436..f33f0f35cf9 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-brief.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-brief.xsl @@ -22,11 +22,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-full.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-full.xsl index cb21973e052..f708a7a696c 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-full.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-full.xsl @@ -22,11 +22,9 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-summary.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-summary.xsl index a2fd2c9c731..48b41c79d1d 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-summary.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/gfc-summary.xsl @@ -22,14 +22,12 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - + + - + @@ -41,14 +39,14 @@ - + - + - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-brief.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-brief.xsl index 43725e202b3..5bb2f2b6518 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-brief.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-brief.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-full.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-full.xsl index 1ecc79c8a5c..418696b0e45 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-full.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-full.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-summary.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-summary.xsl index e85543c382f..f75864a4464 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-summary.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/csw/own-summary.xsl @@ -22,7 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - \ No newline at end of file + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-edit.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-edit.xsl index d74a7749495..e2178809579 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/metadata-edit.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/metadata-edit.xsl @@ -24,44 +24,46 @@ - + - + - - + + - - + + - + @@ -70,608 +72,651 @@ advanced - + - - - + + + - - - + + + + + + + + + iso19139 + + + + + + + + + + + + + + - - - - - iso19139 - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + - + - - - + + + - - - + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + 3 - 1 - - - - - - - - iso19139 - - - - - - - - - - - - - - - - - - - - + ">3 + + 1 + + + + + + + + iso19139 + + + + + + + + + + + - - - + + + + + + + + - - - + + + - - - - - iso19139 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - %Y-%m-%d - %Y-%m-%dT%H:%M:00 - - - - - - - - - - - - - - - - - + + iso19139 + + + + - - - - - + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %Y-%m-%d + + + %Y-%m-%dT%H:%M:00 + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - - - - - + + + + + + + + + + + + + + + + + <xsl:value-of + select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString|gfc:typeName/gco:LocalName"/> + + + + + + + - - - + + - <xsl:value-of select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString|gfc:typeName/gco:LocalName"/> + <xsl:value-of select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString"/> - - - - - - - - - - <xsl:value-of select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString"/> - - - - - - - - - - - - featureCatalogue - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + featureCatalogue + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + - - - + + + - - - + + + - - - + + + - - - + + + - +
+ 		+ + + + + + + + + + + + + + + ( + [] + : + ) + + + +
    + +
  • + + + + [] : + +
    • +     +
+ + + + + - +
+
+ 		- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 		- - - - - - - - - - - - - - - ( - [] : - ) - - - -
    - -
  • - - [] : - -
    • -     -
- - - - - - -
-
+ + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + n + + + + + +
+
- - - - - - - -
- - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - -
- - - - - - - - - - - - - n - - - - - -
-
- - - - - - -
- - - + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + logo + + + + + + + + + +
+ + + + + + + + - - - - - - - - - - logo - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - | -   - - + + + + + + + + + + - - - - - - - - - - - - - - - + | +   + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- -
- - - - - - - - - - n - - - - - -
- - - - - - - - - - - - - - - -
-

- + - - - - - - - - - - iso19139 - - - - - - - - + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + - + + +
+ + + +
+ + + + + + + + - + + + n + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + +
+
+
+
+ + + + + + + + + + + + iso19139 + + + + + + + + + + + + + - + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/present/metadata.xsl b/schemas/iso19110/src/main/plugin/iso19110/present/metadata.xsl index 5ad70178fc0..166195f8cf2 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/present/metadata.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/present/metadata.xsl @@ -24,655 +24,695 @@ - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + iso19139 + + + + + + + + + + + + + + - - - - - iso19139 - - - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + - + - - - + + + - - - + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + 3 - 1 - - - - - - - - iso19139 - - - - - - - - - - - - - - - - - - - - + ">3 + + 1 + + + + + + + + iso19139 + + + + + + + + + + + - - - + + + + + + + + - - - + + + - - - - - iso19139 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - %Y-%m-%d - %Y-%m-%dT%H:%M:00 - - - - - - - - - - - - - - - - - + + iso19139 + + + + - - - - - + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %Y-%m-%d + + + %Y-%m-%dT%H:%M:00 + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:value-of select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString"/> + + + + + + + + + + + + featureCatalogue + + + + + + + + + + + + + + + + - - - + + + - + + + + - - - + + + + + + + + + - - - - + + + + - - - <xsl:value-of select="gmx:name/gco:CharacterString|gfc:name/gco:CharacterString"/> - - + + + + - - - - - + + + + - - - featureCatalogue - - - + - + - - - + + + + + + + - - - - - - - + - - - - + + + + - - - - + + + + + - - - - - - - - + + + - - - - + + + + + + - + +
+ - - - + + + - - - + + + - + + + + - + + + + - - - - + + + - - - +
+ 		+ + + + + + + + + + + + + + + ( + [] : + ) + + + +
    + +
  • + + + + [] : + +
    • +     +
+ + + + + - - - - - - - - - - - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 		- - - - - - - - - - - - - - - ( - [] : - ) - - - -
    - -
  • - - [] : - -
    • -     -
- - - - - - -
-
+
+ + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + - - - +
- - - - - - - - - - - -
- - - - - - - - - - - - - n - - - - - -
- 		+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + n + + + + + +
+ + + + + - - - + + + - - - - + + + + - + diff --git a/schemas/iso19110/src/main/plugin/iso19110/process/iso19110_2011_schema_update.xsl b/schemas/iso19110/src/main/plugin/iso19110/process/iso19110_2011_schema_update.xsl index 41b47b81bb9..ed3c87e7ea9 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/process/iso19110_2011_schema_update.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/process/iso19110_2011_schema_update.xsl @@ -23,71 +23,72 @@ --> - - - - - - - - - + - - - - - - - - - - - - - - + Select them: + http://localhost:8080/geonetwork/srv/fr/metadata.select?id=0&selected=add-all - - - - - - - - - - - - - - - - + Migrate: + http://localhost:8080/geonetwork/srv/en/metadata.batch.processing?process=iso19110_2011_schema_update + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/set-thumbnail.xsl b/schemas/iso19110/src/main/plugin/iso19110/set-thumbnail.xsl index 4bb1237fe75..60aa460688c 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/set-thumbnail.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/set-thumbnail.xsl @@ -22,25 +22,24 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + - - - - - - - + + + + + + + + + + + + + - - diff --git a/schemas/iso19110/src/main/plugin/iso19110/set-uuid.xsl b/schemas/iso19110/src/main/plugin/iso19110/set-uuid.xsl index 21256b8a5a9..66f0cd83922 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/set-uuid.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/set-uuid.xsl @@ -22,35 +22,36 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/unset-thumbnail.xsl b/schemas/iso19110/src/main/plugin/iso19110/unset-thumbnail.xsl index e00953cebf4..7f1102f79f8 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/unset-thumbnail.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/unset-thumbnail.xsl @@ -23,25 +23,25 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19110/src/main/plugin/iso19110/update-fixed-info.xsl b/schemas/iso19110/src/main/plugin/iso19110/update-fixed-info.xsl index cd1feab000a..12f87361d0c 100644 --- a/schemas/iso19110/src/main/plugin/iso19110/update-fixed-info.xsl +++ b/schemas/iso19110/src/main/plugin/iso19110/update-fixed-info.xsl @@ -23,124 +23,130 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + + + + + + + + true + false + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - - - - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index 363ddd86bb9..34b0263a91e 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -1,6 +1,6 @@ - schemas diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/19119ToJZKitRepository.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/19119ToJZKitRepository.xsl index 33a63219f5c..320de1cd496 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/19119ToJZKitRepository.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/19119ToJZKitRepository.xsl @@ -23,54 +23,65 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - + - + - - - Incompatible - + + + Incompatible + - + - - - + + + - + - Entry for + Entry for + + - - - xml - s - - - F - UTF-8 - negotiate - - - xml::f - html::f - + + + xml + s + + + + + + + F + UTF-8 + negotiate + + + xml::f + html::f + - - - - - - - - - + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-19119.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-19119.xsl index be3fb26f7f6..17b72a20999 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-19119.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-19119.xsl @@ -23,331 +23,352 @@ --> - + - + - uuid - eng - + uuid + eng + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - ISO 19119/2005 - - - 1.0 - - - - - - + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + ISO 19119/2005 + + + 1.0 + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - application/xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + application/xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + <gco:CharacterString> + <xsl:value-of select="ows:Title"/> + </gco:CharacterString> + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <gco:CharacterString>INSPIRE Service taxonomy</gco:CharacterString> + + + + + + + + 2010-04-22 + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - <gco:CharacterString> - <xsl:value-of select="ows:Title"/> - </gco:CharacterString> - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <gco:CharacterString>INSPIRE Service taxonomy</gco:CharacterString> - - - - - - - - 2010-04-22 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + OGC:CSW - - - - - - - - - - - - - loosely - tight - - - + + + + + + + + + + + + + loosely + + tight + + + - - - - - - - - - - - - - - HTTP-GET - HTTP-POST - WebServices - - - - - - - - - - - - + + + + + + + + + + + + + + HTTP-GET + HTTP-POST + WebServices + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-ISO19119_ISO19139.xsl index fff9760a099..ad131329e16 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCCSWGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-19119.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-19119.xsl index 996f59efff9..3b1457fd766 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-19119.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-19119.xsl @@ -23,514 +23,578 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - uuid - eng - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - ISO 19119/2005 - - - - 1.0 - - - - - - - - - - - - - - EPSG:4326 - - - - - - - - - - - - - - - - - - - - - <gco:CharacterString> - <xsl:value-of select="ows:ServiceIdentification/ows:Title"/> - </gco:CharacterString> - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OGC:SOS - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tight - - - - - - - - - - - - - - - - - - - - - HTTP-GET - HTTP-POST - WebServices - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - ( - - - HTTP-GET - HTTP-POST - WebServices - - - , - - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,, ,, ,, ,, , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + uuid + eng + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + ISO 19119/2005 + + + + 1.0 + + + + + + + + + + + + + + EPSG:4326 + + + + + + + + + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:value-of select="ows:ServiceIdentification/ows:Title"/> + </gco:CharacterString> + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OGC:SOS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tight + + + + + + + + + + + + + + + + + + + + + + HTTP-GET + HTTP-POST + WebServices + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + ( + + + HTTP-GET + HTTP-POST + WebServices + + + , + + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, ,, ,, , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl index 5ac5ad73530..5e0113623f2 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,11 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl index e5d7cafa935..baad33193ff 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCSOSGetCapabilitiesLayer-to-19139.xsl @@ -23,575 +23,626 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - ISO 19115:2003/19139 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OGC:SOS-1.0.0-http-post-observation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <gco:CharacterString> - <xsl:value-of select="//sos:ObservationOffering[gml:name=$Name]/gml:name[1]"/> - </gco:CharacterString> - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - theme - - - - - - - - - - - - - - - - - - - place - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,, ,, ,, ,, , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - &request=GetObservation&service=SOS&offering= - - &observedProperty= - - - , - - &responseFormat= - - &version=1.0.0 - - - - - - - - ( - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + ISO 19115:2003/19139 + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OGC:SOS-1.0.0-http-post-observation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:value-of select="//sos:ObservationOffering[gml:name=$Name]/gml:name[1]"/> + </gco:CharacterString> + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + theme + + + + + + + + + + + + + + + + + + + + + + place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, ,, ,, , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + &request=GetObservation&service=SOS&offering= + + &observedProperty= + + + , + + &responseFormat= + + &version=1.0.0 + + + + + + + + ( + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilities-to-ISO19119_ISO19139.xsl index 5d7dcfdbc48..6519506e08d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilitiesLayer-to-19139.xsl index 611c22cb978..058dee8f827 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilitiesLayer-to-19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWCSGetCapabilitiesLayer-to-19139.xsl @@ -22,11 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilities-to-ISO19119_ISO19139.xsl index 5d7dcfdbc48..6519506e08d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilitiesLayer-to-19139.xsl index 611c22cb978..058dee8f827 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilitiesLayer-to-19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWFSGetCapabilitiesLayer-to-19139.xsl @@ -22,11 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilities-to-ISO19119_ISO19139.xsl index 5d7dcfdbc48..6519506e08d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilitiesLayer-to-19139.xsl index 611c22cb978..058dee8f827 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilitiesLayer-to-19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMSGetCapabilitiesLayer-to-19139.xsl @@ -22,11 +22,11 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWPSGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWPSGetCapabilities-to-ISO19119_ISO19139.xsl index 5d7dcfdbc48..6519506e08d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWPSGetCapabilities-to-ISO19119_ISO19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWPSGetCapabilities-to-ISO19119_ISO19139.xsl @@ -22,10 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl index 50b4049f38b..ed8e4c9c48c 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl @@ -23,7 +23,7 @@ --> - - - - - uuid - eng - - - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + uuid + eng + + + + + + + + + + + + + + + + + + + + + + + + + + true + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - ISO 19119/2005 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - application/vnd.ogc.wms_xml - application/vnd.ogc.wfs_xml - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <gco:CharacterString><xsl:value-of select="inspire_common:Specification/inspire_common:Title"/></gco:CharacterString> - - - - - - - - - - - - - - - - See the referenced specification - - - - - - true - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + owsg:ServiceProvider| + ows11:ServiceProvider"> + + + + + + + + + + + + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + ISO 19119/2005 + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + application/vnd.ogc.wms_xml + + + application/vnd.ogc.wfs_xml + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:value-of + select="inspire_common:Specification/inspire_common:Title"/> + </gco:CharacterString> + + + + + + + + + + + + + + + + + + See the referenced specification + + + + + + true + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl index 016534f5c03..2c772e4af7b 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl @@ -23,448 +23,460 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - 21 - - - - - - - - - - - - - - - - - - - - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - ISO 19115:2003/19139 - - - - 1.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OGC:WMS-1.1.1-http-get-map - - - - OGC:WMS-1.3.0-http-get-map - - - - OGC:WFS-1.1.0-http-get-feature - - - - OGC:WFS-1.0.0-http-get-feature - - - - OGC:WCS-1.0.0-http-get-coverage - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ? - &request=GetFeature&service=WFS&typename= - - &outputFormat= - - &version=1.1.0 - - - - - - - - () - - - - - - - - - - - - - - - - ? - &request=GetFeature&service=WFS&typename= - - &outputFormat= - - &version=1.0.0 - - - - - - - - () - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + 21 + + + + + + + + + + + + + + + + + + + + + + + + true + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + ISO 19115:2003/19139 + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OGC:WMS-1.1.1-http-get-map + + + + OGC:WMS-1.3.0-http-get-map + + + + OGC:WFS-1.1.0-http-get-feature + + + + OGC:WFS-1.0.0-http-get-feature + + + + OGC:WCS-1.0.0-http-get-coverage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + &request=GetFeature&service=WFS&typename= + + &outputFormat= + + &version=1.1.0 + + + + + + + + () + + + + + + + + + + + + + + + + ? + &request=GetFeature&service=WFS&typename= + + &outputFormat= + + &version=1.0.0 + + + + + + + + () + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl index fd31611b8b1..59a3eadf603 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl @@ -23,174 +23,183 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - <gco:CharacterString> - <xsl:choose> - <xsl:when test="$ows='true'"> - <xsl:value-of select="ows:ServiceIdentification/ows:Title| - ows11:ServiceIdentification/ows11:Title"/> - </xsl:when> - <xsl:when test="name(.)='WFS_Capabilities'"> - <xsl:value-of select="wfs:Service/wfs:Title"/> - </xsl:when> - <xsl:when test="name(.)='WMS_Capabilities'"> - <xsl:value-of select="wms:Service/wms:Title"/> - </xsl:when> - <xsl:when test="name(.)='WMT_MS_Capabilities'"> - <xsl:value-of select="Service/Title"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="wcs:Service/wcs:label"/> - </xsl:otherwise> - </xsl:choose> - </gco:CharacterString> - - - - - - - - - - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:choose> + <xsl:when test="$ows='true'"> + <xsl:value-of select="ows:ServiceIdentification/ows:Title| + ows11:ServiceIdentification/ows11:Title"/> + </xsl:when> + <xsl:when test="name(.)='WFS_Capabilities'"> + <xsl:value-of select="wfs:Service/wfs:Title"/> + </xsl:when> + <xsl:when test="name(.)='WMS_Capabilities'"> + <xsl:value-of select="wms:Service/wms:Title"/> + </xsl:when> + <xsl:when test="name(.)='WMT_MS_Capabilities'"> + <xsl:value-of select="Service/Title"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="wcs:Service/wcs:label"/> + </xsl:otherwise> + </xsl:choose> + </gco:CharacterString> + + + + + + + + + + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - <gco:CharacterString><xsl:value-of select="current-grouping-key()"/></gco:CharacterString> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:value-of select="current-grouping-key()"/> + </gco:CharacterString> + + + + + + + + + + + @@ -199,11 +208,14 @@ - + + + - + @@ -211,452 +223,536 @@ - - - - - - - - - - - - - - - - - <gco:CharacterString>INSPIRE Service taxonomy</gco:CharacterString> - - - - - - - - 2010-04-22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - no conditions apply - - - - - - - - - - - - - - - - - - - no conditions apply - - - - - - - - - - - - OGC:WMS - OGC:WCS - OGC:WPS - OGC:WFS - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + no conditions apply + + + + + + + + + + + + + + + + + + + + + no conditions apply + + + + + + + + + + + + + + OGC:WMS + + OGC:WCS + OGC:WPS + OGC:WFS + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - loosely - tight - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + loosely + + tight + + + + + - - - - - - - - - WPS Process: - - - - - - - - - - - - HTTP-GET - HTTP-POST - WebServices - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Format : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <gco:CharacterString> - <xsl:choose> - <xsl:when test="name(.)='WFS_Capabilities' or name(.)='wfs:WFS_Capabilities' or $ows='true'"> - <xsl:value-of select="//wfs:FeatureType[wfs:Name=$Name]/wfs:Title"/> - </xsl:when> - <xsl:when test="name(.)='WMS_Capabilities'"> - <xsl:value-of select="//wms:Layer[wms:Name=$Name]/wms:Title"/> - </xsl:when> - <xsl:when test="name(.)='WMT_MS_Capabilities'"> - <xsl:value-of select="//Layer[Name=$Name]/Title"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="//wcs:CoverageOfferingBrief[wcs:name=$Name]/wcs:label"/> - </xsl:otherwise> - </xsl:choose> - </gco:CharacterString> - - - - [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + WPS Process: + + + + + + + + + + + + + + + + + + + HTTP-GET + + + HTTP-POST + + WebServices + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Format : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <gco:CharacterString> + <xsl:choose> + <xsl:when + test="name(.)='WFS_Capabilities' or name(.)='wfs:WFS_Capabilities' or $ows='true'"> + <xsl:value-of select="//wfs:FeatureType[wfs:Name=$Name]/wfs:Title"/> + </xsl:when> + <xsl:when test="name(.)='WMS_Capabilities'"> + <xsl:value-of select="//wms:Layer[wms:Name=$Name]/wms:Title"/> + </xsl:when> + <xsl:when test="name(.)='WMT_MS_Capabilities'"> + <xsl:value-of select="//Layer[Name=$Name]/Title"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="//wcs:CoverageOfferingBrief[wcs:name=$Name]/wcs:label"/> + </xsl:otherwise> + </xsl:choose> + </gco:CharacterString> + + + + [Y0001]-[M01]-[D01]T[H01]:[m01]:[s01] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -668,7 +764,9 @@ - + + + @@ -676,13 +774,16 @@ - <gco:CharacterString><xsl:value-of select="current-grouping-key()"/></gco:CharacterString> + <gco:CharacterString> + <xsl:value-of select="current-grouping-key()"/> + </gco:CharacterString> - + @@ -695,7 +796,9 @@ - + + + @@ -703,225 +806,295 @@ - <gco:CharacterString><xsl:value-of select="current-grouping-key()"/></gco:CharacterString> + <gco:CharacterString> + <xsl:value-of select="current-grouping-key()"/> + </gco:CharacterString> - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl index 88d4fcef500..789a61229b5 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl @@ -23,27 +23,27 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl index 7a70b8cebfb..a75243c6d61 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl @@ -23,170 +23,196 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/CDMCoords-to-ISO19139Keywords.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/CDMCoords-to-ISO19139Keywords.xsl index 222579de541..87cba773dc8 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/CDMCoords-to-ISO19139Keywords.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/CDMCoords-to-ISO19139Keywords.xsl @@ -23,61 +23,65 @@ --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Data Parameters/Variables following the conventions - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Data Parameters/Variables following the + conventions + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/DIFToISO.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/DIFToISO.xsl index c7a0cfb8746..4e8f930fa10 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/DIFToISO.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsDIFToISO/DIFToISO.xsl @@ -31,156 +31,166 @@ - + - - - - - - - - - - - - - - eng - - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - + + + + eng + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -188,773 +198,848 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unknown - - - - - - Unknown - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unknown - - - - - - - - - - - - - Unknown - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unknown + + + + + + Unknown + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unknown + + + + + + + + + + + + + Unknown + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + , + - - - - + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - | | | | - - - - - - - GCMD Keywords - - - Science Keywords - - - - - 2008-02-05 - - - - - - - - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + | + | + | + | + - - - - - - - - - - - | - - - GCMD Keywords - Instruments + Science Keywords - 2008-01-22 + 2008-02-05 - + - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. + Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. + Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master + Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + - + - - - - - - - - - | - - - - - - - GCMD Keywords - - - Platforms - - - - - 2008-02-05 - - - - - - - - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 - - - - - - - + + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + GCMD Keywords + + + Instruments + + + + + 2008-01-22 + + + + + + + + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + + + + + + + + + + + + + + + | + + + + + + + + GCMD Keywords + + + Platforms + + + + + 2008-02-05 + + + + + + + + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + + + + + + + + - + - Paleo Start Date + Paleo Start Date + - + - Paleo Stop Date + Paleo Stop Date + @@ -974,23 +1059,28 @@ - + - + - + - + - | | | + | + | + | + @@ -1008,2500 +1098,2649 @@ 2007-04-01 - + - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + - + - - - - - - - - | - - - - - - - GCMD Keywords - - - Projects - - - - - 2008-01-24 - - - - - - - - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 - - - - - - - - - - - - - - - - - - - - - GCMD Keywords - - - IDN Nodes - - - - - 2007-04-01 - - - - - - - - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 - - - - - - - - - - - - - - | | | | | - - - - - - - GCMD Keywords - - - Locations - - - - - 2008-02-05 - - - - - - - - Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eng - - - - - - afr - - - - - - ara - - - - - - bos - - - - - - bul - - - - - - chi - - - - - - scr - - - - - - cze - - - - - - dan - - - - - - dut - - - - - - est - - - - - - fin - - - - - - fre - - - - - - ger - - - - - - heb - - - - - - hun - - - - - - ind - - - - - - ita - - - - - - jpn - - - - - - kor - - - - - - lav - - - - - - lit - - - - - - nor - - - - - - pol - - - - - - por - - - - - - rum - - - - - - rus - - - - - - slo - - - - - - spa - - - - - - ukr - - - - - - vie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unknown - - - - Unknown - - - - - - - - - + + + + + + + + | + + + - - - - - - - - - - - - - - - - Unknown - - - - - - - - - - Unknown - - - - - - - - - - - - - - - - - - - - - - - Unknown - - - - - - - - - - Unknown - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - urn:x-ogc:def:cs:EPSG:6499 - Vertical CS. Axis: height (H). Orientation: up. UoM: m. - - - urn:x-ogc:def:axis:EPSG:114 - height - H - up - - - - - - - - - - urn:x-ogc:def:cs:EPSG:6496 - Vertical CS. Axis: height (H). Orientation: up. UoM: ft(Br36). - - - urn:x-ogc:def:axis:EPSG:111 - height - H - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - urn:x-ogc:def:cs:EPSG:6499 - Vertical CS. Axis: height (H). Orientation: up. UoM: m. - - - urn:x-ogc:def:axis:EPSG:114 - height - H - up - - - - - - - - - - urn:x-ogc:def:cs:EPSG:6496 - Vertical CS. Axis: height (H). Orientation: up. UoM: ft(Br36). - - - urn:x-ogc:def:axis:EPSG:111 - height - H - up - - - - - - - - + + + + GCMD Keywords + + + Projects + + + + + 2008-01-24 + + + + + + + + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + + + + + + + + + + + + + + + + + + + + + + GCMD Keywords + + + IDN Nodes + + + + + 2007-04-01 + + + + + + + + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + + + + + + + + + + + + + + + | + | + | + | + | + + + + + + + + GCMD Keywords + + + Locations + + + + + 2008-02-05 + + + + + + + + Olsen, L.M., G. Major, K. Shein, J. Scialdone, R. Vogel, + S. Leicester, H. Weir, S. Ritz, T. Stevens, M. Meaux, C.Solomon, R. + Bilodeau, M. Holland, T. Northcutt, R. A. Restrepo, 2007 . NASA/Global + Change Master Directory (GCMD) Earth Science Keywords. Version 6.0.0.0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eng + + + + + + afr + + + + + + ara + + + + + + bos + + + + + + bul + + + + + + chi + + + + + + scr + + + + + + cze + + + + + + dan + + + + + + dut + + + + + + est + + + + + + fin + + + + + + fre + + + + + + ger + + + + + + heb + + + + + + hun + + + + + + ind + + + + + + ita + + + + + + jpn + + + + + + kor + + + + + + lav + + + + + + lit + + + + + + nor + + + + + + pol + + + + + + por + + + + + + rum + + + + + + rus + + + + + + slo + + + + + + spa + + + + + + ukr + + + + + + vie + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Unknown + + + + Unknown + + + + + + + + + + + + + + + + - + - - - - + + + + + + + Unknown + + + + + + + + + + Unknown + + + + + + + + + + + + + + + + + + + + + + + Unknown + + + + + + + + + + Unknown + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - urn:x-ogc:def:cs:EPSG:6498 - Vertical CS. Axis: depth (D). Orientation: down. UoM: m. - - - urn:x-ogc:def:axis:EPSG:113 - depth - D - down - - + + urn:x-ogc:def:cs:EPSG:6499 + + Vertical CS. Axis: height (H). Orientation: up. UoM: + m. + + + + urn:x-ogc:def:axis:EPSG:114 + + height + H + up + + - - + + - - urn:x-ogc:def:cs:EPSG:6495 - Vertical CS. Axis: depth (D). Orientation: down. UoM: ft. - - - urn:x-ogc:def:axis:EPSG:214 - depth - D - down - - + + urn:x-ogc:def:cs:EPSG:6496 + + Vertical CS. Axis: height (H). Orientation: up. UoM: + ft(Br36). + + + + urn:x-ogc:def:axis:EPSG:111 + + height + H + up + + - + - + - - - + + + - - - - - - - - - - - - - urn:x-ogc:def:cs:EPSG:6498 - Vertical CS. Axis: depth (D). Orientation: down. UoM: m. - - - urn:x-ogc:def:axis:EPSG:113 - depth - D - down - - - - + + + + + + + + + + + + + + urn:x-ogc:def:cs:EPSG:6499 + + Vertical CS. Axis: height (H). Orientation: up. UoM: + m. + + + + urn:x-ogc:def:axis:EPSG:114 + + height + H + up + + + + + + + + + + urn:x-ogc:def:cs:EPSG:6496 + + Vertical CS. Axis: height (H). Orientation: up. UoM: + ft(Br36). + + + + urn:x-ogc:def:axis:EPSG:111 + + height + H + up + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + urn:x-ogc:def:cs:EPSG:6498 + + Vertical CS. Axis: depth (D). Orientation: down. UoM: + m. + + + + urn:x-ogc:def:axis:EPSG:113 + + depth + D + down + + + + - - + + - urn:x-ogc:def:cs:EPSG:6495 - Vertical CS. Axis: depth (D). Orientation: down. UoM: ft. - - - urn:x-ogc:def:axis:EPSG:214 - depth - D - down - - + urn:x-ogc:def:cs:EPSG:6495 + + Vertical CS. Axis: depth (D). Orientation: down. UoM: + ft. + + + + urn:x-ogc:def:axis:EPSG:214 + + depth + D + down + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + urn:x-ogc:def:cs:EPSG:6498 + + Vertical CS. Axis: depth (D). Orientation: down. UoM: + m. + + + + urn:x-ogc:def:axis:EPSG:113 + + depth + D + down + + + + + + + + + + urn:x-ogc:def:cs:EPSG:6495 + + Vertical CS. Axis: depth (D). Orientation: down. UoM: + ft. + + + + urn:x-ogc:def:axis:EPSG:214 + + depth + D + down + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - , - - - - - | - - - - - - - - - - - - + + + + + , + + + + + + | + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + T12:00:00 + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - T12:00:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - - - + + - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - - - + - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - - - + + - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - OGC:WMS-1.1.1-http-get-map - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - OGC:WMS-1.1.1-http-get-map - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + OGC:WMS-1.1.1-http-get-map + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - OGC:WMS-1.1.1-http-get-map - - - - | - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - | - - - - - - - - - - + + + + + + + + + + + + OGC:WMS-1.1.1-http-get-map + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + OGC:WMS-1.1.1-http-get-map + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + Multimedia Sample + + + + + + + + - + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + Data Set Citation + + + + + + + + + + - - - - - - - - - - - - WWW:LINK-1.0-http--link - + + + + + + - - | - + - - - - - - - + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - + + + + - - | - + - - - - - - - + + - - - - - - - - - - - - - WWW:LINK-1.0-http--link - + + + + - - - + - - - - - - - + + - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - Multimedia Sample - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - Data Set Citation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Temporal Resolution - - - - - - - - - - - - - - - - - - - - - - - - - - - - Latitude Resolution - - - - - - - - - - - - - - - - - - - - - - - - - - - - Longitude Resolution - - - - - - - - - - - - - - - - - - - - - - - - - - - - Vertical Resolution - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This metadata record is publicly available. - - - + + + + + + - - - - - - This metadata record is not publicly available. - - - + + + + + + + + + + + + + + + + + + + + + Temporal Resolution + + + + + + + + + + + + + + + + + + + + + + + + + + + + Latitude Resolution + + + + + + + + + + + + + + + + + + + + + + + + + + + + Longitude Resolution + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vertical Resolution + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - This metadata record is publicly available. - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This metadata record is publicly available. + + + + + + + + + + + This metadata record is not publicly available. + + + + + + + + + + + + + + + This metadata record is publicly available. + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - , - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/netcdf-attributes.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/netcdf-attributes.xsl index cf6eef7d3b8..d6f4cb8f684 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/netcdf-attributes.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/netcdf-attributes.xsl @@ -22,735 +22,838 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NetCDF dataset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - largerWorkCitation - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--downloaddata - - - THREDDS Metadata - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--downloaddata - - - THREDDS CATALOG - - - - - - - - - - - - - - - - - - - - dataset - - - - - - - - - - - - - - - - - - - - - - - - dataset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .html - - - - OGC:WMS - OGC:WCS - WWW:LINK-1.0-http--downloaddata - - - - - - - - - - - - - - - - - Data available via - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NetCDF dataset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + largerWorkCitation + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--downloaddata + + + THREDDS Metadata + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--downloaddata + + + THREDDS CATALOG + + + + + + + + + + + + + + + + + + + + dataset + + + + + + + + + + + + + + + + + + + + + + + + + + + dataset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .html + + + + + OGC:WMS + OGC:WCS + WWW:LINK-1.0-http--downloaddata + + + + + + + + + + + + + + + + + + + + + Data available via + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds-metadata.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds-metadata.xsl index cefa241da94..e192b25b13e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds-metadata.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds-metadata.xsl @@ -22,705 +22,810 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--link - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Thredds dataset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - largerWorkCitation - - - project - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--downloaddata - - - THREDDS Metadata - - - - - - - - - - - - - - - - - WWW:LINK-1.0-http--downloaddata - - - THREDDS Catalog - - - - - - - - - - - - - - - - - - dataset - - - - - - - - - - - - - - - - - - - - - - - dataset - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - .html - - - - OGC:WMS - OGC:WCS - WWW:LINK-1.0-http--downloaddata - - - - - - - - - - - - - - - - - Data available via - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--link + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Thredds dataset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + largerWorkCitation + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--downloaddata + + + THREDDS Metadata + + + + + + + + + + + + + + + + + WWW:LINK-1.0-http--downloaddata + + + THREDDS Catalog + + + + + + + + + + + + + + + + + + dataset + + + + + + + + + + + + + + + + + + + + + + + + + + dataset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .html + + + + + OGC:WMS + OGC:WCS + WWW:LINK-1.0-http--downloaddata + + + + + + + + + + + + + + + + + + + + + Data available via + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds/utils.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds/utils.xsl index 12a0caf2105..b7541a7b05c 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds/utils.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/ThreddsToFragments/thredds/utils.xsl @@ -22,93 +22,116 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/deegree22_philosopher_fragments.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/deegree22_philosopher_fragments.xsl index aab1bd0de95..f4fde9c522d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/deegree22_philosopher_fragments.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/deegree22_philosopher_fragments.xsl @@ -22,180 +22,215 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dr Charlie Brown - - - Silicon Graphics R4400 64bit Systems and Philosophy Management Section - - - Part-time Chief Philosopher - - - - - - - - - - - - - - - - - - - Philosophy - - - - - - - - - - - - - - Information about the Philosopher - - - - - - - - - - - 2009-05-24 - - - - - - - - - - - - - - - - - - - - Metadata about the Philosopher -   - Sex: -   - - Is the author of: -   - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Dr Charlie Brown + + + Silicon Graphics R4400 64bit Systems and Philosophy Management + Section + + + + Part-time Chief Philosopher + + + + + + + + + + + + + + + + + + + + + Philosophy + + + + + + + + + + + + + + Information about the Philosopher + + + + + + + + + + + + + 2009-05-24 + + + + + + + + + + + + + + + + + + + + Metadata about the Philosopher + +   + Sex: + +   + + Is the author of: + +   + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/geoserver_boundary_fragments.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/geoserver_boundary_fragments.xsl index 5e7939c67a4..acde739377f 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/geoserver_boundary_fragments.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/WFSToFragments/geoserver_boundary_fragments.xsl @@ -22,164 +22,175 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Country - - - - - - - - - - - - - - - - - unknown - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Country + + + + + + + + + + + + + + + + + unknown + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/dcat.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/dcat.xsl index dae4bf93bb6..b62f0d220d0 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/dcat.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/dcat.xsl @@ -23,39 +23,37 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - + + + + + - - + @@ -80,14 +78,20 @@ - () + () + - + + + - /srv/eng/portal.opensearch - /srv/eng/rdf.search?any= + /srv/eng/portal.opensearch + + /srv/eng/rdf.search?any= + @@ -107,7 +111,9 @@ Multiple values can be used. The publisher might also choose to describe the language on the dataset level (see dataset language). --> - + + + - + + + - + + + - /srv/eng/thesaurus.download?ref= + /srv/eng/thesaurus.download?ref= + @@ -163,4 +175,4 @@ - \ No newline at end of file + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/functions.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/functions.xsl index 305297069c1..ebdf6e0fb2a 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/functions.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/functions.xsl @@ -21,46 +21,47 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + - - - - + - + + + + @@ -73,118 +74,125 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eng - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - - + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + eng + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/oai_dc.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/oai_dc.xsl index ff3d170e172..8843bd163c8 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/oai_dc.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/oai_dc.xsl @@ -23,115 +23,146 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/thesaurus-transformation.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/thesaurus-transformation.xsl index a058b9e702e..b865d49a140 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/convert/thesaurus-transformation.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/convert/thesaurus-transformation.xsl @@ -22,8 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - @@ -86,7 +85,7 @@ else false()"/> - + @@ -111,15 +110,15 @@ select="util:getSettingValue('system/xlinkResolver/localXlinkEnable')"/> + then concat('local://', /root/gui/language) + else $serviceUrl"/> + '&amp;id=', replace(/root/request/id, '#', '%23'), + '&amp;multiple=', $multiple, + if (/root/request/lang) then concat('&amp;lang=', /root/request/lang) else '', + if ($textgroupOnly) then '&amp;textgroupOnly' else '')"/> replace @@ -156,7 +155,8 @@ - + @@ -165,29 +165,33 @@ if 'all' thesaurus we need to encode the thesaurus name so that update-fixed-info can re-organize the keywords into the correct thesaurus sections. --> - - + + - + - + - + - - + + @@ -199,13 +203,14 @@ - - + + - + @@ -221,7 +226,8 @@ - + @@ -233,20 +239,21 @@ - + - + + select="normalize-space($thesauri/thesaurus[key = $currentThesaurus]/date)"/> @@ -255,20 +262,20 @@ - + - + + codeList="http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/codelist/ML_gmxCodelists.xml#CI_DateTypeCode" + codeListValue="publication"/> @@ -278,8 +285,9 @@ - geonetwork.thesaurus. + + geonetwork.thesaurus. @@ -300,12 +308,14 @@ - + - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-atom-feed.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-atom-feed.xsl index 93ae20bacc5..e83d2e4466e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-atom-feed.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-atom-feed.xsl @@ -22,22 +22,25 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + version="2.0" +> - + - - + + - - + + + + - - \ No newline at end of file + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-datasetid.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-datasetid.xsl index ec92d719a85..45401661d2d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-datasetid.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-datasetid.xsl @@ -23,12 +23,15 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + - \ No newline at end of file + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-datasetinfo-from-service-feed.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-datasetinfo-from-service-feed.xsl index 2e66a904576..1f69440154e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-datasetinfo-from-service-feed.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-datasetinfo-from-service-feed.xsl @@ -22,18 +22,22 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-datasets.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-datasets.xsl index c73b9e3cd25..486aca15f83 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-datasets.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-datasets.xsl @@ -22,14 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-date-modified.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-date-modified.xsl index ca57d221877..8b02e60e07c 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-date-modified.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-date-modified.xsl @@ -23,11 +23,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl index c4c9851fbef..96b575b8d9f 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-gml.xsl @@ -22,43 +22,51 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - ,, ,, ,, ,, , - - - - - + + + + + + + + + + + + + + + + + + + + + + + ,, ,, ,, ,, , + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl index d0c4d2c43f4..c7d848f18ba 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl @@ -28,25 +28,31 @@ + super-brief representation. --> - + - + - - - + + - + + + + + + @@ -70,13 +76,19 @@ - + - - + + + + + + <xsl:apply-templates mode="get-iso19139-localized-string" select="gmd:fileDescription"/> @@ -92,8 +104,10 @@ <xsl:variable name="langCode"> <xsl:value-of select="concat('#', upper-case(util:twoCharLangCode($lang, 'EN')))"/> </xsl:variable> - <xsl:variable name="url" select="gmd:linkage/gmd:URL" /> - <id><xsl:value-of select="$url"/></id> + <xsl:variable name="url" select="gmd:linkage/gmd:URL"/> + <id> + <xsl:value-of select="$url"/> + </id> <title> <xsl:apply-templates mode="get-iso19139-localized-string" select="gmd:name"/> @@ -101,13 +115,19 @@ <url> <xsl:value-of select="$url"/> </url> - <function><xsl:value-of select="gmd:function/*/@codeListValue"/></function> - <applicationProfile><xsl:value-of select="gmd:applicationProfile/gco:CharacterString"/></applicationProfile> + <function> + <xsl:value-of select="gmd:function/*/@codeListValue"/> + </function> + <applicationProfile> + <xsl:value-of select="gmd:applicationProfile/gco:CharacterString"/> + </applicationProfile> <description> <xsl:apply-templates mode="get-iso19139-localized-string" select="gmd:description"/> </description> - <protocol><xsl:value-of select="gn-fn-rel:translate(gmd:protocol, $langCode)"/></protocol> + <protocol> + <xsl:value-of select="gn-fn-rel:translate(gmd:protocol, $langCode)"/> + </protocol> <type>onlinesrc</type> </item> </xsl:for-each> diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-thumbnails.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-thumbnails.xsl index 77074b3a751..2f701eb4728 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-thumbnails.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-thumbnails.xsl @@ -23,29 +23,30 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:srv="http://www.isotc211.org/2005/srv" - xmlns:gmd="http://www.isotc211.org/2005/gmd"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gmd="http://www.isotc211.org/2005/gmd" + version="1.0"> - <xsl:template match="gmd:MD_Metadata|*[contains(@gco:isoType, 'MD_Metadata')]"> - <thumbnail> - <xsl:for-each select="gmd:identificationInfo/*/gmd:graphicOverview/gmd:MD_BrowseGraphic - "> - <xsl:choose> - <xsl:when test="gmd:fileDescription/gco:CharacterString = 'large_thumbnail' and gmd:fileName/gco:CharacterString != ''"> - <large> - <xsl:value-of select="gmd:fileName/gco:CharacterString" /> - </large> - </xsl:when> - <xsl:when test="gmd:fileDescription/gco:CharacterString = 'thumbnail' and gmd:fileName/gco:CharacterString != ''"> - <small> - <xsl:value-of select="gmd:fileName/gco:CharacterString" /> - </small> - </xsl:when> - </xsl:choose> - </xsl:for-each> - </thumbnail> - </xsl:template> + <xsl:template match="gmd:MD_Metadata|*[contains(@gco:isoType, 'MD_Metadata')]"> + <thumbnail> + <xsl:for-each select="gmd:identificationInfo/*/gmd:graphicOverview/gmd:MD_BrowseGraphic + "> + <xsl:choose> + <xsl:when + test="gmd:fileDescription/gco:CharacterString = 'large_thumbnail' and gmd:fileName/gco:CharacterString != ''"> + <large> + <xsl:value-of select="gmd:fileName/gco:CharacterString"/> + </large> + </xsl:when> + <xsl:when + test="gmd:fileDescription/gco:CharacterString = 'thumbnail' and gmd:fileName/gco:CharacterString != ''"> + <small> + <xsl:value-of select="gmd:fileName/gco:CharacterString"/> + </small> + </xsl:when> + </xsl:choose> + </xsl:for-each> + </thumbnail> + </xsl:template> </xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-type.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-type.xsl index 94c2acc834c..e768b943080 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-type.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-type.xsl @@ -23,11 +23,12 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:gmd="http://www.isotc211.org/2005/gmd"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" + version="1.0"> - <xsl:template match="gmd:MD_Metadata"> - <type><xsl:value-of select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue"/></type> - </xsl:template> -</xsl:stylesheet> \ No newline at end of file + <xsl:template match="gmd:MD_Metadata"> + <type> + <xsl:value-of select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue"/> + </type> + </xsl:template> +</xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/extract-uuid.xsl b/schemas/iso19139/src/main/plugin/iso19139/extract-uuid.xsl index 94e78ef30e7..47440ced90f 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/extract-uuid.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/extract-uuid.xsl @@ -23,12 +23,14 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:gmd="http://www.isotc211.org/2005/gmd"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gmd="http://www.isotc211.org/2005/gmd" + version="1.0"> - <xsl:template match="gmd:MD_Metadata"> - <uuid><xsl:value-of select="gmd:fileIdentifier/gco:CharacterString"/></uuid> - </xsl:template> + <xsl:template match="gmd:MD_Metadata"> + <uuid> + <xsl:value-of select="gmd:fileIdentifier/gco:CharacterString"/> + </uuid> + </xsl:template> </xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/xsl-view/view.xsl b/schemas/iso19139/src/main/plugin/iso19139/formatter/xsl-view/view.xsl index a42794ecb97..dbb95c09c8d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/formatter/xsl-view/view.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/formatter/xsl-view/view.xsl @@ -22,20 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:gml="http://www.opengis.net/gml" - xmlns:gts="http://www.isotc211.org/2005/gts" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tr="java:org.fao.geonet.services.metadata.format.SchemaLocalizations" xmlns:gn-fn-render="http://geonetwork-opensource.org/xsl/functions/render" - xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" xmlns:saxon="http://saxon.sf.net/" + version="2.0" extension-element-prefixes="saxon" exclude-result-prefixes="#all"> <!-- This formatter render an ISO19139 record based on the @@ -69,8 +65,6 @@ select="/root/gmd:MD_Metadata"/> - - <!-- Specific schema rendering --> <xsl:template mode="getMetadataTitle" match="gmd:MD_Metadata"> <xsl:variable name="value" @@ -113,7 +107,6 @@ </xsl:template> - <!-- Some elements are only containers so bypass them --> <xsl:template mode="render-field" match="*[count(gmd:*) = 1]" @@ -173,7 +166,7 @@ <xsl:variable name="displayName"> <xsl:choose> <xsl:when - test="*/gmd:organisationName and */gmd:individualName"> + test="*/gmd:organisationName and */gmd:individualName"> <!-- Org name may be multilingual --> <xsl:apply-templates mode="render-value" select="*/gmd:organisationName"/> @@ -202,18 +195,22 @@ <strong> <xsl:choose> <xsl:when test="$email"> - <a href="mailto:{normalize-space($email)}"><xsl:value-of select="$displayName"/></a> + <a href="mailto:{normalize-space($email)}"> + <xsl:value-of select="$displayName"/> + </a> </xsl:when> <xsl:otherwise> <xsl:value-of select="$displayName"/> </xsl:otherwise> </xsl:choose> - </strong><br/> + </strong> + <br/> <xsl:for-each select="*/gmd:contactInfo/*"> <xsl:for-each select="gmd:address/*/( gmd:deliveryPoint|gmd:city| gmd:administrativeArea|gmd:postalCode|gmd:country)"> - <xsl:apply-templates mode="render-value" select="."/><br/> + <xsl:apply-templates mode="render-value" select="."/> + <br/> </xsl:for-each> </xsl:for-each> </address> @@ -315,8 +312,9 @@ <xsl:apply-templates mode="render-value" select="*/gmd:code"/> <xsl:if test="*/gmd:version"> - / <xsl:apply-templates mode="render-value" - select="*/gmd:version"/> + / + <xsl:apply-templates mode="render-value" + select="*/gmd:version"/> </xsl:if> <p> <xsl:apply-templates mode="render-field" @@ -506,10 +504,12 @@ <dd> <ul> <xsl:for-each select="parent::node()/*[name() = $nodeName]"> - <li><a href="#uuid={@uuidref}"> - <i class="fa fa-link"></i> - <xsl:value-of select="gn-fn-render:getMetadataTitle(@uuidref, $language)"/> - </a></li> + <li> + <a href="#uuid={@uuidref}"> + <i class="fa fa-link"></i> + <xsl:value-of select="gn-fn-render:getMetadataTitle(@uuidref, $language)"/> + </a> + </li> </xsl:for-each> </ul> </dd> @@ -524,11 +524,6 @@ </xsl:template> - - - - - <!-- ########################## --> <!-- Render values for text ... --> <xsl:template mode="render-value" @@ -567,7 +562,9 @@ <!-- ... URL --> <xsl:template mode="render-value" match="gmd:URL"> - <a href="{.}"><xsl:value-of select="."/></a> + <a href="{.}"> + <xsl:value-of select="."/> + </a> </xsl:template> <!-- ... Dates - formatting is made on the client side by the directive --> @@ -598,7 +595,9 @@ <xsl:template mode="render-value" match="gmd:language/gco:CharacterString"> - <span data-translate=""><xsl:value-of select="."/></span> + <span data-translate=""> + <xsl:value-of select="."/> + </span> </xsl:template> <!-- ... Codelists --> @@ -616,7 +615,9 @@ select="tr:codelist-value-desc( tr:create($schema), parent::node()/local-name(), $id)"/> - <span title="{$codelistDesc}"><xsl:value-of select="$codelistTranslation"/></span> + <span title="{$codelistDesc}"> + <xsl:value-of select="$codelistTranslation"/> + </span> </xsl:when> <xsl:otherwise> <xsl:value-of select="$id"/> @@ -641,7 +642,9 @@ select="tr:codelist-value-desc( tr:create($schema), local-name(), $id)"/> - <span title="{$codelistDesc}"><xsl:value-of select="$codelistTranslation"/></span> + <span title="{$codelistDesc}"> + <xsl:value-of select="$codelistTranslation"/> + </span> </xsl:when> <xsl:otherwise> <xsl:value-of select="$id"/> @@ -657,4 +660,4 @@ <xsl:template mode="render-value" match="@*"/> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl index f9e1e3927a2..65b1c4159b7 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl @@ -22,8 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" - xmlns:gmd="http://www.isotc211.org/2005/gmd" +<xsl:stylesheet xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml" xmlns:srv="http://www.isotc211.org/2005/srv" @@ -34,37 +33,40 @@ xmlns:util="java:org.fao.geonet.util.XslUtil" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + version="2.0" exclude-result-prefixes="#all"> - <xsl:include href="../convert/functions.xsl" /> - <xsl:include href="../../../xsl/utils-fn.xsl" /> - <xsl:include href="index-subtemplate-fields.xsl" /> - - <!-- This file defines what parts of the metadata are indexed by Lucene - Searches can be conducted on indexes defined here. - The Field@name attribute defines the name of the search variable. - If a variable has to be maintained in the user session, it needs to be - added to the GeoNetwork constants in the Java source code. - Please keep indexes consistent among metadata standards if they should - work across different metadata resources --> - <!-- ========================================================================================= --> + <xsl:include href="../convert/functions.xsl"/> + <xsl:include href="../../../xsl/utils-fn.xsl"/> + <xsl:include href="index-subtemplate-fields.xsl"/> + + <!-- This file defines what parts of the metadata are indexed by Lucene + Searches can be conducted on indexes defined here. + The Field@name attribute defines the name of the search variable. + If a variable has to be maintained in the user session, it needs to be + added to the GeoNetwork constants in the Java source code. + Please keep indexes consistent among metadata standards if they should + work across different metadata resources --> + <!-- ========================================================================================= --> - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no" /> + <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/> - <!-- ========================================================================================= --> + <!-- ========================================================================================= --> <xsl:param name="thesauriDir"/> <xsl:param name="inspire">false</xsl:param> - <xsl:variable name="inspire-thesaurus" select="if ($inspire!='false') then document(concat('file:///', $thesauriDir, '/external/thesauri/theme/inspire-theme.rdf')) else ''"/> - <xsl:variable name="inspire-theme" select="if ($inspire!='false') then $inspire-thesaurus//skos:Concept else ''"/> + <xsl:variable name="inspire-thesaurus" + select="if ($inspire!='false') then document(concat('file:///', $thesauriDir, '/external/thesauri/theme/inspire-theme.rdf')) else ''"/> + <xsl:variable name="inspire-theme" + select="if ($inspire!='false') then $inspire-thesaurus//skos:Concept else ''"/> <!-- If identification creation, publication and revision date should be indexed as a temporal extent information (eg. in INSPIRE metadata implementing rules, those elements are defined as part of the description of the temporal extent). --> - <xsl:variable name="useDateAsTemporalExtent" select="false()"/> + <xsl:variable name="useDateAsTemporalExtent" select="false()"/> <!-- Define the way keyword and thesaurus are indexed. If false only keyword, thesaurusName and thesaurusType field are created. @@ -82,778 +84,847 @@ <!-- The main metadata language --> <xsl:variable name="isoLangId"> - <xsl:call-template name="langId19139"/> + <xsl:call-template name="langId19139"/> </xsl:variable> <!-- ========================================================================================= --> <xsl:template match="/"> - <Document locale="{$isoLangId}"> - <Field name="_locale" string="{$isoLangId}" store="true" index="true"/> + <Document locale="{$isoLangId}"> + <Field name="_locale" string="{$isoLangId}" store="true" index="true"/> - <Field name="_docLocale" string="{$isoLangId}" store="true" index="true"/> + <Field name="_docLocale" string="{$isoLangId}" store="true" index="true"/> - <xsl:variable name="_defaultTitle"> - <xsl:call-template name="defaultTitle"> - <xsl:with-param name="isoDocLangId" select="$isoLangId"/> - </xsl:call-template> - </xsl:variable> + <xsl:variable name="_defaultTitle"> + <xsl:call-template name="defaultTitle"> + <xsl:with-param name="isoDocLangId" select="$isoLangId"/> + </xsl:call-template> + </xsl:variable> - <Field name="_defaultTitle" string="{string($_defaultTitle)}" store="true" index="true"/> + <Field name="_defaultTitle" string="{string($_defaultTitle)}" store="true" index="true"/> - <!-- not tokenized title for sorting, needed for multilingual sorting --> - <xsl:if test="geonet:info/isTemplate != 's'"> - <Field name="_title" string="{string($_defaultTitle)}" store="true" index="true" /> - </xsl:if> + <!-- not tokenized title for sorting, needed for multilingual sorting --> + <xsl:if test="geonet:info/isTemplate != 's'"> + <Field name="_title" string="{string($_defaultTitle)}" store="true" index="true"/> + </xsl:if> - <xsl:apply-templates select="*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']" mode="metadata"/> + <xsl:apply-templates select="*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']" + mode="metadata"/> - <xsl:apply-templates mode="index" select="*"/> + <xsl:apply-templates mode="index" select="*"/> - </Document> + </Document> </xsl:template> - <!-- Add index mode template in order to easily add new field in the index (eg. in profiles). - - For example, index some keywords from a specific thesaurus in a new field: - <xsl:template mode="index" - match="gmd:MD_Keywords[gmd:thesaurusName/gmd:CI_Citation/ - gmd:title/gco:CharacterString='My thesaurus']/ - gmd:keyword[normalize-space(gco:CharacterString) != '']"> - <Field name="myThesaurusKeyword" string="{string(.)}" store="true" index="true"/> - </xsl:template> + <!-- Add index mode template in order to easily add new field in the index (eg. in profiles). - Note: if more than one template match the same element in a mode, only one will be - used (usually the last one). + For example, index some keywords from a specific thesaurus in a new field: + <xsl:template mode="index" + match="gmd:MD_Keywords[gmd:thesaurusName/gmd:CI_Citation/ + gmd:title/gco:CharacterString='My thesaurus']/ + gmd:keyword[normalize-space(gco:CharacterString) != '']"> + <Field name="myThesaurusKeyword" string="{string(.)}" store="true" index="true"/> + </xsl:template> - If matching a upper level element, apply mode to its child to further index deeper level if required: - <xsl:template mode="index" match="gmd:EX_Extent"> - ... do something - ... and continue indexing - <xsl:apply-templates mode="index" select="*"/> - </xsl:template> - --> - <xsl:template mode="index" match="*|@*"> - <xsl:apply-templates mode="index" select="*|@*"/> - </xsl:template> + Note: if more than one template match the same element in a mode, only one will be + used (usually the last one). + If matching a upper level element, apply mode to its child to further index deeper level if required: + <xsl:template mode="index" match="gmd:EX_Extent"> + ... do something + ... and continue indexing + <xsl:apply-templates mode="index" select="*"/> + </xsl:template> + --> + <xsl:template mode="index" match="*|@*"> + <xsl:apply-templates mode="index" select="*|@*"/> + </xsl:template> - <xsl:template mode="index" - match="gmd:extent/gmd:EX_Extent/gmd:description/gco:CharacterString[normalize-space(.) != '']"> - <Field name="extentDesc" string="{string(.)}" store="false" index="true"/> - </xsl:template> + <xsl:template mode="index" + match="gmd:extent/gmd:EX_Extent/gmd:description/gco:CharacterString[normalize-space(.) != '']"> + <Field name="extentDesc" string="{string(.)}" store="false" index="true"/> + </xsl:template> - <!-- ========================================================================================= --> + <!-- ========================================================================================= --> - <xsl:template match="*" mode="metadata"> + <xsl:template match="*" mode="metadata"> - <!-- === Data or Service Identification === --> + <!-- === Data or Service Identification === --> - <!-- the double // here seems needed to index MD_DataIdentification when - it is nested in a SV_ServiceIdentification class --> + <!-- the double // here seems needed to index MD_DataIdentification when + it is nested in a SV_ServiceIdentification class --> - <xsl:for-each select="gmd:identificationInfo//gmd:MD_DataIdentification| + <xsl:for-each select="gmd:identificationInfo//gmd:MD_DataIdentification| gmd:identificationInfo//*[contains(@gco:isoType, 'MD_DataIdentification')]| gmd:identificationInfo/srv:SV_ServiceIdentification"> - <xsl:for-each select="gmd:citation/gmd:CI_Citation"> - <xsl:for-each select="gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"> - <Field name="identifier" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:identifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"> - <Field name="identifier" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - - <xsl:for-each select="gmd:title/gco:CharacterString"> - <Field name="title" string="{string(.)}" store="true" index="true"/> - <!-- not tokenized title for sorting --> - <Field name="_title" string="{string(.)}" store="false" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:alternateTitle/gco:CharacterString"> - <Field name="altTitle" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='revision']/gmd:date"> - <Field name="revisionDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - <Field name="createDateMonth" string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 8)}" store="true" index="true"/> - <Field name="createDateYear" string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 5)}" store="true" index="true"/> - <xsl:if test="$useDateAsTemporalExtent"> - <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='creation']/gmd:date"> - <Field name="createDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - <Field name="createDateMonth" string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 8)}" store="true" index="true"/> - <Field name="createDateYear" string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 5)}" store="true" index="true"/> - <xsl:if test="$useDateAsTemporalExtent"> - <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='publication']/gmd:date"> - <Field name="publicationDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - <xsl:if test="$useDateAsTemporalExtent"> - <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - - <!-- fields used to search for metadata in paper or digital format --> - - <xsl:for-each select="gmd:presentationForm"> - <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Digital')"> - <Field name="digital" string="true" store="false" index="true"/> - </xsl:if> - - <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Hardcopy')"> - <Field name="paper" string="true" store="false" index="true"/> - </xsl:if> - </xsl:for-each> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:pointOfContact[1]/*/gmd:role/*/@codeListValue"> - <Field name="responsiblePartyRole" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:abstract/gco:CharacterString"> - <Field name="abstract" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:credit/gco:CharacterString"> - <Field name="credit" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="*/gmd:EX_Extent"> - <xsl:apply-templates select="gmd:geographicElement/gmd:EX_GeographicBoundingBox" mode="latLon"/> + <xsl:for-each select="gmd:citation/gmd:CI_Citation"> + <xsl:for-each select="gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"> + <Field name="identifier" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:description/gco:CharacterString[normalize-space(.) != '']"> - <Field name="extentDesc" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:identifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"> + <Field name="identifier" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"> - <Field name="geoDescCode" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <xsl:for-each select="gmd:temporalElement/ - (gmd:EX_TemporalExtent|gmd:EX_SpatialTemporalExtent)/gmd:extent"> - <xsl:for-each select="gml:TimePeriod"> + <xsl:for-each select="gmd:title/gco:CharacterString"> + <Field name="title" string="{string(.)}" store="true" index="true"/> + <!-- not tokenized title for sorting --> + <Field name="_title" string="{string(.)}" store="false" index="true"/> + </xsl:for-each> - <xsl:variable name="times"> - <xsl:call-template name="newGmlTime"> - <xsl:with-param name="begin" select="gml:beginPosition|gml:begin/gml:TimeInstant/gml:timePosition"/> - <xsl:with-param name="end" select="gml:endPosition|gml:end/gml:TimeInstant/gml:timePosition"/> - </xsl:call-template> - </xsl:variable> + <xsl:for-each select="gmd:alternateTitle/gco:CharacterString"> + <Field name="altTitle" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <Field name="tempExtentBegin" string="{lower-case(substring-before($times,'|'))}" store="true" index="true"/> - <Field name="tempExtentEnd" string="{lower-case(substring-after($times,'|'))}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='revision']/gmd:date"> + <Field name="revisionDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + <Field name="createDateMonth" + string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 8)}" store="true" + index="true"/> + <Field name="createDateYear" + string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 5)}" store="true" + index="true"/> + <xsl:if test="$useDateAsTemporalExtent"> + <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + </xsl:if> + </xsl:for-each> - </xsl:for-each> - </xsl:for-each> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='creation']/gmd:date"> + <Field name="createDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + <Field name="createDateMonth" + string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 8)}" store="true" + index="true"/> + <Field name="createDateYear" + string="{substring(gco:Date[.!='']|gco:DateTime[.!=''], 0, 5)}" store="true" + index="true"/> + <xsl:if test="$useDateAsTemporalExtent"> + <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + </xsl:if> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='publication']/gmd:date"> + <Field name="publicationDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + <xsl:if test="$useDateAsTemporalExtent"> + <Field name="tempExtentBegin" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + </xsl:if> + </xsl:for-each> - <xsl:for-each select="//gmd:MD_Keywords"> - <!-- Index all keywords as text or anchor --> - <xsl:variable name="listOfKeywords" - select="gmd:keyword/gco:CharacterString| - gmd:keyword/gmx:Anchor"/> - <xsl:for-each select="$listOfKeywords"> - <xsl:variable name="keyword" select="string(.)"/> - - <Field name="keyword" string="{$keyword}" store="true" index="true"/> - - <!-- If INSPIRE is enabled, check if the keyword is one of the 34 themes - and index annex, theme and theme in english. --> - <xsl:if test="$inspire='true'"> - <xsl:if test="string-length(.) > 0"> - - <xsl:variable name="inspireannex"> - <xsl:call-template name="determineInspireAnnex"> - <xsl:with-param name="keyword" select="$keyword"/> - <xsl:with-param name="inspireThemes" select="$inspire-theme"/> - </xsl:call-template> - </xsl:variable> - - <xsl:variable name="inspireThemeAcronym"> - <xsl:call-template name="getInspireThemeAcronym"> - <xsl:with-param name="keyword" select="$keyword"/> - </xsl:call-template> - </xsl:variable> - - <!-- Add the inspire field if it's one of the 34 themes --> - <xsl:if test="normalize-space($inspireannex)!=''"> - <Field name="inspiretheme" string="{$keyword}" store="true" index="true"/> - <Field name="inspirethemewithac" - string="{concat($inspireThemeAcronym, '|', $keyword)}" - store="true" index="true"/> - - <!--<Field name="inspirethemeacronym" string="{$inspireThemeAcronym}" store="true" index="true"/>--> - <xsl:variable name="inspireThemeURI" select="$inspire-theme[skos:prefLabel = $keyword]/@rdf:about"/> - <Field name="inspirethemeuri" string="{$inspireThemeURI}" store="true" index="true"/> - - <xsl:variable name="englishInspireTheme"> - <xsl:call-template name="translateInspireThemeToEnglish"> - <xsl:with-param name="keyword" select="$keyword"/> - <xsl:with-param name="inspireThemes" select="$inspire-theme"/> - </xsl:call-template> - </xsl:variable> - - <Field name="inspiretheme_en" string="{$englishInspireTheme}" store="true" index="true"/> - <Field name="inspireannex" string="{$inspireannex}" store="true" index="true"/> - <!-- FIXME : inspirecat field will be set multiple time if one record has many themes --> - <Field name="inspirecat" string="true" store="false" index="true"/> - </xsl:if> - </xsl:if> - </xsl:if> - </xsl:for-each> - - <!-- Index thesaurus name to easily search for records - using keyword from a thesaurus. --> - <xsl:for-each select="gmd:thesaurusName/gmd:CI_Citation"> - <xsl:variable name="thesaurusIdentifier" - select="gmd:identifier/gmd:MD_Identifier/gmd:code/gmx:Anchor/text()"/> - - <xsl:if test="$thesaurusIdentifier != ''"> - <Field name="thesaurusIdentifier" - string="{substring-after($thesaurusIdentifier,'geonetwork.thesaurus.')}" - store="true" index="true"/> - </xsl:if> - <xsl:if test="gmd:title/gco:CharacterString/text() != ''"> - <Field name="thesaurusName" - string="{gmd:title/gco:CharacterString/text()}" - store="true" index="true"/> - </xsl:if> - - - <xsl:if test="$indexAllKeywordDetails and $thesaurusIdentifier != ''"> - <!-- field thesaurus-{{thesaurusIdentifier}}={{keyword}} allows - to group all keywords of same thesaurus in a field --> - <xsl:variable name="currentType" select="string(.)"/> - - <xsl:for-each select="$listOfKeywords"> - <Field name="thesaurus-{substring-after($thesaurusIdentifier,'geonetwork.thesaurus.')}" - string="{string(.)}" - store="true" index="true"/> - - </xsl:for-each> - </xsl:if> - </xsl:for-each> - - <!-- Index thesaurus type --> - <xsl:for-each select="gmd:type/gmd:MD_KeywordTypeCode/@codeListValue"> - <Field name="keywordType" string="{string(.)}" store="true" index="true"/> - <xsl:if test="$indexAllKeywordDetails"> - <!-- field thesaurusType{{type}}={{keyword}} allows - to group all keywords of same type in a field --> - <xsl:variable name="currentType" select="string(.)"/> - <xsl:for-each select="$listOfKeywords"> - <Field name="keywordType-{$currentType}" - string="{string(.)}" - store="true" index="true"/> - </xsl:for-each> - </xsl:if> - </xsl:for-each> - </xsl:for-each> + <!-- fields used to search for metadata in paper or digital format --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each select="gmd:presentationForm"> + <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Digital')"> + <Field name="digital" string="true" store="false" index="true"/> + </xsl:if> - <xsl:variable name="email" select="/gmd:MD_Metadata/gmd:contact[1]/gmd:CI_ResponsibleParty[1]/gmd:contactInfo[1]/gmd:CI_Contact[1]/gmd:address[1]/gmd:CI_Address[1]/gmd:electronicMailAddress[1]/gco:CharacterString[1]"/> + <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Hardcopy')"> + <Field name="paper" string="true" store="false" index="true"/> + </xsl:if> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString|gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gmx:Anchor"> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <Field name="orgName" string="{string(.)}" store="true" index="true"/> - <Field name="orgNameTree" string="{string(.)}" store="true" index="true"/> + <xsl:for-each select="gmd:pointOfContact[1]/*/gmd:role/*/@codeListValue"> + <Field name="responsiblePartyRole" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:variable name="role" select="../../gmd:role/*/@codeListValue"/> - <xsl:variable name="roleTranslation" select="util:getCodelistTranslation('gmd:CI_RoleCode', string($role), string($isoLangId))"/> - <xsl:variable name="logo" select="../..//gmx:FileName/@src"/> - <xsl:variable name="email" select="../../gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"/> - <xsl:variable name="phone" select="../../gmd:contactInfo/*/gmd:phone/*/gmd:voice[normalize-space(.) != '']/*/text()"/> - <xsl:variable name="individualName" select="../../gmd:individualName/gco:CharacterString/text()"/> - <xsl:variable name="positionName" select="../../gmd:positionName/gco:CharacterString/text()"/> - <xsl:variable name="address" select="string-join(../../gmd:contactInfo/*/gmd:address/*/( - gmd:deliveryPoint|gmd:postalCode|gmd:city| - gmd:administrativeArea|gmd:country)/gco:CharacterString/text(), ', ')"/> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <Field name="responsibleParty" - string="{concat($roleTranslation, '|resource|', ., '|', $logo, '|', string-join($email, ','), '|', $individualName, '|', $positionName, '|', $address, '|', string-join($phone, ','))}" - store="true" index="false"/> - </xsl:for-each> + <xsl:for-each select="gmd:abstract/gco:CharacterString"> + <Field name="abstract" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:choose> - <xsl:when test="gmd:resourceConstraints/gmd:MD_SecurityConstraints"> - <Field name="secConstr" string="true" store="true" index="true"/> - </xsl:when> - <xsl:otherwise> - <Field name="secConstr" string="false" store="true" index="true"/> - </xsl:otherwise> - </xsl:choose> - - - <!-- Add an extra value to the status codelist to indicate all - non obsolete records --> - <xsl:if test="$flagNonObseleteRecords"> - <xsl:variable name="isNotObsolete" select="count(gmd:status[gmd:MD_ProgressCode/@codeListValue = 'obsolete']) = 0"/> - <xsl:if test="$isNotObsolete"> - <Field name="cl_status" string="notobsolete" store="true" index="true"/> - </xsl:if> - </xsl:if> + <xsl:for-each select="gmd:credit/gco:CharacterString"> + <Field name="credit" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:topicCategory/gmd:MD_TopicCategoryCode"> - <Field name="topicCat" string="{string(.)}" store="true" index="true"/> - <Field name="keyword" - string="{util:getCodelistTranslation('gmd:MD_TopicCategoryCode', string(.), string($isoLangId))}" - store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each select="*/gmd:EX_Extent"> + <xsl:apply-templates select="gmd:geographicElement/gmd:EX_GeographicBoundingBox" + mode="latLon"/> - <xsl:for-each select="gmd:language/gco:CharacterString|gmd:language/gmd:LanguageCode/@codeListValue"> - <Field name="datasetLang" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:description/gco:CharacterString[normalize-space(.) != '']"> + <Field name="extentDesc" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each + select="gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"> + <Field name="geoDescCode" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:spatialResolution/gmd:MD_Resolution"> - <xsl:for-each select="gmd:equivalentScale/gmd:MD_RepresentativeFraction/gmd:denominator/gco:Integer"> - <Field name="denominator" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:temporalElement/ + (gmd:EX_TemporalExtent|gmd:EX_SpatialTemporalExtent)/gmd:extent"> + <xsl:for-each select="gml:TimePeriod"> + + <xsl:variable name="times"> + <xsl:call-template name="newGmlTime"> + <xsl:with-param name="begin" + select="gml:beginPosition|gml:begin/gml:TimeInstant/gml:timePosition"/> + <xsl:with-param name="end" + select="gml:endPosition|gml:end/gml:TimeInstant/gml:timePosition"/> + </xsl:call-template> + </xsl:variable> - <xsl:for-each select="gmd:distance/gco:Distance"> - <Field name="distanceVal" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <Field name="tempExtentBegin" string="{lower-case(substring-before($times,'|'))}" + store="true" index="true"/> + <Field name="tempExtentEnd" string="{lower-case(substring-after($times,'|'))}" + store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:distance/gco:Distance/@uom"> - <Field name="distanceUom" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="gmd:distance/gco:Distance"> - <!-- Units may be encoded as - http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/uom/ML_gmxUom.xml#m - in such case retrieve the unit acronym only. --> - <xsl:variable name="unit" select="if (contains(@uom, '#')) then substring-after(@uom, '#') else @uom"/> - <Field name="resolution" string="{concat(string(.), ' ', $unit)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each select="//gmd:MD_Keywords"> + <!-- Index all keywords as text or anchor --> + <xsl:variable name="listOfKeywords" + select="gmd:keyword/gco:CharacterString| + gmd:keyword/gmx:Anchor"/> + <xsl:for-each select="$listOfKeywords"> + <xsl:variable name="keyword" select="string(.)"/> + + <Field name="keyword" string="{$keyword}" store="true" index="true"/> + + <!-- If INSPIRE is enabled, check if the keyword is one of the 34 themes + and index annex, theme and theme in english. --> + <xsl:if test="$inspire='true'"> + <xsl:if test="string-length(.) > 0"> + + <xsl:variable name="inspireannex"> + <xsl:call-template name="determineInspireAnnex"> + <xsl:with-param name="keyword" select="$keyword"/> + <xsl:with-param name="inspireThemes" select="$inspire-theme"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="inspireThemeAcronym"> + <xsl:call-template name="getInspireThemeAcronym"> + <xsl:with-param name="keyword" select="$keyword"/> + </xsl:call-template> + </xsl:variable> + + <!-- Add the inspire field if it's one of the 34 themes --> + <xsl:if test="normalize-space($inspireannex)!=''"> + <Field name="inspiretheme" string="{$keyword}" store="true" index="true"/> + <Field name="inspirethemewithac" + string="{concat($inspireThemeAcronym, '|', $keyword)}" + store="true" index="true"/> + + <!--<Field name="inspirethemeacronym" string="{$inspireThemeAcronym}" store="true" index="true"/>--> + <xsl:variable name="inspireThemeURI" + select="$inspire-theme[skos:prefLabel = $keyword]/@rdf:about"/> + <Field name="inspirethemeuri" string="{$inspireThemeURI}" store="true" + index="true"/> + + <xsl:variable name="englishInspireTheme"> + <xsl:call-template name="translateInspireThemeToEnglish"> + <xsl:with-param name="keyword" select="$keyword"/> + <xsl:with-param name="inspireThemes" select="$inspire-theme"/> + </xsl:call-template> + </xsl:variable> + + <Field name="inspiretheme_en" string="{$englishInspireTheme}" store="true" + index="true"/> + <Field name="inspireannex" string="{$inspireannex}" store="true" index="true"/> + <!-- FIXME : inspirecat field will be set multiple time if one record has many themes --> + <Field name="inspirecat" string="true" store="false" index="true"/> + </xsl:if> + </xsl:if> + </xsl:if> + </xsl:for-each> - <xsl:for-each select="gmd:resourceMaintenance/ - gmd:MD_MaintenanceInformation/gmd:maintenanceAndUpdateFrequency/ - gmd:MD_MaintenanceFrequencyCode/@codeListValue[. != '']"> - <Field name="updateFrequency" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- Index thesaurus name to easily search for records + using keyword from a thesaurus. --> + <xsl:for-each select="gmd:thesaurusName/gmd:CI_Citation"> + <xsl:variable name="thesaurusIdentifier" + select="gmd:identifier/gmd:MD_Identifier/gmd:code/gmx:Anchor/text()"/> + <xsl:if test="$thesaurusIdentifier != ''"> + <Field name="thesaurusIdentifier" + string="{substring-after($thesaurusIdentifier,'geonetwork.thesaurus.')}" + store="true" index="true"/> + </xsl:if> + <xsl:if test="gmd:title/gco:CharacterString/text() != ''"> + <Field name="thesaurusName" + string="{gmd:title/gco:CharacterString/text()}" + store="true" index="true"/> + </xsl:if> - <xsl:for-each select="gmd:resourceConstraints/*"> - <xsl:variable name="fieldPrefix" select="local-name()"/> - <xsl:for-each select="gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue[string(.) != 'otherRestrictions']"> - <Field name="{$fieldPrefix}AccessConstraints" - string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:if test="$indexAllKeywordDetails and $thesaurusIdentifier != ''"> + <!-- field thesaurus-{{thesaurusIdentifier}}={{keyword}} allows + to group all keywords of same thesaurus in a field --> + <xsl:variable name="currentType" select="string(.)"/> - <xsl:for-each select="gmd:otherConstraints/gco:CharacterString"> - <Field name="{$fieldPrefix}OtherConstraints" - string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="$listOfKeywords"> + <Field + name="thesaurus-{substring-after($thesaurusIdentifier,'geonetwork.thesaurus.')}" + string="{string(.)}" + store="true" index="true"/> - <xsl:for-each select="gmd:useLimitation/gco:CharacterString"> - <Field name="{$fieldPrefix}UseLimitation" - string="{string(.)}" store="true" index="true"/> - </xsl:for-each> </xsl:for-each> + </xsl:if> + </xsl:for-each> - <!-- Index aggregation info and provides option to query by type of association - and type of initiative - - Aggregation info is indexed by adding the following fields to the index: - * agg_use: boolean - * agg_with_association: {$associationType} - * agg_{$associationType}: {$code} - * agg_{$associationType}_with_initiative: {$initiativeType} - * agg_{$associationType}_{$initiativeType}: {$code} - - Sample queries: - * Search for records with siblings: http://localhost:8080/geonetwork/srv/fre/q?agg_use=true - * Search for records having a crossReference with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference of type "study" with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_study=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference of type "study": - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_with_initiative=study - * Search for records having a "crossReference" : - http://localhost:8080/geonetwork/srv/fre/q?agg_with_association=crossReference - --> - <xsl:for-each select="gmd:aggregationInfo/gmd:MD_AggregateInformation"> - <xsl:variable name="code" select="gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString| - gmd:aggregateDataSetIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"/> - <xsl:if test="$code != ''"> - <xsl:variable name="associationType" select="gmd:associationType/gmd:DS_AssociationTypeCode/@codeListValue"/> - <xsl:variable name="initiativeType" select="gmd:initiativeType/gmd:DS_InitiativeTypeCode/@codeListValue"/> - - <Field name="agg_{$associationType}_{$initiativeType}" string="{$code}" store="false" index="true"/> - <Field name="agg_{$associationType}_with_initiative" string="{$initiativeType}" store="false" index="true"/> - <Field name="agg_{$associationType}" string="{$code}" store="true" index="true"/> - <Field name="agg_associated" string="{$code}" store="false" index="true"/> - <Field name="agg_with_association" string="{$associationType}" store="false" index="true"/> - <Field name="agg_use" string="true" store="false" index="true"/> - </xsl:if> + <!-- Index thesaurus type --> + <xsl:for-each select="gmd:type/gmd:MD_KeywordTypeCode/@codeListValue"> + <Field name="keywordType" string="{string(.)}" store="true" index="true"/> + <xsl:if test="$indexAllKeywordDetails"> + <!-- field thesaurusType{{type}}={{keyword}} allows + to group all keywords of same type in a field --> + <xsl:variable name="currentType" select="string(.)"/> + <xsl:for-each select="$listOfKeywords"> + <Field name="keywordType-{$currentType}" + string="{string(.)}" + store="true" index="true"/> </xsl:for-each> + </xsl:if> + </xsl:for-each> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:variable name="email" + select="/gmd:MD_Metadata/gmd:contact[1]/gmd:CI_ResponsibleParty[1]/gmd:contactInfo[1]/gmd:CI_Contact[1]/gmd:address[1]/gmd:CI_Address[1]/gmd:electronicMailAddress[1]/gco:CharacterString[1]"/> + + <xsl:for-each + select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gco:CharacterString|gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName/gmx:Anchor"> + + <Field name="orgName" string="{string(.)}" store="true" index="true"/> + <Field name="orgNameTree" string="{string(.)}" store="true" index="true"/> + + <xsl:variable name="role" select="../../gmd:role/*/@codeListValue"/> + <xsl:variable name="roleTranslation" + select="util:getCodelistTranslation('gmd:CI_RoleCode', string($role), string($isoLangId))"/> + <xsl:variable name="logo" select="../..//gmx:FileName/@src"/> + <xsl:variable name="email" + select="../../gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"/> + <xsl:variable name="phone" + select="../../gmd:contactInfo/*/gmd:phone/*/gmd:voice[normalize-space(.) != '']/*/text()"/> + <xsl:variable name="individualName" + select="../../gmd:individualName/gco:CharacterString/text()"/> + <xsl:variable name="positionName" + select="../../gmd:positionName/gco:CharacterString/text()"/> + <xsl:variable name="address" select="string-join(../../gmd:contactInfo/*/gmd:address/*/( + gmd:deliveryPoint|gmd:postalCode|gmd:city| + gmd:administrativeArea|gmd:country)/gco:CharacterString/text(), ', ')"/> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- Fields use to search on Service --> - - <xsl:for-each select="srv:serviceType/gco:LocalName"> - <Field name="serviceType" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <Field name="responsibleParty" + string="{concat($roleTranslation, '|resource|', ., '|', $logo, '|', string-join($email, ','), '|', $individualName, '|', $positionName, '|', $address, '|', string-join($phone, ','))}" + store="true" index="false"/> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:choose> + <xsl:when test="gmd:resourceConstraints/gmd:MD_SecurityConstraints"> + <Field name="secConstr" string="true" store="true" index="true"/> + </xsl:when> + <xsl:otherwise> + <Field name="secConstr" string="false" store="true" index="true"/> + </xsl:otherwise> + </xsl:choose> + + + <!-- Add an extra value to the status codelist to indicate all + non obsolete records --> + <xsl:if test="$flagNonObseleteRecords"> + <xsl:variable name="isNotObsolete" + select="count(gmd:status[gmd:MD_ProgressCode/@codeListValue = 'obsolete']) = 0"/> + <xsl:if test="$isNotObsolete"> + <Field name="cl_status" string="notobsolete" store="true" index="true"/> + </xsl:if> + </xsl:if> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:for-each select="gmd:topicCategory/gmd:MD_TopicCategoryCode"> + <Field name="topicCat" string="{string(.)}" store="true" index="true"/> + <Field name="keyword" + string="{util:getCodelistTranslation('gmd:MD_TopicCategoryCode', string(.), string($isoLangId))}" + store="true" index="true"/> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:for-each + select="gmd:language/gco:CharacterString|gmd:language/gmd:LanguageCode/@codeListValue"> + <Field name="datasetLang" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:for-each select="gmd:spatialResolution/gmd:MD_Resolution"> + <xsl:for-each + select="gmd:equivalentScale/gmd:MD_RepresentativeFraction/gmd:denominator/gco:Integer"> + <Field name="denominator" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="srv:serviceTypeVersion/gco:CharacterString"> - <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:distance/gco:Distance"> + <Field name="distanceVal" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="//srv:SV_OperationMetadata/srv:operationName/gco:CharacterString"> - <Field name="operation" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:distance/gco:Distance/@uom"> + <Field name="distanceUom" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="srv:operatesOn/@uuidref"> - <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:distance/gco:Distance"> + <!-- Units may be encoded as + http://standards.iso.org/ittf/PubliclyAvailableStandards/ISO_19139_Schemas/resources/uom/ML_gmxUom.xml#m + in such case retrieve the unit acronym only. --> + <xsl:variable name="unit" + select="if (contains(@uom, '#')) then substring-after(@uom, '#') else @uom"/> + <Field name="resolution" string="{concat(string(.), ' ', $unit)}" store="true" + index="true"/> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="srv:operatesOn/@xlink:href"> - <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each select="gmd:resourceMaintenance/ + gmd:MD_MaintenanceInformation/gmd:maintenanceAndUpdateFrequency/ + gmd:MD_MaintenanceFrequencyCode/@codeListValue[. != '']"> + <Field name="updateFrequency" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="srv:coupledResource"> - <xsl:for-each select="srv:SV_CoupledResource/srv:identifier/gco:CharacterString"> - <Field name="operatesOnIdentifier" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <xsl:for-each select="srv:SV_CoupledResource/srv:operationName/gco:CharacterString"> - <Field name="operatesOnName" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> + <xsl:for-each select="gmd:resourceConstraints/*"> + <xsl:variable name="fieldPrefix" select="local-name()"/> - <xsl:for-each select="gmd:graphicOverview/gmd:MD_BrowseGraphic[normalize-space(gmd:fileName/gco:CharacterString) != '']"> - <xsl:variable name="fileName" select="gmd:fileName/gco:CharacterString"/> - <xsl:variable name="fileDescr" select="gmd:fileDescription/gco:CharacterString"/> - <xsl:variable name="thumbnailType" - select="if (position() = 1) then 'thumbnail' else 'overview'"/> - <!-- First thumbnail is flagged as thumbnail and could be considered the main one --> - <Field name="image" - string="{concat($thumbnailType, '|', $fileName, '|', $fileDescr)}" - store="true" index="false"/> - </xsl:for-each> + <xsl:for-each + select="gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue[string(.) != 'otherRestrictions']"> + <Field name="{$fieldPrefix}AccessConstraints" + string="{string(.)}" store="true" index="true"/> </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Distribution === --> - - <xsl:for-each select="gmd:distributionInfo/gmd:MD_Distribution"> - <xsl:for-each select="gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString"> - <Field name="format" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <!-- index online protocol --> - <xsl:for-each select="gmd:transferOptions/gmd:MD_DigitalTransferOptions"> - <xsl:variable name="tPosition" select="position()"></xsl:variable> - <xsl:for-each select="gmd:onLine/gmd:CI_OnlineResource[gmd:linkage/gmd:URL!='']"> - <xsl:variable name="download_check"> - <xsl:text>&fname=&access</xsl:text> - </xsl:variable> - <xsl:variable name="linkage" select="gmd:linkage/gmd:URL" /> - <xsl:variable name="title" select="normalize-space(gmd:name/gco:CharacterString|gmd:name/gmx:MimeFileType)"/> - <xsl:variable name="desc" select="normalize-space(gmd:description/gco:CharacterString)"/> - <xsl:variable name="protocol" select="normalize-space(gmd:protocol/gco:CharacterString)"/> - <xsl:variable name="mimetype" select="geonet:protocolMimeType($linkage, $protocol, gmd:name/gmx:MimeFileType/@type)"/> - - <!-- If the linkage points to WMS service and no protocol specified, manage as protocol OGC:WMS --> - <xsl:variable name="wmsLinkNoProtocol" select="contains(lower-case($linkage), 'service=wms') and not(string($protocol))" /> - - <!-- ignore empty downloads --> - <xsl:if test="string($linkage)!='' and not(contains($linkage,$download_check))"> - <Field name="protocol" string="{string($protocol)}" store="true" index="true"/> - </xsl:if> - - <xsl:if test="string($title)!='' and string($desc)!='' and not(contains($linkage,$download_check))"> - <Field name="linkage_name_des" string="{string(concat($title, ':::', $desc))}" store="true" index="true"/> - </xsl:if> - - <xsl:if test="normalize-space($mimetype)!=''"> - <Field name="mimetype" string="{$mimetype}" store="true" index="true"/> - </xsl:if> - - <xsl:if test="contains($protocol, 'WWW:DOWNLOAD')"> - <Field name="download" string="true" store="false" index="true"/> - </xsl:if> - - <xsl:if test="contains($protocol, 'OGC:WMS') or $wmsLinkNoProtocol"> - <Field name="dynamic" string="true" store="false" index="true"/> - </xsl:if> - - <!-- ignore WMS links without protocol (are indexed below with mimetype application/vnd.ogc.wms_xml) --> - <xsl:if test="not($wmsLinkNoProtocol)"> - <Field name="link" string="{concat($title, '|', $desc, '|', $linkage, '|', $protocol, '|', $mimetype, '|', $tPosition)}" store="true" index="false"/> - </xsl:if> - - <!-- Add KML link if WMS --> - <xsl:if test="starts-with($protocol,'OGC:WMS') and string($linkage)!='' and string($title)!=''"> - <!-- FIXME : relative path --> - <Field name="link" string="{concat($title, '|', $desc, '|', - '../../srv/en/google.kml?uuid=', /gmd:MD_Metadata/gmd:fileIdentifier/gco:CharacterString, '&layers=', $title, - '|application/vnd.google-earth.kml+xml|application/vnd.google-earth.kml+xml', '|', $tPosition)}" store="true" index="false"/> - </xsl:if> - - <!-- Try to detect Web Map Context by checking protocol or file extension --> - <xsl:if test="starts-with($protocol,'OGC:WMC') or contains($linkage,'.wmc')"> - <Field name="link" string="{concat($title, '|', $desc, '|', - $linkage, '|application/vnd.ogc.wmc|application/vnd.ogc.wmc', '|', $tPosition)}" store="true" index="false"/> - </xsl:if> - <!-- Try to detect OWS Context by checking protocol or file extension --> - <xsl:if test="starts-with($protocol,'OGC:OWS-C') or contains($linkage,'.ows')"> - <Field name="link" string="{concat($title, '|', $desc, '|', - $linkage, '|application/vnd.ogc.ows|application/vnd.ogc.ows', '|', $tPosition)}" store="true" index="false"/> - </xsl:if> - - <xsl:if test="$wmsLinkNoProtocol"> - <Field name="link" string="{concat($title, '|', $desc, '|', - $linkage, '|OGC:WMS|application/vnd.ogc.wms_xml', '|', $tPosition)}" store="true" index="false"/> - </xsl:if> - </xsl:for-each> - </xsl:for-each> - + <xsl:for-each select="gmd:otherConstraints/gco:CharacterString"> + <Field name="{$fieldPrefix}OtherConstraints" + string="{string(.)}" store="true" index="true"/> </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Content info === --> - <xsl:for-each select="gmd:contentInfo/*/gmd:featureCatalogueCitation[@uuidref]"> - <Field name="hasfeaturecat" string="{string(@uuidref)}" store="false" index="true"/> + <xsl:for-each select="gmd:useLimitation/gco:CharacterString"> + <Field name="{$fieldPrefix}UseLimitation" + string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:for-each> + + <!-- Index aggregation info and provides option to query by type of association + and type of initiative + + Aggregation info is indexed by adding the following fields to the index: + * agg_use: boolean + * agg_with_association: {$associationType} + * agg_{$associationType}: {$code} + * agg_{$associationType}_with_initiative: {$initiativeType} + * agg_{$associationType}_{$initiativeType}: {$code} + + Sample queries: + * Search for records with siblings: http://localhost:8080/geonetwork/srv/fre/q?agg_use=true + * Search for records having a crossReference with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference of type "study" with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_study=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference of type "study": + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_with_initiative=study + * Search for records having a "crossReference" : + http://localhost:8080/geonetwork/srv/fre/q?agg_with_association=crossReference + --> + <xsl:for-each select="gmd:aggregationInfo/gmd:MD_AggregateInformation"> + <xsl:variable name="code" select="gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString| + gmd:aggregateDataSetIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"/> + <xsl:if test="$code != ''"> + <xsl:variable name="associationType" + select="gmd:associationType/gmd:DS_AssociationTypeCode/@codeListValue"/> + <xsl:variable name="initiativeType" + select="gmd:initiativeType/gmd:DS_InitiativeTypeCode/@codeListValue"/> + + <Field name="agg_{$associationType}_{$initiativeType}" string="{$code}" store="false" + index="true"/> + <Field name="agg_{$associationType}_with_initiative" string="{$initiativeType}" + store="false" index="true"/> + <Field name="agg_{$associationType}" string="{$code}" store="true" index="true"/> + <Field name="agg_associated" string="{$code}" store="false" index="true"/> + <Field name="agg_with_association" string="{$associationType}" store="false" + index="true"/> + <Field name="agg_use" string="true" store="false" index="true"/> + </xsl:if> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- Fields use to search on Service --> + + <xsl:for-each select="srv:serviceType/gco:LocalName"> + <Field name="serviceType" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="srv:serviceTypeVersion/gco:CharacterString"> + <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="//srv:SV_OperationMetadata/srv:operationName/gco:CharacterString"> + <Field name="operation" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="srv:operatesOn/@uuidref"> + <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="srv:operatesOn/@xlink:href"> + <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + + <xsl:for-each select="srv:coupledResource"> + <xsl:for-each select="srv:SV_CoupledResource/srv:identifier/gco:CharacterString"> + <Field name="operatesOnIdentifier" string="{string(.)}" store="true" index="true"/> </xsl:for-each> - <!-- === Data Quality === --> - <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage//gmd:source[@uuidref]"> - <Field name="hassource" string="{string(@uuidref)}" store="false" index="true"/> + <xsl:for-each select="srv:SV_CoupledResource/srv:operationName/gco:CharacterString"> + <Field name="operatesOnName" string="{string(.)}" store="true" index="true"/> </xsl:for-each> + </xsl:for-each> + + <xsl:for-each + select="gmd:graphicOverview/gmd:MD_BrowseGraphic[normalize-space(gmd:fileName/gco:CharacterString) != '']"> + <xsl:variable name="fileName" select="gmd:fileName/gco:CharacterString"/> + <xsl:variable name="fileDescr" select="gmd:fileDescription/gco:CharacterString"/> + <xsl:variable name="thumbnailType" + select="if (position() = 1) then 'thumbnail' else 'overview'"/> + <!-- First thumbnail is flagged as thumbnail and could be considered the main one --> + <Field name="image" + string="{concat($thumbnailType, '|', $fileName, '|', $fileDescr)}" + store="true" index="false"/> + </xsl:for-each> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Distribution === --> + + <xsl:for-each select="gmd:distributionInfo/gmd:MD_Distribution"> + <xsl:for-each select="gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString"> + <Field name="format" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <!-- index online protocol --> + <xsl:for-each select="gmd:transferOptions/gmd:MD_DigitalTransferOptions"> + <xsl:variable name="tPosition" select="position()"></xsl:variable> + <xsl:for-each select="gmd:onLine/gmd:CI_OnlineResource[gmd:linkage/gmd:URL!='']"> + <xsl:variable name="download_check"> + <xsl:text>&fname=&access</xsl:text> + </xsl:variable> + <xsl:variable name="linkage" select="gmd:linkage/gmd:URL"/> + <xsl:variable name="title" + select="normalize-space(gmd:name/gco:CharacterString|gmd:name/gmx:MimeFileType)"/> + <xsl:variable name="desc" select="normalize-space(gmd:description/gco:CharacterString)"/> + <xsl:variable name="protocol" select="normalize-space(gmd:protocol/gco:CharacterString)"/> + <xsl:variable name="mimetype" + select="geonet:protocolMimeType($linkage, $protocol, gmd:name/gmx:MimeFileType/@type)"/> + + <!-- If the linkage points to WMS service and no protocol specified, manage as protocol OGC:WMS --> + <xsl:variable name="wmsLinkNoProtocol" + select="contains(lower-case($linkage), 'service=wms') and not(string($protocol))"/> + + <!-- ignore empty downloads --> + <xsl:if test="string($linkage)!='' and not(contains($linkage,$download_check))"> + <Field name="protocol" string="{string($protocol)}" store="true" index="true"/> + </xsl:if> - <xsl:for-each select="gmd:dataQualityInfo/*/gmd:report/*/gmd:result"> - <xsl:if test="$inspire='true'"> - <!-- - INSPIRE related dataset could contains a conformity section with: - * COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services - * INSPIRE Data Specification on <Theme Name> - <version> - * INSPIRE Specification on <Theme Name> - <version> for CRS and GRID + <xsl:if + test="string($title)!='' and string($desc)!='' and not(contains($linkage,$download_check))"> + <Field name="linkage_name_des" string="{string(concat($title, ':::', $desc))}" + store="true" index="true"/> + </xsl:if> - Index those types of citation title to found dataset related to INSPIRE (which may be better than keyword - which are often used for other types of datasets). + <xsl:if test="normalize-space($mimetype)!=''"> + <Field name="mimetype" string="{$mimetype}" store="true" index="true"/> + </xsl:if> - "1089/2010" is maybe too fuzzy but could work for translated citation like "Règlement n°1089/2010, Annexe II-6" TODO improved - --> - <xsl:if test="( - contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, '1089/2010') or - contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, 'INSPIRE Data Specification') or - contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, 'INSPIRE Specification'))"> - <Field name="inspirerelated" string="on" store="false" index="true"/> - </xsl:if> - </xsl:if> + <xsl:if test="contains($protocol, 'WWW:DOWNLOAD')"> + <Field name="download" string="true" store="false" index="true"/> + </xsl:if> - <xsl:for-each select="//gmd:pass/gco:Boolean"> - <Field name="degree" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:if test="contains($protocol, 'OGC:WMS') or $wmsLinkNoProtocol"> + <Field name="dynamic" string="true" store="false" index="true"/> + </xsl:if> - <xsl:for-each select="//gmd:specification/*/gmd:title/gco:CharacterString"> - <Field name="specificationTitle" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- ignore WMS links without protocol (are indexed below with mimetype application/vnd.ogc.wms_xml) --> + <xsl:if test="not($wmsLinkNoProtocol)"> + <Field name="link" + string="{concat($title, '|', $desc, '|', $linkage, '|', $protocol, '|', $mimetype, '|', $tPosition)}" + store="true" index="false"/> + </xsl:if> - <xsl:for-each select="//gmd:specification/*/gmd:date/*/gmd:date"> - <Field name="specificationDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" store="true" index="true"/> - </xsl:for-each> + <!-- Add KML link if WMS --> + <xsl:if + test="starts-with($protocol,'OGC:WMS') and string($linkage)!='' and string($title)!=''"> + <!-- FIXME : relative path --> + <Field name="link" string="{concat($title, '|', $desc, '|', + '../../srv/en/google.kml?uuid=', /gmd:MD_Metadata/gmd:fileIdentifier/gco:CharacterString, '&layers=', $title, + '|application/vnd.google-earth.kml+xml|application/vnd.google-earth.kml+xml', '|', $tPosition)}" + store="true" index="false"/> + </xsl:if> - <xsl:for-each select="//gmd:specification/*/gmd:date/*/gmd:dateType/gmd:CI_DateTypeCode/@codeListValue"> - <Field name="specificationDateType" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> + <!-- Try to detect Web Map Context by checking protocol or file extension --> + <xsl:if test="starts-with($protocol,'OGC:WMC') or contains($linkage,'.wmc')"> + <Field name="link" string="{concat($title, '|', $desc, '|', + $linkage, '|application/vnd.ogc.wmc|application/vnd.ogc.wmc', '|', $tPosition)}" + store="true" index="false"/> + </xsl:if> + <!-- Try to detect OWS Context by checking protocol or file extension --> + <xsl:if test="starts-with($protocol,'OGC:OWS-C') or contains($linkage,'.ows')"> + <Field name="link" string="{concat($title, '|', $desc, '|', + $linkage, '|application/vnd.ogc.ows|application/vnd.ogc.ows', '|', $tPosition)}" + store="true" index="false"/> + </xsl:if> - <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage/*/gmd:statement/gco:CharacterString"> - <Field name="lineage" string="{string(.)}" store="true" index="true"/> + <xsl:if test="$wmsLinkNoProtocol"> + <Field name="link" string="{concat($title, '|', $desc, '|', + $linkage, '|OGC:WMS|application/vnd.ogc.wms_xml', '|', $tPosition)}" + store="true" index="false"/> + </xsl:if> </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === General stuff === --> - <!-- Metadata type --> - - <!-- Metadata on maps --> - <xsl:variable name="isDataset" + </xsl:for-each> + + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Content info === --> + <xsl:for-each select="gmd:contentInfo/*/gmd:featureCatalogueCitation[@uuidref]"> + <Field name="hasfeaturecat" string="{string(@uuidref)}" store="false" index="true"/> + </xsl:for-each> + + <!-- === Data Quality === --> + <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage//gmd:source[@uuidref]"> + <Field name="hassource" string="{string(@uuidref)}" store="false" index="true"/> + </xsl:for-each> + + <xsl:for-each select="gmd:dataQualityInfo/*/gmd:report/*/gmd:result"> + <xsl:if test="$inspire='true'"> + <!-- + INSPIRE related dataset could contains a conformity section with: + * COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services + * INSPIRE Data Specification on <Theme Name> - <version> + * INSPIRE Specification on <Theme Name> - <version> for CRS and GRID + + Index those types of citation title to found dataset related to INSPIRE (which may be better than keyword + which are often used for other types of datasets). + + "1089/2010" is maybe too fuzzy but could work for translated citation like "Règlement n°1089/2010, Annexe II-6" TODO improved + --> + <xsl:if test="( + contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, '1089/2010') or + contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, 'INSPIRE Data Specification') or + contains(gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gco:CharacterString, 'INSPIRE Specification'))"> + <Field name="inspirerelated" string="on" store="false" index="true"/> + </xsl:if> + </xsl:if> + + <xsl:for-each select="//gmd:pass/gco:Boolean"> + <Field name="degree" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="//gmd:specification/*/gmd:title/gco:CharacterString"> + <Field name="specificationTitle" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="//gmd:specification/*/gmd:date/*/gmd:date"> + <Field name="specificationDate" string="{string(gco:Date[.!='']|gco:DateTime[.!=''])}" + store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each + select="//gmd:specification/*/gmd:date/*/gmd:dateType/gmd:CI_DateTypeCode/@codeListValue"> + <Field name="specificationDateType" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:for-each> + + <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage/*/gmd:statement/gco:CharacterString"> + <Field name="lineage" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === General stuff === --> + <!-- Metadata type --> + + <!-- Metadata on maps --> + <xsl:variable name="isDataset" select=" count(gmd:hierarchyLevel[gmd:MD_ScopeCode/@codeListValue='dataset']) > 0 or count(gmd:hierarchyLevel) = 0"/> - <xsl:variable name="isMapDigital" select="count(gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/ + <xsl:variable name="isMapDigital" select="count(gmd:identificationInfo/*/gmd:citation/gmd:CI_Citation/ gmd:presentationForm[gmd:CI_PresentationFormCode/@codeListValue = 'mapDigital']) > 0"/> - <xsl:variable name="isStatic" select="count(gmd:distributionInfo/gmd:MD_Distribution/ + <xsl:variable name="isStatic" select="count(gmd:distributionInfo/gmd:MD_Distribution/ gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString[contains(., 'PDF') or contains(., 'PNG') or contains(., 'JPEG')]) > 0"/> - <xsl:variable name="isInteractive" select="count(gmd:distributionInfo/gmd:MD_Distribution/ + <xsl:variable name="isInteractive" select="count(gmd:distributionInfo/gmd:MD_Distribution/ gmd:distributionFormat/gmd:MD_Format/gmd:name/gco:CharacterString[contains(., 'OGC:WMC') or contains(., 'OGC:OWS-C')]) > 0"/> - <xsl:variable name="isPublishedWithWMCProtocol" select="count(gmd:distributionInfo/gmd:MD_Distribution/ + <xsl:variable name="isPublishedWithWMCProtocol" select="count(gmd:distributionInfo/gmd:MD_Distribution/ gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol[starts-with(gco:CharacterString, 'OGC:WMC')]) > 0"/> - <xsl:choose> - <xsl:when test="$isDataset and $isMapDigital and + <xsl:choose> + <xsl:when test="$isDataset and $isMapDigital and ($isStatic or $isInteractive or $isPublishedWithWMCProtocol)"> - <Field name="type" string="map" store="true" index="true"/> - <xsl:choose> - <xsl:when test="$isStatic"> - <Field name="type" string="staticMap" store="true" index="true"/> - </xsl:when> - <xsl:when test="$isInteractive or $isPublishedWithWMCProtocol"> - <Field name="type" string="interactiveMap" store="true" index="true"/> - </xsl:when> - </xsl:choose> - </xsl:when> - <xsl:when test="$isDataset"> - <Field name="type" string="dataset" store="true" index="true"/> - </xsl:when> - <xsl:when test="gmd:hierarchyLevel"> - <xsl:for-each select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue[.!='']"> - <Field name="type" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:when> + <Field name="type" string="map" store="true" index="true"/> + <xsl:choose> + <xsl:when test="$isStatic"> + <Field name="type" string="staticMap" store="true" index="true"/> + </xsl:when> + <xsl:when test="$isInteractive or $isPublishedWithWMCProtocol"> + <Field name="type" string="interactiveMap" store="true" index="true"/> + </xsl:when> </xsl:choose> + </xsl:when> + <xsl:when test="$isDataset"> + <Field name="type" string="dataset" store="true" index="true"/> + </xsl:when> + <xsl:when test="gmd:hierarchyLevel"> + <xsl:for-each select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue[.!='']"> + <Field name="type" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:when> + </xsl:choose> - <xsl:choose> - <!-- Check if metadata is a service metadata record --> - <xsl:when test="gmd:identificationInfo/srv:SV_ServiceIdentification"> - <Field name="type" string="service" store="false" index="true"/> - </xsl:when> - <!-- <xsl:otherwise> - ... gmd:*_DataIdentification / hierachicalLevel is used and return dataset, serie, ... - </xsl:otherwise>--> - </xsl:choose> + <xsl:choose> + <!-- Check if metadata is a service metadata record --> + <xsl:when test="gmd:identificationInfo/srv:SV_ServiceIdentification"> + <Field name="type" string="service" store="false" index="true"/> + </xsl:when> + <!-- <xsl:otherwise> + ... gmd:*_DataIdentification / hierachicalLevel is used and return dataset, serie, ... + </xsl:otherwise>--> + </xsl:choose> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:hierarchyLevelName/gco:CharacterString"> - <Field name="levelName" string="{string(.)}" store="false" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:hierarchyLevelName/gco:CharacterString"> + <Field name="levelName" string="{string(.)}" store="false" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:language/gco:CharacterString + <xsl:for-each select="gmd:language/gco:CharacterString |gmd:language/gmd:LanguageCode/@codeListValue |gmd:locale/gmd:PT_Locale/gmd:languageCode/gmd:LanguageCode/@codeListValue"> - <Field name="language" string="{string(.)}" store="true" index="true"/> - <Field name="mdLanguage" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <Field name="language" string="{string(.)}" store="true" index="true"/> + <Field name="mdLanguage" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:fileIdentifier/gco:CharacterString"> - <Field name="fileId" string="{string(.)}" store="false" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:fileIdentifier/gco:CharacterString"> + <Field name="fileId" string="{string(.)}" store="false" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:parentIdentifier/gco:CharacterString"> - <Field name="parentUuid" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <Field name="isChild" string="{exists(gmd:parentIdentifier)}" store="true" index="true"/> + <xsl:for-each select="gmd:parentIdentifier/gco:CharacterString"> + <Field name="parentUuid" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + <Field name="isChild" string="{exists(gmd:parentIdentifier)}" store="true" index="true"/> - <xsl:for-each select="gmd:metadataStandardName/gco:CharacterString"> - <Field name="standardName" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:metadataStandardName/gco:CharacterString"> + <Field name="standardName" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:dateStamp/*"> - <Field name="changeDate" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:dateStamp/*"> + <Field name="changeDate" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:contact/*/gmd:organisationName/gco:CharacterString|gmd:contact/*/gmd:organisationName/gmx:Anchor"> - <Field name="metadataPOC" string="{string(.)}" store="true" index="true"/> + <xsl:for-each + select="gmd:contact/*/gmd:organisationName/gco:CharacterString|gmd:contact/*/gmd:organisationName/gmx:Anchor"> + <Field name="metadataPOC" string="{string(.)}" store="true" index="true"/> - <xsl:variable name="role" select="../../gmd:role/*/@codeListValue"/> - <xsl:variable name="roleTranslation" select="util:getCodelistTranslation('gmd:CI_RoleCode', string($role), string($isoLangId))"/> - <xsl:variable name="logo" select="../..//gmx:FileName/@src"/> - <xsl:variable name="email" select="../../gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"/> - <xsl:variable name="phone" select="../../gmd:contactInfo/*/gmd:phone/*/gmd:voice[normalize-space(.) != '']/*/text()"/> - <xsl:variable name="individualName" select="../../gmd:individualName/gco:CharacterString/text()"/> - <xsl:variable name="positionName" select="../../gmd:positionName/gco:CharacterString/text()"/> - <xsl:variable name="address" select="string-join(../../gmd:contactInfo/*/gmd:address/*/( + <xsl:variable name="role" select="../../gmd:role/*/@codeListValue"/> + <xsl:variable name="roleTranslation" + select="util:getCodelistTranslation('gmd:CI_RoleCode', string($role), string($isoLangId))"/> + <xsl:variable name="logo" select="../..//gmx:FileName/@src"/> + <xsl:variable name="email" + select="../../gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"/> + <xsl:variable name="phone" + select="../../gmd:contactInfo/*/gmd:phone/*/gmd:voice[normalize-space(.) != '']/*/text()"/> + <xsl:variable name="individualName" + select="../../gmd:individualName/gco:CharacterString/text()"/> + <xsl:variable name="positionName" select="../../gmd:positionName/gco:CharacterString/text()"/> + <xsl:variable name="address" select="string-join(../../gmd:contactInfo/*/gmd:address/*/( gmd:deliveryPoint|gmd:postalCode|gmd:city| gmd:administrativeArea|gmd:country)/gco:CharacterString/text(), ', ')"/> - <Field name="responsibleParty" - string="{concat($roleTranslation, '|metadata|', ., '|', $logo, '|', string-join($email, ','), '|', $individualName, '|', $positionName, '|', $address, '|', string-join($phone, ','))}" - store="true" index="false"/> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Reference system info === --> - - <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> - <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> - <xsl:variable name="crs" select="concat(string(gmd:codeSpace/gco:CharacterString),'::',string(gmd:code/gco:CharacterString))"/> - - <xsl:if test="$crs != '::'"> - <Field name="crs" string="{$crs}" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - </xsl:for-each> - - <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> - <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> - <Field name="authority" string="{string(gmd:codeSpace/gco:CharacterString)}" store="false" index="true"/> - <Field name="crsCode" string="{string(gmd:code/gco:CharacterString)}" store="false" index="true"/> - <Field name="crsVersion" string="{string(gmd:version/gco:CharacterString)}" store="false" index="true"/> - </xsl:for-each> + <Field name="responsibleParty" + string="{concat($roleTranslation, '|metadata|', ., '|', $logo, '|', string-join($email, ','), '|', $individualName, '|', $positionName, '|', $address, '|', string-join($phone, ','))}" + store="true" index="false"/> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Reference system info === --> + + <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> + <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> + <xsl:variable name="crs" + select="concat(string(gmd:codeSpace/gco:CharacterString),'::',string(gmd:code/gco:CharacterString))"/> + + <xsl:if test="$crs != '::'"> + <Field name="crs" string="{$crs}" store="true" index="true"/> + </xsl:if> + </xsl:for-each> + </xsl:for-each> + + <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> + <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> + <Field name="authority" string="{string(gmd:codeSpace/gco:CharacterString)}" store="false" + index="true"/> + <Field name="crsCode" string="{string(gmd:code/gco:CharacterString)}" store="false" + index="true"/> + <Field name="crsVersion" string="{string(gmd:version/gco:CharacterString)}" store="false" + index="true"/> + </xsl:for-each> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Free text search === --> + + <Field name="any" store="false" index="true"> + <xsl:attribute name="string"> + <xsl:value-of select="normalize-space(string(.))"/> + <xsl:text> </xsl:text> + <xsl:for-each select="//@codeListValue"> + <xsl:value-of select="concat(., ' ')"/> </xsl:for-each> + </xsl:attribute> + </Field> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Free text search === --> - - <Field name="any" store="false" index="true"> - <xsl:attribute name="string"> - <xsl:value-of select="normalize-space(string(.))"/> - <xsl:text> </xsl:text> - <xsl:for-each select="//@codeListValue"> - <xsl:value-of select="concat(., ' ')"/> - </xsl:for-each> - </xsl:attribute> - </Field> - - <xsl:variable name="identification" select="gmd:identificationInfo//gmd:MD_DataIdentification| + <xsl:variable name="identification" select="gmd:identificationInfo//gmd:MD_DataIdentification| gmd:identificationInfo//*[contains(@gco:isoType, 'MD_DataIdentification')]| gmd:identificationInfo/srv:SV_ServiceIdentification"/> - <Field name="anylight" store="false" index="true"> - <xsl:attribute name="string"> - <xsl:for-each - select="$identification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString| + <Field name="anylight" store="false" index="true"> + <xsl:attribute name="string"> + <xsl:for-each + select="$identification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString| $identification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle/gco:CharacterString| $identification/gmd:abstract/gco:CharacterString| $identification/gmd:credit/gco:CharacterString| @@ -861,22 +932,22 @@ $identification/gmd:supplementalInformation/gco:CharacterString| $identification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword/gco:CharacterString| $identification/gmd:descriptiveKeywords/gmd:MD_Keywords/gmd:keyword/gmx:Anchor"> - <xsl:value-of select="concat(., ' ')"/> - </xsl:for-each> - </xsl:attribute> - </Field> + <xsl:value-of select="concat(., ' ')"/> + </xsl:for-each> + </xsl:attribute> + </Field> - <!-- Index all codelist --> - <xsl:for-each select=".//*[*/@codeListValue != '']"> - <Field name="cl_{local-name()}" + <!-- Index all codelist --> + <xsl:for-each select=".//*[*/@codeListValue != '']"> + <Field name="cl_{local-name()}" string="{*/@codeListValue}" store="true" index="true"/> - <Field name="cl_{concat(local-name(), '_text')}" + <Field name="cl_{concat(local-name(), '_text')}" string="{util:getCodelistTranslation(name(*), string(*/@codeListValue), string($isoLangId))}" store="true" index="true"/> - </xsl:for-each> - </xsl:template> + </xsl:for-each> + </xsl:template> <!--<xsl:template name="indexContact"> <xsl:param name="contact"/> @@ -900,53 +971,54 @@ store="true" index="false"/> </xsl:template>--> - <!-- ========================================================================================= --> - - <!-- inspireThemes is a nodeset consisting of skos:Concept elements --> - <!-- each containing a skos:definition and skos:prefLabel for each language --> - <!-- This template finds the provided keyword in the skos:prefLabel elements and - returns the English one from the same skos:Concept --> - <xsl:template name="translateInspireThemeToEnglish"> - <xsl:param name="keyword"/> - <xsl:param name="inspireThemes"/> - - <xsl:value-of select="$inspireThemes/skos:prefLabel[@xml:lang='en' and ../skos:prefLabel = $keyword]/text()"/> - </xsl:template> - - <xsl:template name="getInspireThemeAcronym"> - <xsl:param name="keyword"/> - - <xsl:value-of select="$inspire-theme/skos:altLabel[../skos:prefLabel = $keyword]/text()"/> - </xsl:template> - - <xsl:template name="determineInspireAnnex"> - <xsl:param name="keyword"/> - <xsl:param name="inspireThemes"/> - <xsl:variable name="englishKeywordMixedCase"> - <xsl:call-template name="translateInspireThemeToEnglish"> - <xsl:with-param name="keyword" select="$keyword"/> - <xsl:with-param name="inspireThemes" select="$inspireThemes"/> - </xsl:call-template> - </xsl:variable> - <xsl:variable name="englishKeyword" select="lower-case($englishKeywordMixedCase)"/> - <!-- Another option could be to add the annex info in the SKOS thesaurus using something - like a related concept. --> - <xsl:choose> - <!-- annex i --> - <xsl:when test="$englishKeyword='coordinate reference systems' or $englishKeyword='geographical grid systems' + <!-- ========================================================================================= --> + + <!-- inspireThemes is a nodeset consisting of skos:Concept elements --> + <!-- each containing a skos:definition and skos:prefLabel for each language --> + <!-- This template finds the provided keyword in the skos:prefLabel elements and + returns the English one from the same skos:Concept --> + <xsl:template name="translateInspireThemeToEnglish"> + <xsl:param name="keyword"/> + <xsl:param name="inspireThemes"/> + + <xsl:value-of + select="$inspireThemes/skos:prefLabel[@xml:lang='en' and ../skos:prefLabel = $keyword]/text()"/> + </xsl:template> + + <xsl:template name="getInspireThemeAcronym"> + <xsl:param name="keyword"/> + + <xsl:value-of select="$inspire-theme/skos:altLabel[../skos:prefLabel = $keyword]/text()"/> + </xsl:template> + + <xsl:template name="determineInspireAnnex"> + <xsl:param name="keyword"/> + <xsl:param name="inspireThemes"/> + <xsl:variable name="englishKeywordMixedCase"> + <xsl:call-template name="translateInspireThemeToEnglish"> + <xsl:with-param name="keyword" select="$keyword"/> + <xsl:with-param name="inspireThemes" select="$inspireThemes"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="englishKeyword" select="lower-case($englishKeywordMixedCase)"/> + <!-- Another option could be to add the annex info in the SKOS thesaurus using something + like a related concept. --> + <xsl:choose> + <!-- annex i --> + <xsl:when test="$englishKeyword='coordinate reference systems' or $englishKeyword='geographical grid systems' or $englishKeyword='geographical names' or $englishKeyword='administrative units' or $englishKeyword='addresses' or $englishKeyword='cadastral parcels' or $englishKeyword='transport networks' or $englishKeyword='hydrography' or $englishKeyword='protected sites'"> - <xsl:text>i</xsl:text> - </xsl:when> - <!-- annex ii --> - <xsl:when test="$englishKeyword='elevation' or $englishKeyword='land cover' + <xsl:text>i</xsl:text> + </xsl:when> + <!-- annex ii --> + <xsl:when test="$englishKeyword='elevation' or $englishKeyword='land cover' or $englishKeyword='orthoimagery' or $englishKeyword='geology'"> - <xsl:text>ii</xsl:text> - </xsl:when> - <!-- annex iii --> - <xsl:when test="$englishKeyword='statistical units' or $englishKeyword='buildings' + <xsl:text>ii</xsl:text> + </xsl:when> + <!-- annex iii --> + <xsl:when test="$englishKeyword='statistical units' or $englishKeyword='buildings' or $englishKeyword='soil' or $englishKeyword='land use' or $englishKeyword='human health and safety' or $englishKeyword='utility and governmental services' or $englishKeyword='environmental monitoring facilities' or $englishKeyword='production and industrial facilities' @@ -957,9 +1029,9 @@ or $englishKeyword='sea regions' or $englishKeyword='bio-geographical regions' or $englishKeyword='habitats and biotopes' or $englishKeyword='species distribution' or $englishKeyword='energy resources' or $englishKeyword='mineral resources'"> - <xsl:text>iii</xsl:text> - </xsl:when> - <!-- inspire annex cannot be established: leave empty --> - </xsl:choose> - </xsl:template> + <xsl:text>iii</xsl:text> + </xsl:when> + <!-- inspire annex cannot be established: leave empty --> + </xsl:choose> + </xsl:template> </xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/index-subtemplate-fields.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/index-subtemplate-fields.xsl index 90f7d3d9ff6..3b4b2a88e06 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/index-fields/index-subtemplate-fields.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/index-fields/index-subtemplate-fields.xsl @@ -22,14 +22,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" - xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gml="http://www.opengis.net/gml" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:geonet="http://www.fao.org/geonetwork" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:skos="http://www.w3.org/2004/02/skos/core#"> +<xsl:stylesheet xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="2.0" +> + + <!-- Subtemplate indexing - <!-- Subtemplate indexing - Add the [count(ancestor::node()) = 1] to only match element at the root of the document. This is the method to identify a subtemplate. --> @@ -40,11 +39,12 @@ <xsl:variable name="name" select="normalize-space(gmd:individualName/gco:CharacterString)"/> <Field name="_title" - string="{if ($name != '') then concat($org, ' (', $name, ')') else $org}" - store="true" index="true"/> + string="{if ($name != '') then concat($org, ' (', $name, ')') else $org}" + store="true" index="true"/> <Field name="orgName" string="{$org}" store="true" index="true"/> <Field name="orgNameTree" string="{$org}" store="true" index="true"/> - <xsl:for-each select="gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"> + <xsl:for-each + select="gmd:contactInfo/*/gmd:address/*/gmd:electronicMailAddress/gco:CharacterString"> <Field name="email" string="{.}" store="true" index="true"/> </xsl:for-each> <xsl:call-template name="subtemplate-common-fields"/> @@ -53,10 +53,10 @@ <xsl:template mode="index" match="gmd:MD_Distribution[count(ancestor::node()) = 1]"> <Field name="_title" - string="{string-join(gmd:transferOptions/gmd:MD_DigitalTransferOptions/ + string="{string-join(gmd:transferOptions/gmd:MD_DigitalTransferOptions/ gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL, ', ')}" - store="true" index="true"/> - + store="true" index="true"/> + <xsl:call-template name="subtemplate-common-fields"/> </xsl:template> @@ -71,9 +71,9 @@ <xsl:template mode="index" match="gmd:EX_Extent[count(ancestor::node()) = 1]"> <Field name="_title" - string="{gmd:description/gco:CharacterString}" - store="true" index="true"/> - + string="{gmd:description/gco:CharacterString}" + store="true" index="true"/> + <xsl:call-template name="subtemplate-common-fields"/> </xsl:template> diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl index c66b233a14f..bdf512aef34 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl @@ -23,490 +23,519 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="1.0" xmlns:gmd="http://www.isotc211.org/2005/gmd" - xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:gml="http://www.opengis.net/gml" - xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" - xmlns:util="java:org.fao.geonet.util.XslUtil" - xmlns:java="java:org.fao.geonet.util.XslUtil" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - > - - <!--This file defines what parts of the metadata are indexed by Lucene - Searches can be conducted on indexes defined here. - The Field@name attribute defines the name of the search variable. - If a variable has to be maintained in the user session, it needs to be - added to the GeoNetwork constants in the Java source code. - Please keep indexes consistent among metadata standards if they should - work accross different metadata resources --> - <!-- ========================================================================================= --> - - <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no" /> - <xsl:include href="../convert/functions.xsl"/> - - <!-- ========================================================================================= --> - <xsl:variable name="isoDocLangId"> - <xsl:call-template name="langId19139"/> - </xsl:variable> - - <xsl:template match="/"> - - <Documents> - <xsl:for-each select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:locale/gmd:PT_Locale"> - <xsl:call-template name="document"> - <xsl:with-param name="isoLangId" select="java:threeCharLangCode(normalize-space(string(gmd:languageCode/gmd:LanguageCode/@codeListValue)))"/> - <xsl:with-param name="langId" select="@id"></xsl:with-param> - </xsl:call-template> - </xsl:for-each> - <!-- - Create a language document only if PT_Locale defined (ie. is a multilingual document) - and gmd:locale contains the main metadata language. --> - <xsl:if test="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:locale/gmd:PT_Locale - and count(/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/ - gmd:locale/gmd:PT_Locale/gmd:languageCode/gmd:LanguageCode[@codeListValue = $isoDocLangId]) = 0"> - <xsl:call-template name="document"> - <xsl:with-param name="isoLangId" select="$isoDocLangId"></xsl:with-param> - <xsl:with-param name="langId" select="java:twoCharLangCode(normalize-space(string($isoDocLangId)))"></xsl:with-param> - </xsl:call-template> - </xsl:if> - </Documents> - </xsl:template> - - <!-- ========================================================================================= --> - <xsl:template name="document"> - <xsl:param name="isoLangId"/> - <xsl:param name="langId"/> - - <Document locale="{$isoLangId}"> - <Field name="_locale" string="{$isoLangId}" store="true" index="true"/> - <Field name="_docLocale" string="{$isoDocLangId}" store="true" index="true"/> - - <xsl:variable name="poundLangId" select="concat('#',$langId)" /> - <xsl:variable name="_defaultTitle"> - <xsl:call-template name="defaultTitle"> - <xsl:with-param name="isoDocLangId" select="$isoLangId"/> - </xsl:call-template> - </xsl:variable> - <xsl:if test="$isoLangId!=$isoDocLangId"> - <!-- not tokenized title for sorting --> - <Field name="_defaultTitle" string="{string($_defaultTitle)}" store="true" index="true" /> - </xsl:if> - <xsl:variable name="title" - select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:identificationInfo//gmd:citation//gmd:title//gmd:LocalisedCharacterString[@locale=$poundLangId]"/> - - <!-- not tokenized title for sorting --> - <xsl:choose> - <xsl:when test="normalize-space($title) = ''"> - <Field name="_title" string="{string($_defaultTitle)}" store="true" index="true" /> - </xsl:when> - <xsl:otherwise> - <Field name="_title" string="{string($title)}" store="true" index="true" /> - </xsl:otherwise> - </xsl:choose> - - <xsl:apply-templates select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']" mode="metadata"> - <xsl:with-param name="langId" select="$poundLangId"/> - <xsl:with-param name="isoLangId" select="$isoLangId"/> - </xsl:apply-templates> +<xsl:stylesheet xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gml="http://www.opengis.net/gml" + xmlns:srv="http://www.isotc211.org/2005/srv" + xmlns:util="java:org.fao.geonet.util.XslUtil" + xmlns:java="java:org.fao.geonet.util.XslUtil" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version="1.0" +> + + <!--This file defines what parts of the metadata are indexed by Lucene + Searches can be conducted on indexes defined here. + The Field@name attribute defines the name of the search variable. + If a variable has to be maintained in the user session, it needs to be + added to the GeoNetwork constants in the Java source code. + Please keep indexes consistent among metadata standards if they should + work accross different metadata resources --> + <!-- ========================================================================================= --> + + <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/> + <xsl:include href="../convert/functions.xsl"/> + + <!-- ========================================================================================= --> + <xsl:variable name="isoDocLangId"> + <xsl:call-template name="langId19139"/> + </xsl:variable> + + <xsl:template match="/"> + + <Documents> + <xsl:for-each + select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:locale/gmd:PT_Locale"> + <xsl:call-template name="document"> + <xsl:with-param name="isoLangId" + select="java:threeCharLangCode(normalize-space(string(gmd:languageCode/gmd:LanguageCode/@codeListValue)))"/> + <xsl:with-param name="langId" select="@id"></xsl:with-param> + </xsl:call-template> + </xsl:for-each> + <!-- + Create a language document only if PT_Locale defined (ie. is a multilingual document) + and gmd:locale contains the main metadata language. --> + <xsl:if test="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:locale/gmd:PT_Locale + and count(/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/ + gmd:locale/gmd:PT_Locale/gmd:languageCode/gmd:LanguageCode[@codeListValue = $isoDocLangId]) = 0"> + <xsl:call-template name="document"> + <xsl:with-param name="isoLangId" select="$isoDocLangId"></xsl:with-param> + <xsl:with-param name="langId" + select="java:twoCharLangCode(normalize-space(string($isoDocLangId)))"></xsl:with-param> + </xsl:call-template> + </xsl:if> + </Documents> + </xsl:template> + + <!-- ========================================================================================= --> + <xsl:template name="document"> + <xsl:param name="isoLangId"/> + <xsl:param name="langId"/> + + <Document locale="{$isoLangId}"> + <Field name="_locale" string="{$isoLangId}" store="true" index="true"/> + <Field name="_docLocale" string="{$isoDocLangId}" store="true" index="true"/> + + <xsl:variable name="poundLangId" select="concat('#',$langId)"/> + <xsl:variable name="_defaultTitle"> + <xsl:call-template name="defaultTitle"> + <xsl:with-param name="isoDocLangId" select="$isoLangId"/> + </xsl:call-template> + </xsl:variable> + <xsl:if test="$isoLangId!=$isoDocLangId"> + <!-- not tokenized title for sorting --> + <Field name="_defaultTitle" string="{string($_defaultTitle)}" store="true" index="true"/> + </xsl:if> + <xsl:variable name="title" + select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']/gmd:identificationInfo//gmd:citation//gmd:title//gmd:LocalisedCharacterString[@locale=$poundLangId]"/> + + <!-- not tokenized title for sorting --> + <xsl:choose> + <xsl:when test="normalize-space($title) = ''"> + <Field name="_title" string="{string($_defaultTitle)}" store="true" index="true"/> + </xsl:when> + <xsl:otherwise> + <Field name="_title" string="{string($title)}" store="true" index="true"/> + </xsl:otherwise> + </xsl:choose> + + <xsl:apply-templates select="/*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']" + mode="metadata"> + <xsl:with-param name="langId" select="$poundLangId"/> + <xsl:with-param name="isoLangId" select="$isoLangId"/> + </xsl:apply-templates> + + <xsl:apply-templates mode="index" + select="*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']"> + <xsl:with-param name="langId" select="$poundLangId"/> + </xsl:apply-templates> + </Document> + </xsl:template> + + <xsl:template mode="index" match="*|@*"> + <xsl:param name="langId"/> + + <xsl:apply-templates mode="index" select="*|@*"> + <xsl:with-param name="langId" select="$langId"/> + </xsl:apply-templates> + </xsl:template> + + <!-- ========================================================================================= --> + + <xsl:template match="*" mode="metadata"> + <xsl:param name="langId"/> + <xsl:param name="isoLangId"/> + + <!-- === Data or Service Identification === --> + + <!-- the double // here seems needed to index MD_DataIdentification when + it is nested in a SV_ServiceIdentification class --> + + <xsl:for-each select="gmd:identificationInfo/*"> + + + <xsl:for-each select="gmd:citation/gmd:CI_Citation"> + + <xsl:for-each + select="gmd:identifier/gmd:MD_Identifier/gmd:code//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="identifier" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:apply-templates mode="index" select="*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']"> - <xsl:with-param name="langId" select="$poundLangId"/> - </xsl:apply-templates> - </Document> - </xsl:template> + <!-- not tokenized title for sorting --> + <Field name="_defaultTitle" string="{string(gmd:title/gco:CharacterString)}" store="true" + index="true"/> + <!-- not tokenized title for sorting --> + <Field name="_title" + string="{string(gmd:title//gmd:LocalisedCharacterString[@locale=$langId])}" + store="true" index="true"/> - <xsl:template mode="index" match="*|@*"> - <xsl:param name="langId" /> + <xsl:for-each select="gmd:title//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="title" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:apply-templates mode="index" select="*|@*"> - <xsl:with-param name="langId" select="$langId"/> - </xsl:apply-templates> - </xsl:template> + <xsl:for-each select="gmd:alternateTitle//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="altTitle" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- ========================================================================================= --> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='revision']/gmd:date/gco:Date"> + <Field name="revisionDate" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:template match="*" mode="metadata"> - <xsl:param name="langId" /> - <xsl:param name="isoLangId"/> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='creation']/gmd:date/gco:Date"> + <Field name="createDate" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- === Data or Service Identification === --> + <xsl:for-each + select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='publication']/gmd:date/gco:Date"> + <Field name="publicationDate" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- the double // here seems needed to index MD_DataIdentification when - it is nested in a SV_ServiceIdentification class --> + <!-- fields used to search for metadata in paper or digital format --> - <xsl:for-each select="gmd:identificationInfo/*"> - + <xsl:for-each select="gmd:presentationForm"> + <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Digital')"> + <Field name="digital" string="true" store="true" index="true"/> + </xsl:if> + <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Hardcopy')"> + <Field name="paper" string="true" store="true" index="true"/> + </xsl:if> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="gmd:citation/gmd:CI_Citation"> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:identifier/gmd:MD_Identifier/gmd:code//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="identifier" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:abstract//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="abstract" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- not tokenized title for sorting --> - <Field name="_defaultTitle" string="{string(gmd:title/gco:CharacterString)}" store="true" index="true"/> - <!-- not tokenized title for sorting --> - <Field name="_title" string="{string(gmd:title//gmd:LocalisedCharacterString[@locale=$langId])}" store="true" index="true"/> + <xsl:for-each select="*/gmd:EX_Extent"> + <xsl:apply-templates select="gmd:geographicElement/gmd:EX_GeographicBoundingBox" + mode="latLon"/> - <xsl:for-each select="gmd:title//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="title" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each + select="gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="geoDescCode" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:alternateTitle//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="altTitle" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:description//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="extentDesc" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='revision']/gmd:date/gco:Date"> - <Field name="revisionDate" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent| + gmd:temporalElement/gmd:EX_SpatialTemporalExtent/gmd:extent"> + <xsl:for-each select="gml:TimePeriod/gml:beginPosition"> + <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='creation']/gmd:date/gco:Date"> - <Field name="createDate" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gml:TimePeriod/gml:endPosition"> + <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:date/gmd:CI_Date[gmd:dateType/gmd:CI_DateTypeCode/@codeListValue='publication']/gmd:date/gco:Date"> - <Field name="publicationDate" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gml:TimePeriod/gml:begin/gml:TimeInstant/gml:timePosition"> + <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- fields used to search for metadata in paper or digital format --> + <xsl:for-each select="gml:TimePeriod/gml:end/gml:TimeInstant/gml:timePosition"> + <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:presentationForm"> - <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Digital')"> - <Field name="digital" string="true" store="true" index="true"/> - </xsl:if> + <xsl:for-each select="gml:TimeInstant/gml:timePosition"> + <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> + <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:if test="contains(gmd:CI_PresentationFormCode/@codeListValue, 'Hardcopy')"> - <Field name="paper" string="true" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - </xsl:for-each> + </xsl:for-each> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:abstract//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="abstract" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="*/gmd:EX_Extent"> - <xsl:apply-templates select="gmd:geographicElement/gmd:EX_GeographicBoundingBox" mode="latLon"/> + <xsl:for-each select="*/gmd:MD_Keywords"> + <xsl:for-each select="gmd:keyword//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="keyword" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier/gmd:MD_Identifier/gmd:code//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="geoDescCode" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:type/gmd:MD_KeywordTypeCode/@codeListValue"> + <Field name="keywordType" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="gmd:description//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="extentDesc" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:temporalElement/gmd:EX_TemporalExtent/gmd:extent| - gmd:temporalElement/gmd:EX_SpatialTemporalExtent/gmd:extent"> - <xsl:for-each select="gml:TimePeriod/gml:beginPosition"> - <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each + select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="orgName" string="{string(.)}" store="true" index="true"/> + <Field name="_orgName" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + <xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString| + gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualFirstName/gco:CharacterString| + gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualLastName/gco:CharacterString"> + <Field name="creator" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gml:TimePeriod/gml:endPosition"> - <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:choose> + <xsl:when test="gmd:resourceConstraints/gmd:MD_SecurityConstraints"> + <Field name="secConstr" string="true" store="true" index="true"/> + </xsl:when> + <xsl:otherwise> + <Field name="secConstr" string="false" store="true" index="true"/> + </xsl:otherwise> + </xsl:choose> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:for-each select="gmd:topicCategory/gmd:MD_TopicCategoryCode"> + <Field name="topicCat" string="{string(.)}" store="true" index="true"/> + <Field name="keyword" + string="{java:getCodelistTranslation('gmd:MD_TopicCategoryCode', string(.), string($isoLangId))}" + store="true" + index="true"/> + </xsl:for-each> - <xsl:for-each select="gml:TimePeriod/gml:begin/gml:TimeInstant/gml:timePosition"> - <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gml:TimePeriod/gml:end/gml:TimeInstant/gml:timePosition"> - <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:language/gco:CharacterString"> + <Field name="datasetLang" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="gml:TimeInstant/gml:timePosition"> - <Field name="tempExtentBegin" string="{string(.)}" store="true" index="true"/> - <Field name="tempExtentEnd" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - </xsl:for-each> - </xsl:for-each> + <xsl:for-each select="gmd:spatialResolution/gmd:MD_Resolution"> + <xsl:for-each + select="gmd:equivalentScale/gmd:MD_RepresentativeFraction/gmd:denominator/gco:Integer"> + <Field name="denominator" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <xsl:for-each select="gmd:distance/gco:Distance"> + <Field name="distanceVal" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:for-each select="*/gmd:MD_Keywords"> - <xsl:for-each select="gmd:keyword//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="keyword" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:distance/gco:Distance/@uom"> + <Field name="distanceUom" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:for-each> - <xsl:for-each select="gmd:type/gmd:MD_KeywordTypeCode/@codeListValue"> - <Field name="keywordType" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:organisationName//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="orgName" string="{string(.)}" store="true" index="true"/> - <Field name="_orgName" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <xsl:for-each select="gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualName/gco:CharacterString| - gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualFirstName/gco:CharacterString| - gmd:pointOfContact/gmd:CI_ResponsibleParty/gmd:individualLastName/gco:CharacterString"> - <Field name="creator" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:choose> - <xsl:when test="gmd:resourceConstraints/gmd:MD_SecurityConstraints"> - <Field name="secConstr" string="true" store="true" index="true"/> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <xsl:for-each select="gmd:graphicOverview/gmd:MD_BrowseGraphic"> + <xsl:variable name="fileName" select="gmd:fileName/gco:CharacterString"/> + <xsl:if test="$fileName != ''"> + <xsl:variable name="fileDescr" select="gmd:fileDescription/gco:CharacterString"/> + <xsl:choose> + <xsl:when test="contains($fileName ,'://')"> + <xsl:choose> + <xsl:when test="string($fileDescr)='thumbnail'"> + <Field name="image" string="{concat('thumbnail|', $fileName)}" store="true" + index="false"/> + </xsl:when> + <xsl:when test="string($fileDescr)='large_thumbnail'"> + <Field name="image" string="{concat('overview|', $fileName)}" store="true" + index="false"/> </xsl:when> <xsl:otherwise> - <Field name="secConstr" string="false" store="true" index="true"/> + <Field name="image" string="{concat('unknown|', $fileName)}" store="true" + index="false"/> </xsl:otherwise> - </xsl:choose> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:topicCategory/gmd:MD_TopicCategoryCode"> - <Field name="topicCat" string="{string(.)}" store="true" index="true"/> - <Field name="keyword" - string="{java:getCodelistTranslation('gmd:MD_TopicCategoryCode', string(.), string($isoLangId))}" - store="true" - index="true"/> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:language/gco:CharacterString"> - <Field name="datasetLang" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:spatialResolution/gmd:MD_Resolution"> - <xsl:for-each select="gmd:equivalentScale/gmd:MD_RepresentativeFraction/gmd:denominator/gco:Integer"> - <Field name="denominator" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:distance/gco:Distance"> - <Field name="distanceVal" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="gmd:distance/gco:Distance/@uom"> - <Field name="distanceUom" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - <xsl:for-each select="gmd:graphicOverview/gmd:MD_BrowseGraphic"> - <xsl:variable name="fileName" select="gmd:fileName/gco:CharacterString"/> - <xsl:if test="$fileName != ''"> - <xsl:variable name="fileDescr" select="gmd:fileDescription/gco:CharacterString"/> - <xsl:choose> - <xsl:when test="contains($fileName ,'://')"> - <xsl:choose> - <xsl:when test="string($fileDescr)='thumbnail'"> - <Field name="image" string="{concat('thumbnail|', $fileName)}" store="true" index="false"/> - </xsl:when> - <xsl:when test="string($fileDescr)='large_thumbnail'"> - <Field name="image" string="{concat('overview|', $fileName)}" store="true" index="false"/> - </xsl:when> - <xsl:otherwise> - <Field name="image" string="{concat('unknown|', $fileName)}" store="true" index="false"/> - </xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:when test="string($fileDescr)='thumbnail'"> - <!-- FIXME : relative path --> - <Field name="image" string="{concat($fileDescr, '|', '../../srv/eng/resources.get?uuid=', //gmd:fileIdentifier/gco:CharacterString, '&fname=', $fileName, '&access=public')}" store="true" index="false"/> - </xsl:when> - <xsl:when test="string($fileDescr)='large_thumbnail'"> - <!-- FIXME : relative path --> - <Field name="image" string="{concat('overview', '|', '../../srv/eng/resources.get?uuid=', //gmd:fileIdentifier/gco:CharacterString, '&fname=', $fileName, '&access=public')}" store="true" index="false"/> - </xsl:when> - </xsl:choose> - </xsl:if> - </xsl:for-each> - - <!-- Index aggregation info and provides option to query by type of association - and type of initiative - - Aggregation info is indexed by adding the following fields to the index: - * agg_use: boolean - * agg_with_association: {$associationType} - * agg_{$associationType}: {$code} - * agg_{$associationType}_with_initiative: {$initiativeType} - * agg_{$associationType}_{$initiativeType}: {$code} - - Sample queries: - * Search for records with siblings: http://localhost:8080/geonetwork/srv/fre/q?agg_use=true - * Search for records having a crossReference with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference of type "study" with another record: - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_study=23f0478a-14ba-4a24-b365-8be88d5e9e8c - * Search for records having a crossReference of type "study": - http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_with_initiative=study - * Search for records having a "crossReference" : - http://localhost:8080/geonetwork/srv/fre/q?agg_with_association=crossReference - --> - <xsl:for-each select="gmd:aggregationInfo/gmd:MD_AggregateInformation"> - <xsl:variable name="code" select="gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString| - gmd:aggregateDataSetIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"/> - <xsl:if test="$code != ''"> - <xsl:variable name="associationType" select="gmd:associationType/gmd:DS_AssociationTypeCode/@codeListValue"/> - <xsl:variable name="initiativeType" select="gmd:initiativeType/gmd:DS_InitiativeTypeCode/@codeListValue"/> - <Field name="agg_{$associationType}_{$initiativeType}" string="{$code}" store="false" index="true"/> - <Field name="agg_{$associationType}_with_initiative" string="{$initiativeType}" store="false" index="true"/> - <Field name="agg_{$associationType}" string="{$code}" store="true" index="true"/> - <Field name="agg_associated" string="{$code}" store="false" index="true"/> - <Field name="agg_with_association" string="{$associationType}" store="false" index="true"/> - <Field name="agg_use" string="true" store="false" index="true"/> - </xsl:if> - </xsl:for-each> - - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- Fields use to search on Service --> - - <xsl:for-each select="srv:serviceType/gco:LocalName"> - <Field name="serviceType" string="{string(.)}" store="true" index="true"/> - <Field name="type" string="service-{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="srv:serviceTypeVersion/gco:CharacterString"> - <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="//srv:SV_OperationMetadata/srv:operationName/gco:CharacterString"> - <Field name="operation" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="srv:operatesOn/@uuidref"> - <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="srv:coupledResource"> - <xsl:for-each select="srv:SV_CoupledResource/srv:identifier/gco:CharacterString"> - <Field name="operatesOnIdentifier" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - - <xsl:for-each select="srv:SV_CoupledResource/srv:operationName/gco:CharacterString"> - <Field name="operatesOnName" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> + </xsl:choose> + </xsl:when> + <xsl:when test="string($fileDescr)='thumbnail'"> + <!-- FIXME : relative path --> + <Field name="image" + string="{concat($fileDescr, '|', '../../srv/eng/resources.get?uuid=', //gmd:fileIdentifier/gco:CharacterString, '&fname=', $fileName, '&access=public')}" + store="true" index="false"/> + </xsl:when> + <xsl:when test="string($fileDescr)='large_thumbnail'"> + <!-- FIXME : relative path --> + <Field name="image" + string="{concat('overview', '|', '../../srv/eng/resources.get?uuid=', //gmd:fileIdentifier/gco:CharacterString, '&fname=', $fileName, '&access=public')}" + store="true" index="false"/> + </xsl:when> + </xsl:choose> + </xsl:if> + </xsl:for-each> - </xsl:for-each> + <!-- Index aggregation info and provides option to query by type of association + and type of initiative + + Aggregation info is indexed by adding the following fields to the index: + * agg_use: boolean + * agg_with_association: {$associationType} + * agg_{$associationType}: {$code} + * agg_{$associationType}_with_initiative: {$initiativeType} + * agg_{$associationType}_{$initiativeType}: {$code} + + Sample queries: + * Search for records with siblings: http://localhost:8080/geonetwork/srv/fre/q?agg_use=true + * Search for records having a crossReference with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference of type "study" with another record: + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_study=23f0478a-14ba-4a24-b365-8be88d5e9e8c + * Search for records having a crossReference of type "study": + http://localhost:8080/geonetwork/srv/fre/q?agg_crossReference_with_initiative=study + * Search for records having a "crossReference" : + http://localhost:8080/geonetwork/srv/fre/q?agg_with_association=crossReference + --> + <xsl:for-each select="gmd:aggregationInfo/gmd:MD_AggregateInformation"> + <xsl:variable name="code" select="gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString| + gmd:aggregateDataSetIdentifier/gmd:RS_Identifier/gmd:code/gco:CharacterString"/> + <xsl:if test="$code != ''"> + <xsl:variable name="associationType" + select="gmd:associationType/gmd:DS_AssociationTypeCode/@codeListValue"/> + <xsl:variable name="initiativeType" + select="gmd:initiativeType/gmd:DS_InitiativeTypeCode/@codeListValue"/> + <Field name="agg_{$associationType}_{$initiativeType}" string="{$code}" store="false" + index="true"/> + <Field name="agg_{$associationType}_with_initiative" string="{$initiativeType}" + store="false" index="true"/> + <Field name="agg_{$associationType}" string="{$code}" store="true" index="true"/> + <Field name="agg_associated" string="{$code}" store="false" index="true"/> + <Field name="agg_with_association" string="{$associationType}" store="false" + index="true"/> + <Field name="agg_use" string="true" store="false" index="true"/> + </xsl:if> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- Fields use to search on Service --> + + <xsl:for-each select="srv:serviceType/gco:LocalName"> + <Field name="serviceType" string="{string(.)}" store="true" index="true"/> + <Field name="type" string="service-{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="srv:serviceTypeVersion/gco:CharacterString"> + <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="//srv:SV_OperationMetadata/srv:operationName/gco:CharacterString"> + <Field name="operation" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <xsl:for-each select="srv:operatesOn/@uuidref"> + <Field name="operatesOn" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Content info === --> - <xsl:for-each select="gmd:contentInfo/*/gmd:featureCatalogueCitation[@uuidref]"> - <Field name="hasfeaturecat" string="{string(@uuidref)}" store="false" index="true"/> + <xsl:for-each select="srv:coupledResource"> + <xsl:for-each select="srv:SV_CoupledResource/srv:identifier/gco:CharacterString"> + <Field name="operatesOnIdentifier" string="{string(.)}" store="true" index="true"/> </xsl:for-each> - <!-- === Data Quality === --> - <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage//gmd:source[@uuidref]"> - <Field name="hassource" string="{string(@uuidref)}" store="false" index="true"/> + <xsl:for-each select="srv:SV_CoupledResource/srv:operationName/gco:CharacterString"> + <Field name="operatesOnName" string="{string(.)}" store="true" index="true"/> </xsl:for-each> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Distribution === --> + </xsl:for-each> - <xsl:for-each select="gmd:distributionInfo/gmd:MD_Distribution"> - <xsl:for-each select="gmd:distributionFormat/gmd:MD_Format/gmd:name//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="format" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Content info === --> + <xsl:for-each select="gmd:contentInfo/*/gmd:featureCatalogueCitation[@uuidref]"> + <Field name="hasfeaturecat" string="{string(@uuidref)}" store="false" index="true"/> + </xsl:for-each> - <!-- index online protocol --> + <!-- === Data Quality === --> + <xsl:for-each select="gmd:dataQualityInfo/*/gmd:lineage//gmd:source[@uuidref]"> + <Field name="hassource" string="{string(@uuidref)}" store="false" index="true"/> + </xsl:for-each> - <xsl:for-each select="gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="protocol" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Distribution === --> + <xsl:for-each select="gmd:distributionInfo/gmd:MD_Distribution"> + <xsl:for-each + select="gmd:distributionFormat/gmd:MD_Format/gmd:name//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="format" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Service stuff === --> - <!-- Service type --> - <xsl:for-each select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceType/gco:LocalName| - gmd:identificationInfo/*[contains(@gco:isoType, 'SV_ServiceIdentification')]/srv:serviceType/gco:LocalName"> - <Field name="serviceType" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <!-- index online protocol --> - <!-- Service version --> - <xsl:for-each select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceTypeVersion/gco:CharacterString| - gmd:identificationInfo/*[contains(@gco:isoType, 'SV_ServiceIdentification')]/srv:serviceTypeVersion/gco:CharacterString"> - <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each + select="gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:protocol//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="protocol" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === General stuff === --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Service stuff === --> + <!-- Service type --> + <xsl:for-each select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceType/gco:LocalName| + gmd:identificationInfo/*[contains(@gco:isoType, 'SV_ServiceIdentification')]/srv:serviceType/gco:LocalName"> + <Field name="serviceType" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + + <!-- Service version --> + <xsl:for-each select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:serviceTypeVersion/gco:CharacterString| + gmd:identificationInfo/*[contains(@gco:isoType, 'SV_ServiceIdentification')]/srv:serviceTypeVersion/gco:CharacterString"> + <Field name="serviceTypeVersion" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <xsl:choose> - <xsl:when test="gmd:hierarchyLevel"> - <xsl:for-each select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue"> - <Field name="type" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - </xsl:when> - <xsl:otherwise> - <Field name="type" string="dataset" store="true" index="true"/> - </xsl:otherwise> - </xsl:choose> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === General stuff === --> - <xsl:for-each select="gmd:hierarchyLevelName//gmd:LocalisedCharacterString[@locale=$langId]"> - <Field name="levelName" string="{string(.)}" store="true" index="true"/> + <xsl:choose> + <xsl:when test="gmd:hierarchyLevel"> + <xsl:for-each select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue"> + <Field name="type" string="{string(.)}" store="true" index="true"/> </xsl:for-each> + </xsl:when> + <xsl:otherwise> + <Field name="type" string="dataset" store="true" index="true"/> + </xsl:otherwise> + </xsl:choose> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:fileIdentifier/gco:CharacterString"> - <Field name="fileId" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> + <xsl:for-each select="gmd:hierarchyLevelName//gmd:LocalisedCharacterString[@locale=$langId]"> + <Field name="levelName" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:parentIdentifier/gco:CharacterString"> - <Field name="parentUuid" string="{string(.)}" store="true" index="true"/> - </xsl:for-each> - <Field name="isChild" string="{exists(gmd:parentIdentifier)}" store="true" index="true"/> + <xsl:for-each select="gmd:fileIdentifier/gco:CharacterString"> + <Field name="fileId" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Reference system info === --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> - <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> - <xsl:variable name="crs" select="concat(string(gmd:codeSpace/gco:CharacterString),'::',string(gmd:code/gco:CharacterString))"/> + <xsl:for-each select="gmd:parentIdentifier/gco:CharacterString"> + <Field name="parentUuid" string="{string(.)}" store="true" index="true"/> + </xsl:for-each> + <Field name="isChild" string="{exists(gmd:parentIdentifier)}" store="true" index="true"/> - <xsl:if test="$crs != '::'"> - <Field name="crs" string="{$crs}" store="true" index="true"/> - </xsl:if> - </xsl:for-each> - </xsl:for-each> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Reference system info === --> - <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - <!-- === Free text search === --> - <Field name="any" store="false" index="true"> - <xsl:attribute name="string"> - <xsl:value-of select="normalize-space(//node()[@locale=$langId])"/> - <xsl:text> </xsl:text> - <xsl:for-each select="//@codeListValue"> - <xsl:value-of select="concat(., ' ')"/> - </xsl:for-each> - </xsl:attribute> - </Field> - - - <!-- Index all codelist --> - <xsl:for-each select=".//*[*/@codeListValue != '']"> - <Field name="cl_{local-name()}" - string="{*/@codeListValue}" - store="true" index="true"/> - <Field name="cl_{concat(local-name(), '_text')}" - string="{util:getCodelistTranslation(name(*), string(*/@codeListValue), string($isoLangId))}" - store="true" index="true"/> + <xsl:for-each select="gmd:referenceSystemInfo/gmd:MD_ReferenceSystem"> + <xsl:for-each select="gmd:referenceSystemIdentifier/gmd:RS_Identifier"> + <xsl:variable name="crs" + select="concat(string(gmd:codeSpace/gco:CharacterString),'::',string(gmd:code/gco:CharacterString))"/> + + <xsl:if test="$crs != '::'"> + <Field name="crs" string="{$crs}" store="true" index="true"/> + </xsl:if> </xsl:for-each> - </xsl:template> + </xsl:for-each> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- === Free text search === --> + <Field name="any" store="false" index="true"> + <xsl:attribute name="string"> + <xsl:value-of select="normalize-space(//node()[@locale=$langId])"/> + <xsl:text> </xsl:text> + <xsl:for-each select="//@codeListValue"> + <xsl:value-of select="concat(., ' ')"/> + </xsl:for-each> + </xsl:attribute> + </Field> + + + <!-- Index all codelist --> + <xsl:for-each select=".//*[*/@codeListValue != '']"> + <Field name="cl_{local-name()}" + string="{*/@codeListValue}" + store="true" index="true"/> + <Field name="cl_{concat(local-name(), '_text')}" + string="{util:getCodelistTranslation(name(*), string(*/@codeListValue), string($isoLangId))}" + store="true" index="true"/> + </xsl:for-each> + </xsl:template> </xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/dispatcher.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/dispatcher.xsl index df0bb5cb529..1e7c7a5958e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/dispatcher.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/dispatcher.xsl @@ -22,23 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" - xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:gn="http://www.fao.org/geonetwork" - xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" - xmlns:saxon="http://saxon.sf.net/" extension-element-prefixes="saxon" - exclude-result-prefixes="#all"> - +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:saxon="http://saxon.sf.net/" + version="2.0" extension-element-prefixes="saxon" + exclude-result-prefixes="#all"> + <xsl:include href="evaluate.xsl"/> <xsl:include href="layout.xsl"/> - - <!-- + + <!-- Load the schema configuration for the editor. --> <xsl:template name="get-iso19139-configuration"> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl index bc88f789ffd..35ccd167819 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/evaluate.xsl @@ -22,31 +22,25 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" - xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:gn="http://www.fao.org/geonetwork" - xmlns:saxon="http://saxon.sf.net/" extension-element-prefixes="saxon" - exclude-result-prefixes="#all"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://saxon.sf.net/" + version="2.0" extension-element-prefixes="saxon" + exclude-result-prefixes="#all"> - <!-- Evaluate an expression. This is schema dependant in order to properly + <!-- Evaluate an expression. This is schema dependant in order to properly set namespaces required for evaluate. - - "The static context for the expression includes all the in-scope namespaces, + + "The static context for the expression includes all the in-scope namespaces, types, and functions from the calling stylesheet or query" http://saxonica.com/documentation9.4-demo/html/extensions/functions/evaluate.html - + A node returned by evaluate will lost its context (ancestors). --> <xsl:template name="evaluate-iso19139"> <xsl:param name="base" as="node()"/> <xsl:param name="in"/> - <!-- <xsl:message>in xml <xsl:copy-of select="$base"></xsl:copy-of></xsl:message> - <xsl:message>search for <xsl:copy-of select="$in"></xsl:copy-of></xsl:message>--> + <!-- <xsl:message>in xml <xsl:copy-of select="$base"></xsl:copy-of></xsl:message> + <xsl:message>search for <xsl:copy-of select="$in"></xsl:copy-of></xsl:message>--> <xsl:variable name="nodeOrAttribute" select="saxon:evaluate(concat('$p1', $in), $base)"/> <xsl:choose> @@ -69,7 +63,7 @@ <xsl:template name="evaluate-iso19139-boolean"> <xsl:param name="base" as="node()"/> <xsl:param name="in"/> - + <xsl:value-of select="saxon:evaluate(concat('$p1', $in), $base)"/> </xsl:template> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl index 626efde63aa..02b99c1f312 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl @@ -22,19 +22,13 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" - xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:gn="http://www.fao.org/geonetwork" xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" + version="2.0" exclude-result-prefixes="#all"> <!-- @@ -108,11 +102,14 @@ <xsl:with-param name="listOfValues" select="$codelist"/> <xsl:with-param name="lang" select="$lang"/> <xsl:with-param name="isDisabled" select="ancestor-or-self::node()[@xlink:href]"/> - <xsl:with-param name="elementRef" select="../gmd:dateType/gmd:CI_DateTypeCode/gn:element/@ref"/> + <xsl:with-param name="elementRef" + select="../gmd:dateType/gmd:CI_DateTypeCode/gn:element/@ref"/> <xsl:with-param name="isRequired" select="true()"/> <xsl:with-param name="hidden" select="false()"/> - <xsl:with-param name="valueToEdit" select="../gmd:dateType/gmd:CI_DateTypeCode/@codeListValue"/> - <xsl:with-param name="name" select="concat(../gmd:dateType/gmd:CI_DateTypeCode/gn:element/@ref, '_codeListValue')"/> + <xsl:with-param name="valueToEdit" + select="../gmd:dateType/gmd:CI_DateTypeCode/@codeListValue"/> + <xsl:with-param name="name" + select="concat(../gmd:dateType/gmd:CI_DateTypeCode/gn:element/@ref, '_codeListValue')"/> </xsl:call-template> @@ -201,4 +198,4 @@ </div> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl index 8024cd782d6..0e958392ad0 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-keywords.xsl @@ -22,8 +22,7 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" @@ -32,15 +31,16 @@ xmlns:gn="http://www.fao.org/geonetwork" xmlns:xslutil="java:org.fao.geonet.util.XslUtil" xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" + version="2.0" exclude-result-prefixes="#all"> - <!-- Custom rendering of keyword section - * gmd:descriptiveKeywords is boxed element and the title + <!-- Custom rendering of keyword section + * gmd:descriptiveKeywords is boxed element and the title of the fieldset is the thesaurus title * if the thesaurus is available in the catalog, display - the advanced editor which provides easy selection of + the advanced editor which provides easy selection of keywords. - + --> @@ -52,7 +52,8 @@ <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/> <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/> - <xsl:variable name="thesaurusTitleEl" select="gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title"/> + <xsl:variable name="thesaurusTitleEl" + select="gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title"/> <xsl:variable name="thesaurusTitle"> <xsl:choose> <xsl:when test="normalize-space($thesaurusTitleEl/gco:CharacterString) != ''"> @@ -63,7 +64,8 @@ <xsl:when test="normalize-space($thesaurusTitleEl/gmd:PT_FreeText/ gmd:textGroup/gmd:LocalisedCharacterString[ @locale = concat('#', upper-case(xslutil:twoCharLangCode($lang)))][1]) != ''"> - <xsl:value-of select="$thesaurusTitleEl/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale = concat('#', upper-case(xslutil:twoCharLangCode($lang)))][1]"/> + <xsl:value-of + select="$thesaurusTitleEl/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString[@locale = concat('#', upper-case(xslutil:twoCharLangCode($lang)))][1]"/> </xsl:when> <xsl:when test="$thesaurusTitleEl/gmd:PT_FreeText/ gmd:textGroup/gmd:LocalisedCharacterString[ @@ -73,7 +75,7 @@ </xsl:when> <xsl:otherwise> <xsl:value-of select="gmd:MD_Keywords/gmd:thesaurusName/ - gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code" /> + gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code"/> </xsl:otherwise> </xsl:choose> </xsl:variable> @@ -82,7 +84,7 @@ <!-- Create form for all existing attribute (not in gn namespace) and all non existing attributes not already present. --> <xsl:apply-templates mode="render-for-field-for-attribute" - select=" + select=" @*| gn:attribute[not(@name = parent::node()/@*/name())]"> <xsl:with-param name="ref" select="gn:element/@ref"/> @@ -92,12 +94,10 @@ </xsl:variable> - - <xsl:call-template name="render-boxed-element"> <xsl:with-param name="label" - select="if ($thesaurusTitle) - then $thesaurusTitle + select="if ($thesaurusTitle) + then $thesaurusTitle else gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> <xsl:with-param name="editInfo" select="gn:element"/> <xsl:with-param name="cls" select="local-name()"/> @@ -114,9 +114,6 @@ </xsl:template> - - - <xsl:template mode="mode-iso19139" match="gmd:MD_Keywords" priority="2000"> @@ -124,7 +121,7 @@ select="gmd:thesaurusName/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code"/> <xsl:variable name="thesaurusTitle" - select="gmd:thesaurusName/gmd:CI_Citation/gmd:title/(gco:CharacterString|gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString)"/> + select="gmd:thesaurusName/gmd:CI_Citation/gmd:title/(gco:CharacterString|gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString)"/> <xsl:variable name="thesaurusConfig" @@ -136,11 +133,11 @@ <xsl:choose> <xsl:when test="$thesaurusConfig"> - <!-- The thesaurus key may be contained in the MD_Identifier field or + <!-- The thesaurus key may be contained in the MD_Identifier field or get it from the list of thesaurus based on its title. --> <xsl:variable name="thesaurusInternalKey" - select="if ($thesaurusIdentifier) + select="if ($thesaurusIdentifier) then $thesaurusIdentifier else $thesaurusConfig/key"/> <xsl:variable name="thesaurusKey" @@ -173,15 +170,15 @@ <!-- Get current transformation mode based on XML fragment analysis --> <xsl:variable name="transformation" - select="if (parent::node()/@xlink:href) then 'to-iso19139-keyword-as-xlink' + select="if (parent::node()/@xlink:href) then 'to-iso19139-keyword-as-xlink' else if (count(gmd:keyword/gmx:Anchor) > 0) - then 'to-iso19139-keyword-with-anchor' + then 'to-iso19139-keyword-with-anchor' else 'to-iso19139-keyword'"/> <xsl:variable name="parentName" select="name(..)"/> - <!-- Create custom widget: - * '' for item selector, + <!-- Create custom widget: + * '' for item selector, * 'tagsinput' for tags * 'tagsinput' and maxTags = 1 for only one tag * 'multiplelist' for multiple selection list @@ -194,7 +191,7 @@ else ''"/> <!-- Example: to restrict number of keyword to 1 for INSPIRE - <xsl:variable name="maxTags" + <xsl:variable name="maxTags" select="if ($thesaurusKey = 'external.theme.inspire-theme') then '1' else ''"/> --> <!-- Create a div with the directive configuration @@ -207,20 +204,22 @@ * transformation: current transformation --> - <xsl:variable name="allLanguages" select="concat($metadataLanguage, ',', $metadataOtherLanguages)"></xsl:variable> + <xsl:variable name="allLanguages" + select="concat($metadataLanguage, ',', $metadataOtherLanguages)"></xsl:variable> <div data-gn-keyword-selector="{$widgetMode}" - data-metadata-id="{$metadataId}" - data-element-ref="{concat('_X', ../gn:element/@ref, '_replace')}" - data-thesaurus-title="{$thesaurusTitle}" - data-thesaurus-key="{$thesaurusKey}" - data-keywords="{$keywords}" data-transformations="{$transformations}" - data-current-transformation="{$transformation}" - data-max-tags="{$maxTags}" - data-lang="{$metadataOtherLanguagesAsJson}" - data-textgroup-only="false"> + data-metadata-id="{$metadataId}" + data-element-ref="{concat('_X', ../gn:element/@ref, '_replace')}" + data-thesaurus-title="{$thesaurusTitle}" + data-thesaurus-key="{$thesaurusKey}" + data-keywords="{$keywords}" data-transformations="{$transformations}" + data-current-transformation="{$transformation}" + data-max-tags="{$maxTags}" + data-lang="{$metadataOtherLanguagesAsJson}" + data-textgroup-only="false"> </div> - <xsl:variable name="isTypePlace" select="count(gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='place']) > 0"/> + <xsl:variable name="isTypePlace" + select="count(gmd:type/gmd:MD_KeywordTypeCode[@codeListValue='place']) > 0"/> <xsl:if test="$isTypePlace"> <xsl:call-template name="render-batch-process-button"> <xsl:with-param name="process-name" select="'add-extent-from-geokeywords'"/> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-sds.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-sds.xsl index 5ca16371fe4..73b193bb8be 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-sds.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-sds.xsl @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="2.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" - xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:gn="http://www.fao.org/geonetwork" - xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core" - xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" - xmlns:exslt="http://exslt.org/common" - exclude-result-prefixes="#all"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:gmd="http://www.isotc211.org/2005/gmd" + xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gmx="http://www.isotc211.org/2005/gmx" + xmlns:srv="http://www.isotc211.org/2005/srv" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:gn="http://www.fao.org/geonetwork" + xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" + xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" + version="2.0" + exclude-result-prefixes="#all"> <!-- SDS: Category. Render an anchor as select box populating it with a codelist --> - <xsl:template mode="mode-iso19139" priority="2000" match="gmd:dataQualityInfo/*/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gmx:Anchor[$tab='inspire_sds']"> + <xsl:template mode="mode-iso19139" priority="2000" + match="gmd:dataQualityInfo/*/gmd:report/gmd:DQ_DomainConsistency/gmd:result/gmd:DQ_ConformanceResult/gmd:specification/gmd:CI_Citation/gmd:title/gmx:Anchor[$tab='inspire_sds']"> <xsl:call-template name="render-element"> <xsl:with-param name="label" select="$strings/sds-category"/> <xsl:with-param name="value" select="@xlink:href"/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="xpath" select="gn-fn-metadata:getXPath(.)"/> <xsl:with-param name="type" select="'select'"/> - <xsl:with-param name="listOfValues" select="gn-fn-metadata:getCodeListValues($schema, 'SDS_category', $codelists, .)"/> + <xsl:with-param name="listOfValues" + select="gn-fn-metadata:getCodeListValues($schema, 'SDS_category', $codelists, .)"/> <xsl:with-param name="name" select="concat(gn:element/@ref,'_xlinkCOLONhref')"/> <xsl:with-param name="editInfo" select="*/gn:element"/> <xsl:with-param name="parentEditInfo" select="gn:element"/> @@ -29,64 +30,70 @@ </xsl:call-template> <script> - $( document ).ready(function(){ - var id = <xsl:value-of select="gn:element/@ref" />; - var gnselect = "_" + id + "_xlinkCOLONhref"; - var gnhidden = "#_" + id; - if(!$(gnhidden).value){ - getHiddenFiekdContent(gnselect, gnhidden); - } - $("select[name=" + gnselect + "]").on('change', function() { - getHiddenFiekdContent(gnselect, gnhidden); - }) - }); - function getHiddenFiekdContent(gnselect, gnhidden){ - var value = $("select[name=" + gnselect + "]").val(); - var lastindexof = value.lastIndexOf("/")+1; - $(gnhidden).val(value.substring(lastindexof)); - } + $( document ).ready(function(){ + var id = <xsl:value-of select="gn:element/@ref"/>; + var gnselect = "_" + id + "_xlinkCOLONhref"; + var gnhidden = "#_" + id; + if(!$(gnhidden).value){ + getHiddenFiekdContent(gnselect, gnhidden); + } + $("select[name=" + gnselect + "]").on('change', function() { + getHiddenFiekdContent(gnselect, gnhidden); + }) + }); + function getHiddenFiekdContent(gnselect, gnhidden){ + var value = $("select[name=" + gnselect + "]").val(); + var lastindexof = value.lastIndexOf("/")+1; + $(gnhidden).val(value.substring(lastindexof)); + } </script> <input type="hidden"> - <xsl:attribute name="name" select="concat('_',gn:element/@ref)"/> - <xsl:attribute name="id" select="concat('_',gn:element/@ref)"/> + <xsl:attribute name="name" select="concat('_',gn:element/@ref)"/> + <xsl:attribute name="id" select="concat('_',gn:element/@ref)"/> </input> </xsl:template> <!-- SDS: CRS --> - <xsl:template mode="mode-iso19139" priority="2002" match="gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:code/gmx:Anchor[$tab='inspire_sds']"> + <xsl:template mode="mode-iso19139" priority="2002" + match="gmd:MD_Metadata/gmd:referenceSystemInfo/gmd:MD_ReferenceSystem/gmd:referenceSystemIdentifier/gmd:RS_Identifier/gmd:code/gmx:Anchor[$tab='inspire_sds']"> <xsl:call-template name="render-element"> - <xsl:with-param name="label" select="''" /> - <xsl:with-param name="value" select="@xlink:title" /> - <xsl:with-param name="name" select="gn:element/@ref" /> - <xsl:with-param name="cls" select="local-name()" /> - <xsl:with-param name="editInfo" select="../../../gn:element" /> - <xsl:with-param name="isDisabled" select="false()" /> + <xsl:with-param name="label" select="''"/> + <xsl:with-param name="value" select="@xlink:title"/> + <xsl:with-param name="name" select="gn:element/@ref"/> + <xsl:with-param name="cls" select="local-name()"/> + <xsl:with-param name="editInfo" select="../../../gn:element"/> + <xsl:with-param name="isDisabled" select="false()"/> </xsl:call-template> </xsl:template> <!-- SDS: Quality of Service--> - <xsl:template mode="mode-iso19139" priority="2002" match="gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_ConceptualConsistency[/root/gui/currTab/text()='inspire_sds']"> + <xsl:template mode="mode-iso19139" priority="2002" + match="gmd:MD_Metadata/gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:report/gmd:DQ_ConceptualConsistency[/root/gui/currTab/text()='inspire_sds']"> <xsl:call-template name="render-boxed-element"> - <xsl:with-param name="label" select="concat($strings/qos_measure, gmd:nameOfMeasure/gmx:Anchor/text())" /> - <xsl:with-param name="editInfo" select="gn:element" /> + <xsl:with-param name="label" + select="concat($strings/qos_measure, gmd:nameOfMeasure/gmx:Anchor/text())"/> + <xsl:with-param name="editInfo" select="gn:element"/> <xsl:with-param name="subTreeSnippet"> <xsl:if test="gmd:result/gmd:DQ_QuantitativeResult/gmd:valueUnit/@xlink:href != ''"> <xsl:call-template name="render-element"> - <xsl:with-param name="label" select="$strings/qos_uom" /> - <xsl:with-param name="value" select="gmd:result/gmd:DQ_QuantitativeResult/gmd:valueUnit/@xlink:href" /> - <xsl:with-param name="cls" select="local-name()" /> - <xsl:with-param name="editInfo" select="gn:element" /> - <xsl:with-param name="isDisabled" select="true()" /> + <xsl:with-param name="label" select="$strings/qos_uom"/> + <xsl:with-param name="value" + select="gmd:result/gmd:DQ_QuantitativeResult/gmd:valueUnit/@xlink:href"/> + <xsl:with-param name="cls" select="local-name()"/> + <xsl:with-param name="editInfo" select="gn:element"/> + <xsl:with-param name="isDisabled" select="true()"/> </xsl:call-template> </xsl:if> <xsl:call-template name="render-element"> <xsl:with-param name="label" select="$strings/qos_value"/> - <xsl:with-param name="value" select="gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record/text()" /> - <xsl:with-param name="name" select="gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record/gn:element/@ref" /> - <xsl:with-param name="cls" select="local-name()" /> - <xsl:with-param name="editInfo" select="gn:element" /> + <xsl:with-param name="value" + select="gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record/text()"/> + <xsl:with-param name="name" + select="gmd:result/gmd:DQ_QuantitativeResult/gmd:value/gco:Record/gn:element/@ref"/> + <xsl:with-param name="cls" select="local-name()"/> + <xsl:with-param name="editInfo" select="gn:element"/> </xsl:call-template> </xsl:with-param> </xsl:call-template> @@ -97,8 +104,9 @@ match="srv:SV_ServiceIdentification[$tab='inspire_sds']/gmd:resourceConstraints[gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor]" priority="2000"> - <xsl:variable name="anchor" select="./gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor"/> - <xsl:variable name="accessCode" select="substring-after($anchor/@xlink:href, 'ConditionsApplyingToAccessAndUse/')"/> + <xsl:variable name="anchor" select="./gmd:MD_LegalConstraints/gmd:otherConstraints/gmx:Anchor"/> + <xsl:variable name="accessCode" + select="substring-after($anchor/@xlink:href, 'ConditionsApplyingToAccessAndUse/')"/> <xsl:call-template name="render-element"> <xsl:with-param name="label" select="$strings/sds-limitation"/> @@ -116,7 +124,8 @@ <!-- SDS: DCP codelist --> <!--<xsl:template mode="mode-iso19139" priority="200" match="*[*/@codeList]"> --> - <xsl:template mode="mode-iso19139" priority="201" match="srv:SV_OperationMetadata/srv:DCP[$tab='inspire_sds']"> + <xsl:template mode="mode-iso19139" priority="201" + match="srv:SV_OperationMetadata/srv:DCP[$tab='inspire_sds']"> <xsl:param name="schema" select="$schema" required="no"/> <xsl:param name="labels" select="$labels" required="no"/> <xsl:param name="codelists" select="$iso19139codelists" required="no"/> @@ -139,7 +148,8 @@ <xsl:with-param name="parentEditInfo" select="gn:element"/> <xsl:with-param name="listOfValues" select="gn-fn-metadata:getCodeListValues($schema, 'SDS_DCP', $codelists, .)"/> - <xsl:with-param name="isFirst" select="count(preceding-sibling::*[name() = $elementName]) = 0"/> + <xsl:with-param name="isFirst" + select="count(preceding-sibling::*[name() = $elementName]) = 0"/> </xsl:call-template> </xsl:template> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl index 2e943a2ad28..4554f9ff005 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl @@ -22,33 +22,28 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gn="http://www.fao.org/geonetwork" - xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core" xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" xmlns:java-xsl-util="java:org.fao.geonet.util.XslUtil" xmlns:saxon="http://saxon.sf.net/" + version="2.0" extension-element-prefixes="saxon" exclude-result-prefixes="#all"> <xsl:include href="layout-custom-fields-keywords.xsl"/> <xsl:include href="layout-custom-fields-sds.xsl"/> - + <!-- Readonly elements --> <xsl:template mode="mode-iso19139" priority="2000" match="gmd:fileIdentifier|gmd:dateStamp"> <xsl:call-template name="render-element"> - <xsl:with-param name="label" select="gn-fn-metadata:getLabel($schema, name(), $labels)/label"/> + <xsl:with-param name="label" + select="gn-fn-metadata:getLabel($schema, name(), $labels)/label"/> <xsl:with-param name="value" select="*"/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="xpath" select="gn-fn-metadata:getXPath(.)"/> @@ -73,7 +68,8 @@ <xsl:variable name="labelMeasureType" select="gn-fn-metadata:getLabel($schema, name(gco:*), $labels, name(), '', '')"/> - <xsl:variable name="parentEditInfo" select="if (exists($refToDelete)) then $refToDelete else gn:element"/> + <xsl:variable name="parentEditInfo" + select="if (exists($refToDelete)) then $refToDelete else gn:element"/> <xsl:variable name="isRequired" as="xs:boolean"> <xsl:choose> @@ -111,7 +107,8 @@ <textarea id="_{$elementRef}_config" class="hidden"> <xsl:copy-of select="java-xsl-util:xmlToJson( - saxon:serialize($helper, 'default-serialize-mode'))"/></textarea> + saxon:serialize($helper, 'default-serialize-mode'))"/> + </textarea> </div> <div class="col-sm-1 gn-control"> <xsl:call-template name="render-form-field-control-remove"> @@ -147,7 +144,7 @@ <xsl:call-template name="render-element"> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> <xsl:with-param name="value" select="."/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="xpath" select="$xpath"/> @@ -163,7 +160,7 @@ <!-- ===================================================================== --> <xsl:template mode="mode-iso19139" match="gml:beginPosition|gml:endPosition|gml:timePosition" - priority="200"> + priority="200"> <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/> @@ -175,7 +172,7 @@ <!-- Create form for all existing attribute (not in gn namespace) and all non existing attributes not already present. --> <xsl:apply-templates mode="render-for-field-for-attribute" - select=" @*| gn:attribute[not(@name = parent::node()/@*/name())]"> + select=" @*| gn:attribute[not(@name = parent::node()/@*/name())]"> <xsl:with-param name="ref" select="gn:element/@ref"/> <xsl:with-param name="insertRef" select="gn:element/@ref"/> </xsl:apply-templates> @@ -185,7 +182,7 @@ <xsl:call-template name="render-element"> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), '', $xpath)/label"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), '', $xpath)/label"/> <xsl:with-param name="name" select="gn:element/@ref"/> <xsl:with-param name="value" select="text()"/> <xsl:with-param name="cls" select="local-name()"/> @@ -202,7 +199,7 @@ See http://trac.osgeo.org/geonetwork/ticket/661 --> <xsl:with-param name="type" - select="if (string-length($value) = 10 or $value = '') then 'date' else 'datetime'"/> + select="if (string-length($value) = 10 or $value = '') then 'date' else 'datetime'"/> <xsl:with-param name="editInfo" select="gn:element"/> <xsl:with-param name="attributesSnippet" select="$attributes"/> </xsl:call-template> @@ -217,17 +214,19 @@ <xsl:call-template name="render-boxed-element"> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> <xsl:with-param name="editInfo" select="gn:element"/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="subTreeSnippet"> <div gn-draw-bbox="" data-hleft="{gmd:westBoundLongitude/gco:Decimal}" - data-hright="{gmd:eastBoundLongitude/gco:Decimal}" data-hbottom="{gmd:southBoundLatitude/gco:Decimal}" - data-htop="{gmd:northBoundLatitude/gco:Decimal}" data-hleft-ref="_{gmd:westBoundLongitude/gco:Decimal/gn:element/@ref}" - data-hright-ref="_{gmd:eastBoundLongitude/gco:Decimal/gn:element/@ref}" - data-hbottom-ref="_{gmd:southBoundLatitude/gco:Decimal/gn:element/@ref}" - data-htop-ref="_{gmd:northBoundLatitude/gco:Decimal/gn:element/@ref}" - data-lang="lang"></div> + data-hright="{gmd:eastBoundLongitude/gco:Decimal}" + data-hbottom="{gmd:southBoundLatitude/gco:Decimal}" + data-htop="{gmd:northBoundLatitude/gco:Decimal}" + data-hleft-ref="_{gmd:westBoundLongitude/gco:Decimal/gn:element/@ref}" + data-hright-ref="_{gmd:eastBoundLongitude/gco:Decimal/gn:element/@ref}" + data-hbottom-ref="_{gmd:southBoundLatitude/gco:Decimal/gn:element/@ref}" + data-htop-ref="_{gmd:northBoundLatitude/gco:Decimal/gn:element/@ref}" + data-lang="lang"></div> </xsl:with-param> </xsl:call-template> </xsl:template> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout.xsl index 397d29a8b1a..21b2f2bf49e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout.xsl @@ -22,15 +22,17 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gts="http://www.isotc211.org/2005/gts" - xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:gn="http://www.fao.org/geonetwork" - xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" - xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="#all"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:gmd="http://www.isotc211.org/2005/gmd" + xmlns:gts="http://www.isotc211.org/2005/gts" + xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gmx="http://www.isotc211.org/2005/gmx" + xmlns:srv="http://www.isotc211.org/2005/srv" + xmlns:gml="http://www.opengis.net/gml" + xmlns:gn="http://www.fao.org/geonetwork" + xmlns:gn-fn-metadata="http://geonetwork-opensource.org/xsl/functions/metadata" + xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" + version="2.0" + exclude-result-prefixes="#all"> <xsl:include href="utility-fn.xsl"/> <xsl:include href="utility-tpl.xsl"/> @@ -49,7 +51,7 @@ <!-- Template to display non existing element ie. geonet:child element - of the metadocument. Display in editing mode only and if + of the metadocument. Display in editing mode only and if the editor mode is not flat mode. --> <xsl:template mode="mode-iso19139" match="gn:child" priority="2000"> <xsl:param name="schema" select="$schema" required="no"/> @@ -57,18 +59,20 @@ <xsl:variable name="name" select="concat(@prefix, ':', @name)"/> - <xsl:variable name="flatModeException" select="gn-fn-metadata:isFieldFlatModeException($viewConfig, $name)"/> + <xsl:variable name="flatModeException" + select="gn-fn-metadata:isFieldFlatModeException($viewConfig, $name)"/> <!-- TODO: this should be common to all schemas --> <xsl:if test="$isEditing and (not($isFlatMode) or $flatModeException)"> - <xsl:variable name="directive" select="gn-fn-metadata:getFieldAddDirective($editorConfig, $name)"/> + <xsl:variable name="directive" + select="gn-fn-metadata:getFieldAddDirective($editorConfig, $name)"/> <xsl:call-template name="render-element-to-add"> <!-- TODO: add xpath and isoType to get label ? --> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, $name, $labels, name(..), '', '')/label"/> + select="gn-fn-metadata:getLabel($schema, $name, $labels, name(..), '', '')/label"/> <xsl:with-param name="directive" select="$directive"/> <xsl:with-param name="childEditInfo" select="."/> <xsl:with-param name="parentEditInfo" select="../gn:element"/> @@ -98,7 +102,7 @@ * and not(gco:CharacterString): Don't take into account those having gco:CharacterString (eg. multilingual elements) --> <xsl:template mode="mode-iso19139" priority="200" - match="*[name() = $editorConfig/editor/fieldsWithFieldset/name + match="*[name() = $editorConfig/editor/fieldsWithFieldset/name or @gco:isoType = $editorConfig/editor/fieldsWithFieldset/name]| gmd:report/*| gmd:result/*| @@ -114,7 +118,7 @@ <!-- Create form for all existing attribute (not in gn namespace) and all non existing attributes not already present. --> <xsl:apply-templates mode="render-for-field-for-attribute" - select=" + select=" @*| gn:attribute[not(@name = parent::node()/@*/name())]"> <xsl:with-param name="ref" select="gn:element/@ref"/> @@ -130,7 +134,7 @@ <xsl:call-template name="render-boxed-element"> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> <xsl:with-param name="editInfo" select="gn:element"/> <xsl:with-param name="errors" select="$errors"/> <xsl:with-param name="cls" select="local-name()"/> @@ -150,10 +154,9 @@ </xsl:template> - <!-- Render simple element which usually match a form field --> <xsl:template mode="mode-iso19139" priority="200" - match="*[gco:CharacterString|gco:Integer|gco:Decimal| + match="*[gco:CharacterString|gco:Integer|gco:Decimal| gco:Boolean|gco:Real|gco:Measure|gco:Length|gco:Distance|gco:Angle|gmx:FileName| gco:Scale|gco:Record|gco:RecordType|gmx:MimeFileType|gmd:URL|gco:LocalName|gmd:PT_FreeText]"> <xsl:param name="schema" select="$schema" required="no"/> @@ -164,39 +167,49 @@ <xsl:variable name="elementName" select="name()"/> <xsl:variable name="exclusionMatchesParent"> <xsl:variable name="parent"> - <xsl:value-of separator="," select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@parent" /> + <xsl:value-of separator="," + select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@parent"/> </xsl:variable> <xsl:choose> <xsl:when test="string-length($parent) > 0"> - <xsl:value-of select="contains($parent, ../name())" /> + <xsl:value-of select="contains($parent, ../name())"/> </xsl:when> - <xsl:otherwise><xsl:value-of select="false()"/></xsl:otherwise> + <xsl:otherwise> + <xsl:value-of select="false()"/> + </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="exclusionMatchesAncestor"> <xsl:variable name="ancestor"> - <xsl:value-of separator="," select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@ancestor" /> + <xsl:value-of separator="," + select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@ancestor"/> </xsl:variable> <xsl:choose> - <xsl:when test="string-length($ancestor) > 0 and count(ancestor::*[contains($ancestor, name())]) != 0"> - <xsl:value-of select="true()" /> + <xsl:when + test="string-length($ancestor) > 0 and count(ancestor::*[contains($ancestor, name())]) != 0"> + <xsl:value-of select="true()"/> </xsl:when> - <xsl:otherwise><xsl:value-of select="false()"/></xsl:otherwise> + <xsl:otherwise> + <xsl:value-of select="false()"/> + </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="exclusionMatchesChild"> <xsl:variable name="child"> - <xsl:value-of separator="," select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@child" /> + <xsl:value-of separator="," + select="$editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@child"/> </xsl:variable> <xsl:choose> <xsl:when test="string-length($child) > 0 and count(*[contains($child, name())]) != 0"> - <xsl:value-of select="true()" /> + <xsl:value-of select="true()"/> </xsl:when> - <xsl:otherwise><xsl:value-of select="false()"/></xsl:otherwise> + <xsl:otherwise> + <xsl:value-of select="false()"/> + </xsl:otherwise> </xsl:choose> </xsl:variable> <xsl:variable name="excluded" - select="( + select="( count($editorConfig/editor/multilingualFields/exclude/name[. = $elementName]) > 0 and not($editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@ancestor) and not($editorConfig/editor/multilingualFields/exclude/name[. = $elementName]/@child) and @@ -204,11 +217,11 @@ $exclusionMatchesAncestor = true() or $exclusionMatchesParent = true() or $exclusionMatchesChild = true()"/> <xsl:variable name="hasPTFreeText" - select="count(gmd:PT_FreeText) > 0"/> + select="count(gmd:PT_FreeText) > 0"/> <xsl:variable name="hasOnlyPTFreeText" - select="count(gmd:PT_FreeText) > 0 and count(gco:CharacterString) = 0"/> + select="count(gmd:PT_FreeText) > 0 and count(gco:CharacterString) = 0"/> <xsl:variable name="isMultilingualElement" - select="$metadataIsMultilingual and $excluded = false()"/> + select="$metadataIsMultilingual and $excluded = false()"/> <xsl:variable name="isMultilingualElementExpanded" select="$isMultilingualElement and count($editorConfig/editor/multilingualFields/expanded[name = $elementName]) > 0"/> @@ -219,7 +232,7 @@ <!-- TODO: Support gmd:LocalisedCharacterString --> <xsl:variable name="monoLingualValue" select="gco:CharacterString|gco:Integer|gco:Decimal| gco:Boolean|gco:Real|gco:Measure|gco:Length|gco:Distance|gco:Angle|gmx:FileName| - gco:Scale|gco:Record|gco:RecordType|gmx:MimeFileType|gmd:URL|gco:LocalName" /> + gco:Scale|gco:Record|gco:RecordType|gmx:MimeFileType|gmd:URL|gco:LocalName"/> <xsl:variable name="theElement" select="if ($isMultilingualElement and $hasOnlyPTFreeText or not($monoLingualValue)) then gmd:PT_FreeText else $monoLingualValue"/> @@ -227,10 +240,11 @@ This may not work if node context is lost eg. when an element is rendered after a selection with copy-of. <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>--> - <xsl:variable name="xpath" select="gn-fn-metadata:getXPathByRef(gn:element/@ref, $metadata, false())"/> + <xsl:variable name="xpath" + select="gn-fn-metadata:getXPathByRef(gn:element/@ref, $metadata, false())"/> <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/> <xsl:variable name="labelConfig" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)"/> <xsl:variable name="helper" select="gn-fn-metadata:getHelper($labelConfig/helper, .)"/> <xsl:variable name="attributes"> @@ -240,14 +254,14 @@ current element and its children (eg. @uom in gco:Distance). A list of exception is defined in form-builder.xsl#render-for-field-for-attribute. --> <xsl:apply-templates mode="render-for-field-for-attribute" - select=" + select=" @*| gn:attribute[not(@name = parent::node()/@*/name())]"> <xsl:with-param name="ref" select="gn:element/@ref"/> <xsl:with-param name="insertRef" select="$theElement/gn:element/@ref"/> </xsl:apply-templates> <xsl:apply-templates mode="render-for-field-for-attribute" - select=" + select=" */@*| */gn:attribute[not(@name = parent::node()/@*/name())]"> <xsl:with-param name="ref" select="*/gn:element/@ref"/> @@ -269,12 +283,16 @@ <values> <!-- Or the PT_FreeText element matching the main language --> <xsl:if test="gco:CharacterString"> - <value ref="{$theElement/gn:element/@ref}" lang="{$metadataLanguage}"><xsl:value-of select="gco:CharacterString"/></value> + <value ref="{$theElement/gn:element/@ref}" lang="{$metadataLanguage}"> + <xsl:value-of select="gco:CharacterString"/> + </value> </xsl:if> <!-- the existing translation --> <xsl:for-each select="gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString"> - <value ref="{gn:element/@ref}" lang="{substring-after(@locale, '#')}"><xsl:value-of select="."/></value> + <value ref="{gn:element/@ref}" lang="{substring-after(@locale, '#')}"> + <xsl:value-of select="."/> + </value> </xsl:for-each> <!-- and create field for none translated language --> @@ -283,7 +301,8 @@ <xsl:if test="count($theElement/parent::node()/ gmd:PT_FreeText/gmd:textGroup/ gmd:LocalisedCharacterString[@locale = concat('#',$currentLanguageId)]) = 0"> - <value ref="lang_{@id}_{$theElement/parent::node()/gn:element/@ref}" lang="{@id}"></value> + <value ref="lang_{@id}_{$theElement/parent::node()/gn:element/@ref}" + lang="{@id}"></value> </xsl:if> </xsl:for-each> </values> @@ -291,7 +310,8 @@ </xsl:variable> <xsl:call-template name="render-element"> - <xsl:with-param name="label" select="if ($overrideLabel != '') then $overrideLabel else $labelConfig/label"/> + <xsl:with-param name="label" + select="if ($overrideLabel != '') then $overrideLabel else $labelConfig/label"/> <xsl:with-param name="value" select="if ($isMultilingualElement) then $values else *"/> <xsl:with-param name="errors" select="$errors"/> <xsl:with-param name="cls" select="local-name()"/> @@ -300,16 +320,18 @@ <xsl:with-param name="xpath" select="$xpath"/> <xsl:with-param name="attributesSnippet" select="$attributes"/> <xsl:with-param name="type" - select="gn-fn-metadata:getFieldType($editorConfig, name(), + select="gn-fn-metadata:getFieldType($editorConfig, name(), name($theElement))"/> <xsl:with-param name="name" select="$theElement/gn:element/@ref"/> <xsl:with-param name="editInfo" select="$theElement/gn:element"/> - <xsl:with-param name="parentEditInfo" select="if (exists($refToDelete)) then $refToDelete else gn:element"/> + <xsl:with-param name="parentEditInfo" + select="if (exists($refToDelete)) then $refToDelete else gn:element"/> <!-- TODO: Handle conditional helper --> <xsl:with-param name="listOfValues" select="$helper"/> <xsl:with-param name="toggleLang" select="$isMultilingualElementExpanded"/> <xsl:with-param name="forceDisplayAttributes" select="$forceDisplayAttributes"/> - <xsl:with-param name="isFirst" select="count(preceding-sibling::*[name() = $elementName]) = 0"/> + <xsl:with-param name="isFirst" + select="count(preceding-sibling::*[name() = $elementName]) = 0"/> </xsl:call-template> </xsl:template> @@ -319,7 +341,8 @@ those values. --> <xsl:template mode="mode-iso19139" match="@uuidref" priority="2000"> <xsl:call-template name="render-element"> - <xsl:with-param name="label" select="gn-fn-metadata:getLabel($schema, name(..), $labels)/label"/> + <xsl:with-param name="label" + select="gn-fn-metadata:getLabel($schema, name(..), $labels)/label"/> <xsl:with-param name="value" select="."/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="xpath" select="gn-fn-metadata:getXPath(.)"/> @@ -332,38 +355,38 @@ </xsl:template> -<!-- - <xsl:template mode="mode-iso19139" priority="200" - match="*[gco:Date|gco:DateTime]"> - <xsl:param name="schema" select="$schema" required="no"/> - <xsl:param name="labels" select="$labels" required="no"/> - <xsl:param name="editInfo" required="no"/> - <xsl:param name="parentEditInfo" required="no"/> - - <xsl:variable name="isRequired" as="xs:boolean"> - <xsl:choose> - <xsl:when - test="($parentEditInfo and $parentEditInfo/@min = 1 and $parentEditInfo/@max = 1) or - (not($parentEditInfo) and $editInfo and $editInfo/@min = 1 and $editInfo/@max = 1)"> - <xsl:value-of select="true()"/> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="false()"/> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> + <!-- + <xsl:template mode="mode-iso19139" priority="200" + match="*[gco:Date|gco:DateTime]"> + <xsl:param name="schema" select="$schema" required="no"/> + <xsl:param name="labels" select="$labels" required="no"/> + <xsl:param name="editInfo" required="no"/> + <xsl:param name="parentEditInfo" required="no"/> + + <xsl:variable name="isRequired" as="xs:boolean"> + <xsl:choose> + <xsl:when + test="($parentEditInfo and $parentEditInfo/@min = 1 and $parentEditInfo/@max = 1) or + (not($parentEditInfo) and $editInfo and $editInfo/@min = 1 and $editInfo/@max = 1)"> + <xsl:value-of select="true()"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="false()"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> - <xsl:variable name="labelConfig" - select="gn-fn-metadata:getLabel($schema, name(), $labels)"/> + <xsl:variable name="labelConfig" + select="gn-fn-metadata:getLabel($schema, name(), $labels)"/> - <div data-gn-date-picker="{gco:Date|gco:DateTime}" - data-label="{$labelConfig/label}" - data-element-name="{name(gco:Date|gco:DateTime)}" - data-element-ref="{concat('_X', gn:element/@ref)}" - data-required="{$isRequired}" - data-hide-time="{if ($viewConfig/@hideTimeInCalendar = 'true') then 'true' else 'false'}"> - </div> - </xsl:template>--> + <div data-gn-date-picker="{gco:Date|gco:DateTime}" + data-label="{$labelConfig/label}" + data-element-name="{name(gco:Date|gco:DateTime)}" + data-element-ref="{concat('_X', gn:element/@ref)}" + data-required="{$isRequired}" + data-hide-time="{if ($viewConfig/@hideTimeInCalendar = 'true') then 'true' else 'false'}"> + </div> + </xsl:template>--> <!-- Match codelist values. @@ -388,18 +411,19 @@ <xsl:call-template name="render-element"> <xsl:with-param name="label" - select="if ($overrideLabel != '') then $overrideLabel else gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> + select="if ($overrideLabel != '') then $overrideLabel else gn-fn-metadata:getLabel($schema, name(), $labels, name(..), $isoType, $xpath)/label"/> <xsl:with-param name="value" select="*/@codeListValue"/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="xpath" select="$xpath"/> <xsl:with-param name="type" select="gn-fn-iso19139:getCodeListType(name())"/> <xsl:with-param name="name" - select="if ($isEditing) then concat(*/gn:element/@ref, '_codeListValue') else ''"/> + select="if ($isEditing) then concat(*/gn:element/@ref, '_codeListValue') else ''"/> <xsl:with-param name="editInfo" select="*/gn:element"/> <xsl:with-param name="parentEditInfo" select="gn:element"/> <xsl:with-param name="listOfValues" - select="gn-fn-metadata:getCodeListValues($schema, name(*[@codeListValue]), $codelists, .)"/> - <xsl:with-param name="isFirst" select="count(preceding-sibling::*[name() = $elementName]) = 0"/> + select="gn-fn-metadata:getCodeListValues($schema, name(*[@codeListValue]), $codelists, .)"/> + <xsl:with-param name="isFirst" + select="count(preceding-sibling::*[name() = $elementName]) = 0"/> </xsl:call-template> </xsl:template> @@ -423,14 +447,14 @@ <xsl:call-template name="render-element"> <xsl:with-param name="label" - select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), '', '')/label"/> + select="gn-fn-metadata:getLabel($schema, name(), $labels, name(..), '', '')/label"/> <xsl:with-param name="value" select="text()"/> <xsl:with-param name="cls" select="local-name()"/> <xsl:with-param name="type" select="gn-fn-iso19139:getCodeListType(name())"/> <xsl:with-param name="name" select="gn:element/@ref"/> <xsl:with-param name="editInfo" select="../gn:element"/> <xsl:with-param name="listOfValues" - select="gn-fn-metadata:getCodeListValues($schema, name(), $codelists, .)"/> + select="gn-fn-metadata:getCodeListValues($schema, name(), $codelists, .)"/> </xsl:call-template> </xsl:template> @@ -452,7 +476,7 @@ <xsl:with-param name="type" select="gn-fn-metadata:getFieldType($editorConfig, name(), '')"/> <xsl:with-param name="name" select="if ($isEditing) then gn:element/@ref else ''"/> <xsl:with-param name="editInfo" - select="gn:element"/> + select="gn:element"/> <xsl:with-param name="listOfValues" select="$helper"/> </xsl:call-template> </xsl:template> diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-brief.xsl index a0add2b5e2d..4d4d5d46cb2 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-brief.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-brief.xsl @@ -23,26 +23,25 @@ --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:gmd="http://www.isotc211.org/2005/gmd" - xmlns:gco="http://www.isotc211.org/2005/gco" - xmlns:srv="http://www.isotc211.org/2005/srv" - xmlns:gmx="http://www.isotc211.org/2005/gmx" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:gml="http://www.opengis.net/gml" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:gn="http://www.fao.org/geonetwork" - xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core" - xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" - xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="#all" version="2.0"> + xmlns:gmd="http://www.isotc211.org/2005/gmd" + xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:srv="http://www.isotc211.org/2005/srv" + xmlns:gmx="http://www.isotc211.org/2005/gmx" + xmlns:gml="http://www.opengis.net/gml" + xmlns:gn="http://www.fao.org/geonetwork" + xmlns:gn-fn-core="http://geonetwork-opensource.org/xsl/functions/core" + xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139" + exclude-result-prefixes="#all" + version="2.0"> <xsl:include href="utility-fn.xsl"/> <xsl:include href="utility-tpl.xsl"/> - + <!-- ===================================================================== --> <!-- === iso19139 brief formatting === --> <!-- ===================================================================== --> <xsl:template mode="superBrief" match="gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']" - priority="2"> + priority="2"> <xsl:variable name="langId" select="gn-fn-iso19139:getLangId(., $lang)"/> <id> @@ -53,7 +52,7 @@ </uuid> <title> <xsl:apply-templates mode="localised" - select="gmd:identificationInfo/*/gmd:citation/*/gmd:title"> + select="gmd:identificationInfo/*/gmd:citation/*/gmd:title"> <xsl:with-param name="langId" select="$langId"/> </xsl:apply-templates> @@ -85,7 +84,7 @@ - + @@ -121,7 +120,7 @@ + select="gn-fn-core:protocolMimeType($linkage, $protocol, $mimeType)"/> @@ -210,11 +209,11 @@ - diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl index 19ec1aa4ed2..443bb0c3e1f 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/tpl-rdf.xsl @@ -22,37 +22,34 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - @@ -61,8 +58,8 @@ - - + + @@ -70,8 +67,8 @@ @@ -81,221 +78,274 @@ - - + + + + + + - + - + - + - - + + - + - application/xmlXML + + application/xml + XML + - + - text/htmlHTML + + text/html + HTML + - + - + - + - - - + + + + + - - - - + - - + + + - + - + + + - - - + - - - - - - - + + + + + + + + + + + - + - - - - - - + + + - - + + - - - + + + - + - + + + - - + + + + - - + + - - - - + - - - + + - + - - - + + - - - - - + + + + + + + + + - - - + + + + + - - + + - - + + + + - - - - + + + - + - + - + - + - + - - + + - + - / + / + - - - - + + + + + + - - + + + + - + - - + + - - + + + + - + - - + + + + - - - - + + + - - + + - + + + - - + + + + - - + + - - - - + - + - - + + - + - + - - + + @@ -415,77 +488,72 @@ - + - - - - - + + - + - - - - - - - - - - - - - + - - - - + - - - + - - \ No newline at end of file + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-fn.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-fn.xsl index 041684b1ab4..400a30161eb 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-fn.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-fn.xsl @@ -22,16 +22,16 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -52,19 +52,13 @@ - - - - - + - + - - diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl-multilingual.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl-multilingual.xsl index 039e6c54a2a..e8824be9406 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl-multilingual.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl-multilingual.xsl @@ -22,12 +22,12 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -41,30 +41,39 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + {} @@ -76,8 +85,8 @@ - - + + @@ -89,12 +98,12 @@ - + @@ -120,7 +129,6 @@ - @@ -133,10 +141,9 @@ - @@ -146,11 +153,12 @@ # + ># - # + # + diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl.xsl index 6aab4d491e2..a5f47d6c3b3 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-tpl.xsl @@ -22,20 +22,19 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + + select="count($metadata/gmd:identificationInfo/srv:SV_ServiceIdentification) > 0"/> [ @@ -50,12 +49,13 @@ and normalize-space(gmd:northBoundLatitude/gco:Decimal) != '']"> - [ - , - , - , - - ], + [ + , + , + , + + ] + , ] @@ -68,11 +68,12 @@ gmd:CI_OnlineResource/gmd:protocol/gco:CharacterString, $pattern) and normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) != '']"> - + - @@ -87,15 +88,29 @@ - - - - - <xsl:value-of select="normalize-space($metadata/gmd:identificationInfo/*/ - gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString)"/> - - + + + + + + + + + + + + + + <xsl:value-of select="normalize-space($metadata/gmd:identificationInfo/*/ + gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString)"/> + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-vacuum.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-vacuum.xsl index d0562ab5c97..63df23d9f35 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/layout/utility-vacuum.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/layout/utility-vacuum.xsl @@ -22,12 +22,10 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-brief.xsl index a4ec09b4ebd..2a0349d587b 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-brief.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-brief.xsl @@ -23,93 +23,99 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-full.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-full.xsl index 4957fe1909b..a69fb71add8 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-full.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-full.xsl @@ -23,342 +23,383 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - urn:ogc:def:crs:EPSG:6.6:4326 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/gif - - - image/png - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + urn:ogc:def:crs:EPSG:6.6:4326 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/gif + + + image/png + + - image/jpeg - - - - - - - - - - - - - - - - - - - + image/jpeg + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-summary.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-summary.xsl index 601d948772f..8857d8fc49d 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-summary.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/csw-summary.xsl @@ -23,124 +23,136 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-brief.xsl index 1982fc34e1f..2146b746c41 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-brief.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-brief.xsl @@ -23,36 +23,34 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - + + + + + - - + @@ -74,14 +72,20 @@ - () + () + - + + + - /srv/eng/portal.opensearch - /srv/eng/rdf.search?any= + /srv/eng/portal.opensearch + + /srv/eng/rdf.search?any= + @@ -101,7 +105,9 @@ Multiple values can be used. The publisher might also choose to describe the language on the dataset level (see dataset language). --> - + + + - + + + - + + + - /srv/eng/thesaurus.download?ref= + /srv/eng/thesaurus.download?ref= + @@ -157,4 +169,4 @@ - \ No newline at end of file + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-full.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-full.xsl index 143d14f7908..534d8dabef3 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-full.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-full.xsl @@ -23,17 +23,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - \ No newline at end of file + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-summary.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-summary.xsl index 143d14f7908..534d8dabef3 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-summary.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/dcat-summary.xsl @@ -23,17 +23,8 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - \ No newline at end of file + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-brief.xsl index 9091b27fd9c..2f353d6410b 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-brief.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-brief.xsl @@ -23,92 +23,90 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-full.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-full.xsl index 6f70489e800..2f99c00eca1 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-full.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-full.xsl @@ -23,37 +23,32 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-summary.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-summary.xsl index 025fe62dca7..29c53292c6e 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-summary.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/gmd-summary.xsl @@ -23,216 +23,214 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-brief.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-brief.xsl index ae9d9dfac54..a8c4e4fe217 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-brief.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-brief.xsl @@ -22,6 +22,6 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-full.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-full.xsl index 8515fa392bb..8f6c1b7841a 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-full.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-full.xsl @@ -22,6 +22,6 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-summary.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-summary.xsl index 105f61058cb..7e11c68285f 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-summary.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/csw/own-summary.xsl @@ -22,6 +22,6 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + diff --git a/schemas/iso19139/src/main/plugin/iso19139/present/metadata-edit.xsl b/schemas/iso19139/src/main/plugin/iso19139/present/metadata-edit.xsl index b119a45590c..509632f32e3 100644 --- a/schemas/iso19139/src/main/plugin/iso19139/present/metadata-edit.xsl +++ b/schemas/iso19139/src/main/plugin/iso19139/present/metadata-edit.xsl @@ -22,19 +22,19 @@ ~ Rome - Italy. email: geonetwork@osgeo.org --> - + @@ -42,7 +42,8 @@ - + @@ -50,7 +51,7 @@ - + @@ -60,10 +61,10 @@ - + - - + + @@ -74,50 +75,52 @@ - + - - + + - + - + - - + + - + - + - - + + - - - + + @@ -134,13 +137,13 @@ gmd:processStep|gmd:lineage"> - + - + - + @@ -149,47 +152,47 @@ srv:*[gco:Date|gco:DateTime|gco:Integer|gco:Decimal|gco:Boolean|gco:Real|gco:Measure|gco:Length|gco:Distance|gco:Angle|gco:Scale|gco:RecordType|gmx:MimeFileType]"> - + - + - + - + - + - +
display:none; - + - +     - +
@@ -197,62 +200,72 @@ - + - + - - + + - + -   + +   - + + + - + + + - + - + - + - - + + - - - - {/root/gui/strings/search} + + + + {/root/gui/strings/search} @@ -265,90 +278,92 @@ - - + + - + + + - - - - + Ie. User should define related metadata record using operatesOn elements and then if + needed, set a coupledResource to create a link to the data itself + (using layer name/feature type/coverage name as described in capabilities documents). - - - - - - - - - - - - - - - + To create a relation best is using the related resources panel (see relatedResources + template in metadata-iso19139-utils.xsl). + --> + + + - - - - - + + + + + + + + + - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + + P0Y0M0DT0H0M0S - + + + - + @@ -392,93 +409,128 @@ - - + + - + - checked + + checked + -
- - - - -
- - - - -
-
- + +
+ + - + + - + + +
+ + - + + - + + +
+ +
+ - - - - - / - - - + - + + + + / + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + @@ -491,12 +543,12 @@ - + - + @@ -508,42 +560,42 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + + + + + + + + + + + + - - - + + + - + - - - - - - - - - - - - + @@ -556,14 +608,14 @@ - + - - - + + + @@ -572,41 +624,50 @@ - + - - - + + + -   -   -   -   +   + +   + +   + +   + - - - - + + + + - - - + @@ -616,7 +677,7 @@ - + @@ -628,20 +689,20 @@ - - + + - + - + - + - + @@ -650,15 +711,15 @@ - + - + @@ -668,51 +729,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - @@ -721,7 +784,7 @@ - + @@ -734,28 +797,32 @@ - - + + - - + + - + - - + +
- + - - disabled + + + disabled +
- - + +
- + disabled @@ -1108,30 +1201,40 @@
- +
- - + +
- + - - + - + @@ -1170,11 +1279,16 @@ - - + + + + - + + + @@ -1189,7 +1303,7 @@ --> - + - - - + priority="2"> + + + - - + + - - + + - + - - + + - + @@ -1256,26 +1373,28 @@ - + - + - + - + + + - + - + - + - + - - + + - + - - - - - - + - - + + - + - - 'to-iso19139-keyword', 'to-iso19139-keyword-with-anchor', 'to-iso19139-keyword-as-xlink' - - - - - + - - + + - + @@ -1366,72 +1491,73 @@ - + - - + + - + - + -
- +
- + - - + - - - + + - + - + - - + + - - + + - - - + select="count(/root/gui/thesaurus/thesauri/thesaurus[key = $thesaurusCode]) > 0"> + - @@ -1446,14 +1572,14 @@ - + - - + + @@ -1465,40 +1591,48 @@ - + () + select="gmd:MD_Keywords/gmd:thesaurusName/gmd:CI_Citation/gmd:title/gco:CharacterString"/>) - , + + , + - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - + + - + () . @@ -1514,21 +1648,24 @@ - + - + - - + + - - - + + - + - + - + - - + + - + - %Y-%m-%d - %Y-%m-%dT%H:%M:00 + + %Y-%m-%d + + + %Y-%m-%dT%H:%M:00 + - + - + - + @@ -1602,37 +1745,44 @@ --> - + - + - - + + - + - %Y-%m-%d - %Y-%m-%dT%H:%M:00 + + %Y-%m-%d + + + %Y-%m-%dT%H:%M:00 + - + - + - + @@ -1642,7 +1792,9 @@ - + @@ -1652,56 +1804,61 @@ - - - - - - - - - - - - - %Y-%m-%d - %Y-%m-%dT%H:%M:00 - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + %Y-%m-%d + + + %Y-%m-%dT%H:%M:00 + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1709,13 +1866,13 @@ - + - + - + @@ -1729,120 +1886,133 @@ - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - - - - + + + + - + @@ -1852,36 +2022,37 @@ - + - + - + - + - - + + - - + + - - + + @@ -1896,90 +2067,96 @@ - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + - - + + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - + + - - + + - + @@ -1987,52 +2164,58 @@ - + - - + + - - + + - - + - - - - + + + + - + - - + + - - - - - + + + + + - - - - - + + + + + @@ -2040,73 +2223,77 @@ - + - - + + - - - - - - + + + - + - - - + - + + + + - - - + + + - - - - - - - + + + + + - + - - - - - - - + + + - + - + + + + + + + - + @@ -2129,7 +2316,7 @@ |gmd:applicationSchemaInfo|geonet:child[string(@name)='applicationSchemaInfo'] |gmd:metadataMaintenance|geonet:child[string(@name)='metadataMaintenance']"> - + @@ -2155,7 +2342,7 @@ |gmd:featureAttribute|geonet:child[string(@name)='featureAttribute'] "> - + @@ -2164,49 +2351,50 @@ - + - + - + - - + + - + - + - + - - + + - + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + @@ -2362,28 +2558,28 @@ - + - + - + - - - - + + + + display:none; - - - - - - + + + + + + - + @@ -2891,16 +3126,20 @@ - + - + - @@ -2913,13 +3152,13 @@ - + - - + + @@ -2927,7 +3166,7 @@ - + @@ -2939,24 +3178,31 @@ - + - - - - - -
- - - - - - - -
+ + + + + + + +
+ + + + + + + + + +
@@ -2971,29 +3217,31 @@ - - - - - - -
- - - - - -
+ + + + + + + + +
+ + + + + +
- - + + - + @@ -3012,47 +3260,57 @@ - + - + - + - + - - + '{$layer}', + '{$access}', 'gmd:onLine', '{ancestor::gmd:MD_DigitalTransferOptions/geonet:element/@ref}', [{$bbox}]);" + alt="{/root/gui/strings/publishHelp}" + title="{/root/gui/strings/geopublisherHelp}"> + + - - + + - + - - - + + + + + + + - <xsl:apply-templates mode="localised" select="gmd:identificationInfo/*/gmd:citation/*/gmd:title"> + <xsl:apply-templates mode="localised" + select="gmd:identificationInfo/*/gmd:citation/*/gmd:title"> <xsl:with-param name="langId" select="$langId"/> </xsl:apply-templates> @@ -3061,316 +3319,360 @@ - - + + - + - &fname=&access - - - + + &fname=&access + + + + + + + + + + - - - + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + - - - - - - - - - - application/vnd.google-earth.kml+xml - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + application/vnd.google-earth.kml+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + false + + + + + + + + + - - false - - - - + service + dataset - - - - - - service - dataset - - - + + - - - - <xsl:apply-templates mode="localised" select="gmd:citation/gmd:CI_Citation/gmd:title"> - <xsl:with-param name="langId" select="$langId"></xsl:with-param> - </xsl:apply-templates> - - - - - - - - - - - - - - - + + + <xsl:apply-templates mode="localised" select="gmd:citation/gmd:CI_Citation/gmd:title"> + <xsl:with-param name="langId" select="$langId"></xsl:with-param> + </xsl:apply-templates> + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + - + + + + + + + + + + + - - - + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + - - - - + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3394,26 +3696,27 @@ - + - - - - + + @@ -3433,9 +3736,10 @@ - + - + inspire @@ -3444,7 +3748,7 @@ - + @@ -3455,10 +3759,9 @@ ISOAll - - - - + + + @@ -3478,49 +3781,49 @@ extensionInfo - + - + - + - - - + + + - - + + - - + + - + - + + id="_{gco:CharacterString/geonet:element/@ref}" value="{gco:CharacterString}"> disabled - + - {/root/gui/strings/parentSearch} - + + + + + + {/root/gui/strings/parentSearch} + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + select="."> +   - - + + - + + select="ancestor-or-self::*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']"/> - + - - - - - - - - - - - - - + + + + + + + + + + + - - - +
- - + + + + + + - +
- + + + + +
- + - + - + - + - - - + + + - - - - + + + + + + + + + + + + @@ -3687,12 +4014,12 @@ Multilingual metadata: ===================================================================== * ISO 19139 define how to store multilingual content in a metadata - record. - 1) A record is defined by a main language set in + record. + 1) A record is defined by a main language set in gmd:MD_Metadata/gmd:language element. All gco:CharacterString are - then defined in that language. + then defined in that language. 2) In order to add translation editor - should add a gmd:locale element in gmd:MD_Metadata: + should add a gmd:locale element in gmd:MD_Metadata: @@ -3715,64 +4042,67 @@ - - ===================================================================== + + ===================================================================== Editor principles: - ===================================================================== + ===================================================================== * available locales in metadata records are not displayed in view mode, only used in editing mode in order to add multilingual content. - --> - - - + --> + + + - + - + - - + + - - + + - - + - - - + > + + + - title + title + large medium + or name(.)='gmd:statement'">medium + small + ">small + - + - - - + + + - - - - - + priority="100"> + + + - + - - - - + + - - - - - + + + + + - + + select="ancestor-or-self::*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']"/> - + - + - - - + + + + select="string(/root/*/gmd:language/gco:CharacterString|/root/*/gmd:language/gmd:LanguageCode/@codeListValue)"/> - + + select="ancestor-or-self::*[name(.)='gmd:MD_Metadata' or @gco:isoType='gmd:MD_Metadata']"/> @@ -3926,188 +4255,199 @@ - - - + + + - + - - + + - - - + + + - + - + - - - + + + - + - - + + - - - - + + + + - - - + + + - - - - - - - + + + + + + - - - + + + - - - - + - - - - - + + display:none; - - - - - + display:block; - - - - - - + + + + + + + + + + + + + + + + + - - -
-
+ + +
+