Merge pull request #60 from alexarobu/4.2.x

update 4.2.x version

docs/UserDoc_Chap1_Intro.rst

@@ -25,7 +25,7 @@ A metadata standard is a specification which establishes a common understanding
 
 The development of such schemas tends to be controlled through community consensus combined with a formal processes for submission, approval and publishing of new elements. Schemas that are developed and maintained by standards organisations (e.g. ISO) or organisations that have taken on such responsibility (e.g. Dublin Core Metadata Initiative) are called metadata standards.
 
-The UK Geospatial Metadata Interoperability Initiative (`GEMINI <https://www.agi.org.uk/agi-groups/standards-committee/uk-gemini>`__ ) is the UK’s geographic metadata standard. It was originally produced through a collaboration between the Association for Geographic Information (AGI), the e-Government Unit (eGU) and the UK Data Archive. An application profile of ISO 19115, UK GEMINI is conformant with the INSPIRE Technical Guidance and designed to meet the requirements of INSPIRE in a UK context.
+The UK Geospatial Metadata Interoperability Initiative (`GEMINI <https://www.agi.org.uk/groups/agi-gemini>`__ ) is the UK’s geographic metadata standard. It was originally produced through a collaboration between the Association for Geographic Information (AGI), the e-Government Unit (eGU) and the UK Data Archive. An application profile of ISO 19115, UK GEMINI is conformant with the INSPIRE Technical Guidance and designed to meet the requirements of INSPIRE in a UK context.
 
 
 Why create metadata?
@@ -51,6 +51,6 @@ When effort and resource is put into the provision of standard compliant metadat
 Why use UK Gemini?
 ------------------
 
-`UK GEMINI <https://www.agi.org.uk/agi-groups/standards-committee/uk-gemini>`__ is the designated standard for geographic metadata in the United Kingdom. It ensures consistency with respect to metadata across the UK through content guidance and the use of UK specific terms and code lists. UK Gemini also  simplifies the INSPIRE Technical Guidance making it easier for organisations to achieve compliance.
+`UK GEMINI <https://agiorguk.github.io/gemini/1037-uk-gemini-introduction.html>`__ is the designated standard for geographic metadata in the United Kingdom. It ensures consistency with respect to metadata across the UK through content guidance and the use of UK specific terms and code lists. UK Gemini also  simplifies the INSPIRE Technical Guidance making it easier for organisations to achieve compliance.
 
 While ensured compliance to regulations is important, the key benefit is the interoperability the standard allows across a range of platforms. Metadata in the Gemini format can be shared and consumed easily by a number of platforms and third party applications. Gemini is a requirement for the data.gov.uk portal and, with version 2.3, can now be consumed by the ESRI ArcGIS platform without the need of additional plugins.

docs/UserDoc_Chap8_Annex1.rst

@@ -1,8 +1,8 @@
 Annex 1: Requirements for metadata to be correctly identified as UK Gemini
 ==========================================================================
 
-Records that are imported into `SpatialData.gov.scot <https://www.spatialdata.gov.scot>`__ (rather than created within the portal using the available templates) must include the following XML elements 
-to ensure that the record is correctly identified as `UK GEMINI <https://www.agi.org.uk/agi-groups/standards-committee/uk-gemini>`__ upon import.
+Records that are imported into `SpatialData.gov.scot <https://www.spatialdata.gov.scot>`__ (rather than created within the portal using the available templates) must include the following XML elements
+to ensure that the record is correctly identified as `UK GEMINI <https://www.agi.org.uk/groups/agi-gemini/>`__ upon import.
 
 *Note: Using the default* **to-gemini23** *xsl transformation when* `importing <UserDoc_Chap5_Create.html#import-existing-metadata>`__ *will do this for you.*
 

docs/UserDoc_Chap9_Annex2.rst

@@ -1,16 +1,16 @@
 Annex 2: Upgrading to UK Gemini 2.3
 ===================================
 
-`SpatialData.gov.scot <https://www.spatialdata.gov.scot>`__ has now implemented `UK GEMINI <https://www.agi.org.uk/agi-groups/standards-committee/uk-gemini>`__ 2.3. All new metadata created on the portal will conform to version 2.3, and metadata publishers are strongly encouraged to upgrade their existing 2.2 records as soon as possible. This section provides guidance on how users can upgrade their existing metadata via a number of methods. For detail on what has changed from version 2.2 to 2.3, please see information provided by the `Association of Geographic Information (AGI) <https://www.agi.org.uk/agi-groups/standards-committee/uk-gemini/40-gemini/1055-uk-gemini-major-changes-since-1-0>`__.
+`SpatialData.gov.scot <https://www.spatialdata.gov.scot>`__ has now implemented `UK GEMINI <https://www.agi.org.uk/groups/agi-gemini/>`__ 2.3. All new metadata created on the portal will conform to version 2.3, and metadata publishers are strongly encouraged to upgrade their existing 2.2 records as soon as possible. This section provides guidance on how users can upgrade their existing metadata via a number of methods. For detail on what has changed from version 2.2 to 2.3, please see information provided by the `Association of Geographic Information (AGI) <https://agiorguk.github.io/gemini/1055-uk-gemini-major-changes-since-1-0.html>`__.
 
 The conversion tools will make the following changes to 2.2 records to make them compliant with Gemini 2.3:
 
 * Add or otherwise update the **MetadataStandardName** to UK GEMINI and the **MetadataStandardVersion** to 2.3.
 * Change the encoding of the **Access Constraints** and **Use Limitations** elements to meet the new standard, either making a best guess at moving your existing constraints into the correct encoding, or adding the default "no limitations" constraints as appropriate.
-* Adds the default INSPIRE **Conformance Report** for datasets or services if one does not already exist.	
+* Adds the default INSPIRE **Conformance Report** for datasets or services if one does not already exist.
 * Replaces any references to `http://www.opengis.net/gml <http://www.opengis.net/gml>`__ with `http://www.opengis.net/gml/3.2 <http://www.opengis.net/gml/3.2>`__.
 * Adds a default **Character Encoding** of UTF8.
-	
+
 Updating through an editing session
 -----------------------------------
 
@@ -30,15 +30,15 @@ To convert an existing record to Gemini 2.3:
 	**2|** On the right hand side of the editing board, run the suggestions wizard.
 
 	*Note: if the if the record is currently recognised as Gemini 2.2, the following suggestion should appear: Metadata Schema is Gemini 2.2. Run this task to convert to Gemini 2.3.*
-	
+
 	**3|** Click the suggestion to run the transformation script.
-	
+
 	*Note: the record will be converted to Gemini 2.3 and the editing view will change to show the embedded 2.3 guidance.*
-	
+
 	**4|** Ensure the record is valid by clicking |button_edit_validate| in the header bar. See `validating metadata <UserDoc_Chap6_Edit.html#validating-metadata>`__ for more information.
-	
+
 	*Note: The conversion process will not automatically create valid metadata. Users must ensure that the record validates and correct any errors.*
-	
+
 	**5|** Click |button_edit_saveclose| to save and close the record.
 
 
@@ -48,11 +48,11 @@ Updating records on import
 Metadata records can also be converted from 2.2 to 2.3 on import into `SpatialData.gov.scot <https://www.spatialdata.gov.scot>`__.
 
 	**1|** Follow steps 1 to 4 of `importing an existing XML metadata record <UserDoc_Chap6_Edit.html#to-import-an-existing-XML-metadata-record>`__.
-	
+
 	**2|** For the XSLT transformation, select GEMINI 2.2 to GEMINI 2.3 from the drop down menu.
-	
+
 	**3|** Follow the remaining steps to import the record.
-	
+
 	**4|** Users should ensure the imported metadata is valid. See `validating metadata <UserDoc_Chap6_Edit.html#validating-metadata>`__ for more information.
 
 Updating harvested records

docs/ssdi_adminguidance.rst

@@ -65,7 +65,7 @@ The **Editor board** can be used to perform administrative functions on individu
 
 Figure 3.1.1: Administrative functions that act on individual records, accessed from the **Editor board**
 
-In order from left to right these are:
+In order from left to right these are:show_harvester_facets_button
 
 * Privileges- set privileges on which groups can access or edit this record
 * Edit- access the metadata editor for this record
@@ -367,13 +367,13 @@ Figure 7.3.3: Harvested records filters, top half of the screen
 
 Figure 7.3.4: Harvested records filters, bottom half of the screen
 
-The filter facets can be expanded by clicking on the |hide_harvester_facets_button| or collapsed by clicking on the |show_harvester_facets_button| at the top right corner of the summary box.
+The filter facets can be expanded by clicking on the |show_harvester_facets_button| or collapsed by clicking on the |hide_harvester_facets_button| at the top right corner of the summary box.
 
 A list of the filtered records can be reviewed in the harvested records subsection and filters can be cleared by clicking on the |remove_harvester_filter_button|.
 
 Filtered records can be removed in bulk by clicking the |remove_harvester_records| button.
 
-*Note: this will permanently delete the records from the catalog.*
+**Note: this will PERMANENTLY delete the records from the catalog.**
 
 Harvester Reports
 -----------------
@@ -389,6 +389,8 @@ Feature Harvesters
 
 Here are listed the ongoing and finished jobs for indexing features from remote WFS services. Once indexed, features can then be filtered according to their attributes and the filter applied to the original map layer.
 
+**Note: This feature is not currently being used in this implementation.**
+
 |image6a|
 
 Figure 7.5.1: WFS Indexing Dashboard
@@ -417,7 +419,7 @@ Figure 8.1.1: Status page showing catalog performing optimally
 
 Figure 8.1.2: Status page showing error, with detailed error message accessed by clicking on red link
 
-*Report any errors shown here to Astun Technology.*
+**Report any errors shown here to Astun Technology.**
 
 The metrics links provide advanced information on the status of the system and should not generally be needed. The Activity "Export (zip)" provides a log file from the server.
 This may be requested by Astun Technology support staff. This download could be large and may take some time. The Thread Status link provides advanced information on the java installation, and should not generally be needed.
@@ -719,7 +721,7 @@ The information displayed here comes from the record’s `gmd:pointOfContact/gmd
 * `gmd:organisationName` determines the organisation name (in the example above- Scottish Government)
 * `gmd:electronicMailAddress` determines the logo- the domain has to match a logo name loaded in the catalog (in the example above the domain is gov.scot so the logo name has to be gov.scot.png)
 
-**NB:** It’s important to note that the file extension for the logo **has to be PNG**, otherwise the logo **won’t** be associated with the resource and thus **won’t** be displayed.
+**Note: It’s important to note that the file extension for the logo has to be PNG, otherwise the logo won’t be associated with the resource and thus won’t be displayed.**
 
 **Metadata information- Organisation logo**
 
@@ -735,7 +737,7 @@ The information displayed here comes from the record’s `gmd:contact/gmd:CI_Res
 * `gmd:organisationName` determines the organization name (in the example above- Scottish Government)
 * `gmd:electronicMailAddress` determines the logo- the domain has to match a logo name loaded in the catalog (in the example above the domain is gov.scot so the logo name has to be gov.scot.png)
 
-**NB:** It’s important to note that the file extension for the logo **has to be PNG**, otherwise the logo **won’t** be associated with the resource and thus **won’t** be displayed.
+**Note: It’s important to note that the file extension for the logo has to be PNG, otherwise the logo won’t be associated with the resource and thus won’t be displayed.**
 
 **Provided by- Group logo**
 
@@ -773,25 +775,6 @@ The CSW Service information setting allows the configuration of some of the GetC
 
 Figure 12.3.1: The CSW settings interface
 
-Virtual CSW
------------
-
-This subsection allows the configuration of Virtual CSW endpoints. These allow for different CSW URLs to be used within the catalogue, such as for different groups or metadata categories.
-
-To configure a new Virtual CSW endpoint, click the blue "New Virtual CSW" button and then configure the following settings:
-
-* Name- This will be used as the URL endpoint for the virtual CSW. **This must begin with csw-**
-* Description
-* Filters/Query- the filter that should be used to decide on the records that should be published under this endpoint. Choose from the dropdown list, or use the advanced query option. The figure below shows an example endpoint for records belonging to the Aberdeen group
-
-|image28|
-
-Figure 12.4.1: Virtual CSW endpoint set up for Aberdeen group
-
-Once a virtual endpoint has been saved, it's capabilities can be checked using the link shown below in figure 12.5.1
-
-**Note that the default contact information, as configured in the CSW subsection, will be used for the GetCapabilities request**
-
 CSW test
 --------
 
@@ -924,7 +907,11 @@ Note that the services don't return a result, just a blank page. Note also that
 .. |image3| image:: media/adminimage04.png
 .. |image4| image:: media/adminimage05.png
 .. |image5| image:: media/adminimage06.png
+.. |image5a| image:: media/adminimage06a.png
+.. |image5b| image:: media/adminimage06b.png
 .. |image6| image:: media/adminimage07.png
+.. |image6a| image:: media/adminimage07a.png
+.. |image6b| image:: media/adminimage07b.png
 .. |image7| image:: media/adminimage08.png
 .. |image7a| image:: media/adminimage08a.png
 .. |image7b| image:: media/adminimage08b.png
@@ -990,4 +977,9 @@ Note that the services don't return a result, just a blank page. Note also that
 .. |button_batch_save| image:: media/button_batch_save.png
 .. |button_transfer| image:: media/button_transfer.png
 .. |analyze_records_button| image:: media/analyze_records_button.png
-.. |test_link_button| image:: media/test_link_button.png
+.. |test_link_button| image:: media/test_link_button.png
+.. |show_harvester_facets_button| image:: media/show_harvester_facets_button.png
+.. |hide_harvester_facets_button| image:: media/hide_harvester_facets_button.png
+.. |remove_harvester_filter_button| image:: media/remove_harvester_filter_button.png
+.. |remove_harvester_records| image:: media/remove_harvester_records.png
+.. |add_wfs_harvester_button| image:: media/add_wfs_harvester_button.png