Merge branch 'formats' into origin-dev

SIS/clarin/data/formats/fArcGIS.asc.xml

@@ -8,6 +8,7 @@
   <keyword>ArcGIS</keyword>
   <keyword>raster format</keyword>
   <keyword>exchange format</keyword>
+  <keyword>Esri</keyword>
   <extId type="LOC">fdd000421</extId>
   <extId type="Wikidata">Q27349828</extId>
   <info type="description">

SIS/clarin/data/formats/fArcGIS.gdb.xml

@@ -6,6 +6,7 @@
   </titleStmt>
   <keyword>GIS</keyword>
   <keyword>ArcGIS</keyword>
+  <keyword>Esri</keyword>
   <extId type="LOC">fdd000294</extId>
   <extId type="PRONOM">fmt/990</extId>
   <extId type="Wikidata">Q50376365</extId>
@@ -24,7 +25,7 @@
     <ul>
       <li>
         <a
-          href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/esri-geodatabase"
+          href="https://dans.knaw.nl/en/file-formats/raster-gis/"
           >DANS info</a>
       </li>
       <li>

SIS/clarin/data/formats/fArcGIS.mxd.xml

@@ -7,14 +7,15 @@
   <keyword>GIS</keyword>
   <keyword>ArcGIS</keyword>
   <keyword>GIS workspace format</keyword>
+  <keyword>Esri</keyword>
   <extId type="PRONOM">fmt/916</extId>
   <extId type="Wikidata">Q50223857</extId>
   <info type="description">
     <p>"In the ArcGIS platform by ESRI, a map document is a file that contains one or more maps,
       the page layout, and the associated layers, tables, charts, and reports." (PRONOM)</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/project-files-workspaces">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/raster-gis/">DANS info</a></li>
     </ul>
   </info>
   <mimeType>application/octet-stream</mimeType>

SIS/clarin/data/formats/fDXF.R12.xml

@@ -11,7 +11,7 @@
     <p>Version R12 of the <a href="../views/view-format.xq?id=fDXF">AutoCAD DXF format</a> appears to be stable, open, and widespread. As a text-based format, it is advocated by several CLARIN centres.</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/autocad-dxf-version-r12-ascii">DANS description of R12</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/computer-aided-design-cad/">DANS description of R12 and others</a></li>
       <li><a href="https://www.martinreddy.net/gfx/3d/DXF12.spec">the R12 specification document</a></li>
       <li><a href="https://www.loc.gov/preservation/digital/formats/fdd/fdd000446.shtml">LoC info on the DXF format family</a>, with references to multiple versions identified by PRONOM</li>
     </ul>

SIS/clarin/data/formats/fDXF.xml

@@ -13,7 +13,7 @@
     <p>Family of formats, of which <a href="../views/view-format.xq?id=fDXF.R12">version R12</a> is advocated by several CLARIN centres.</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/computer-aided-design-cad">DANS info on CAD formats</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/computer-aided-design-cad/">DANS info on CAD formats</a></li>
       <li><a href="https://www.loc.gov/preservation/digital/formats/fdd/fdd000446.shtml">LoC info on the DXF format family</a>, with references to PRONOM</li>
       <li><a href="https://en.wikipedia.org/wiki/AutoCAD_DXF">Wikipedia entry</a></li>
       <li><a href="https://www.fileformat.info/format/dxf/egff.htm">Encyclopedia of Graphics File Formats</a> entry</li>

SIS/clarin/data/formats/fERDAS.img.xml

@@ -9,6 +9,7 @@
   <keyword>GIS</keyword>
   <keyword>georeference</keyword>
   <keyword>proprietary format</keyword>
+  <keyword>ERDAS</keyword>
   <extId type="Wikidata">Q28206049</extId>
   <extId type="LOC">fdd000420</extId>
   <info type="description">
@@ -17,7 +18,7 @@
       georeferenced image or a GIS grid file." (DANS)</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/erdas-imagine-file-format">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/images-georeference/">DANS info</a></li>
       <li><a href="http://fileformats.archiveteam.org/wiki/ERDAS_Imagine_IMG">File Format Wiki info</a></li>
     </ul>
   </info>

SIS/clarin/data/formats/fGML.xml

@@ -16,7 +16,7 @@
       "vector" or discrete objects, but coverages and sensor data." (Wikipedia)</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/gml">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/Geography_Markup_Language">Wikipedia entry</a></li> 
       <li><a href="https://inspire.ec.europa.eu/media-types/application/x-gmz">x-gmz</a> media-type application, possibly falling out of use</li>
     </ul>

SIS/clarin/data/formats/fGeoJSON.xml

@@ -18,7 +18,7 @@
       using GeoJSON." (Wikipedia)</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/geographical-information-gis">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/GeoJSON">Wikipedia entry</a></li>
     </ul>
   </info>

SIS/clarin/data/formats/fGeoTIFF.xml

@@ -20,7 +20,7 @@
       open a GeoTIFF format file." (Wikipedia)</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/geotiff">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/images-georeference/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/GeoTIFF">Wikipedia entry</a></li>
     </ul>
 

SIS/clarin/data/formats/fKML.xml

@@ -17,7 +17,7 @@
       support." (Wikipedia))</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/kml">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/Keyhole_Markup_Language">Wikipedia entry</a></li> 
     </ul>
   </info>

SIS/clarin/data/formats/fMapInfo.mif.xml

@@ -13,7 +13,7 @@
       textual data corresponding to each graphic object).</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/mif-mid">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/MapInfo_Interchange_Format">Wikipedia entry</a></li>
       <li><a href="https://web.archive.org/web/20060909054240/http://resource.mapinfo.com/static/files/document/1074660800077/interchange_file.pdf">Technical spec via web.archive.org</a></li>
     </ul>

SIS/clarin/data/formats/fMapInfo.tab.xml

@@ -12,7 +12,7 @@
     <p>The native format of MapInfo products. It consists of several files, of which the main one is ASCII-encoded and has the .tab extension.</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/mapinfo">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/MapInfo_TAB_format">Wikipedia entry</a></li>
     </ul>
   </info>

SIS/clarin/data/formats/fMapInfo.wor.xml

@@ -13,7 +13,7 @@
     <p>This is the format that encodes the composition of layers generated by MapInfo.</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/project-files-workspaces">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/MapInfo_Professional">Wikipedia entry on MapInfo Professional</a></li>
     </ul>
   </info>

SIS/clarin/data/formats/fQGIS.qgs.xml

@@ -5,19 +5,25 @@
     <abbr>QGIS.qgs</abbr>
   </titleStmt>
   <keyword>GIS</keyword>
-  <keyword>GIS workspace format</keyword>
-  <extId type="LOC">fdd000340</extId>
+  <keyword>proprietary format</keyword>
+  <keyword>georeference</keyword>
+  <keyword>ERDAS</keyword>
+  <extId type="LOC">fdd000420</extId> 
+  <!-- the above is really "related" - maybe we should have a @comment attribute here? -->
   <extId type="Wikidata">Q15631639</extId>
   <info type="description">
-    <p>"QGIS (until 2013 known as Quantum GIS) is a free and open-source cross-platform desktop
+    <p>QGIS is the XML-based format used by the QGIS software. "QGIS (until 2013 known as Quantum GIS) is a free and open-source cross-platform desktop
       geographic information system (GIS) application that supports viewing, editing, and analysis
       of geospatial data." (Wikipedia))</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/project-files-workspaces">DANS info</a></li>
       <li><a href="https://en.wikipedia.org/wiki/QGIS">Wikipedia entry</a></li> 
-      <li><a href="https://docs.qgis.org/3.16/en/docs/user_manual/appendices/qgis_file_formats.html">QGIS file formats</a></li>
+      <li><a href="https://docs.qgis.org/3.22/en/docs/user_manual/appendices/qgis_file_formats.html">QGIS file formats (v. 3.22)</a></li>
     </ul>
   </info>
   <fileExt>.qgs</fileExt>
+  <fileExt>.qgz</fileExt>
+  <fileExt>.qgd</fileExt>
+  <fileExt>.qlr</fileExt>
+  <fileExt>.qml</fileExt>
 </format>

SIS/clarin/data/formats/fSAS.sd2.xml

@@ -15,7 +15,7 @@
       corresponding long extension for version 9.x is .sas7bdat. DANS mentions also .7dat and .tpt.
       See:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/statistical-data/sas">DANS information on dataset SAS formats</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/statistical-data/">DANS information on dataset SAS formats</a></li>
       <li><a href="https://documentation.sas.com/doc/en/pgmsascdc/9.4_3.5/hostwin/n0sk6o15955yoen19n9ghdziqw1u.htm#n0mqfkm2esyf6ln1rxt8qynf5cho">File extensions for SAS files</a></li>
     </ul>
   </info>

SIS/clarin/data/formats/fSAS.xpt.xml

@@ -10,9 +10,9 @@
   <extId type="LOC">fdd000464</extId>
   <extId type="Wikidata">Q33120268</extId>
   <info type="description">
-    <p>This extension appears to signal versions 5-8 the SAS software. See:</p>
+    <p>The .xpt extension appears to signal versions 5-8 the SAS software. See:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/statistical-data/statistical-data">DANS information on statistical formats</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/statistical-data/">DANS information on statistical formats</a></li>
     </ul>
   </info>
   <mimeType>application/x-sas-xport</mimeType>

SIS/clarin/data/formats/fSPSS.data-and-setup.xml

@@ -6,10 +6,9 @@
   </titleStmt>  
   <keyword>plain text format</keyword>
   <keyword>statistical data</keyword>
+  <keyword>SPSS</keyword>
   <info type="description">
-    <p>See the <a
-        href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/data-and-setup"
-        >DANS description</a>.</p>
+    <p>See the <a href="https://dans.knaw.nl/en/file-formats/statistical-data/">DANS description</a>.</p>
   </info>
   <mimeType>text/plain</mimeType>
   <fileExt>.sps</fileExt>

SIS/clarin/data/formats/fSPSS.por.xml

@@ -10,9 +10,7 @@
   <extId type="PRONOM">fmt/997</extId>
   <extId type="LOC">fdd000468</extId>
   <info type="description">
-    <p>See the <a
-        href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/spss-portable"
-        >DANS description</a>.</p>
+    <p>See the <a href="https://dans.knaw.nl/en/file-formats/statistical-data/">DANS description</a>.</p>
   </info>
   <mimeType>application/x-spss-por</mimeType>
   <fileExt>.por</fileExt>

SIS/clarin/data/formats/fSPSS.sav.xml

@@ -12,7 +12,7 @@
   <extId type="PRONOM">fmt/638</extId>
   <info type="description">
     <p>See the <a
-      href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/statistical-data/spss-sav"
+      href="https://dans.knaw.nl/en/file-formats/statistical-data/"
       >DANS description</a>.</p>
   </info>
   <mimeType>application/x-spss-sav</mimeType>

SIS/clarin/data/formats/fSTATA.data-and-setup.xml

@@ -9,7 +9,7 @@
   <keyword>STATA</keyword>
   <info type="description">
     <p>See the <a
-        href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/data-and-setup"
+      href="https://dans.knaw.nl/en/file-formats/statistical-data/"
         >DANS description</a>.</p>
   </info>
   <mimeType>text/plain</mimeType>

SIS/clarin/data/formats/fSTATA.dta.xml

@@ -12,7 +12,7 @@
   <extId type="PRONOM">fmt/1037</extId>
   <info type="description">
     <p>See the <a
-      href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/statistical-data/stata"
+      href="https://dans.knaw.nl/en/file-formats/statistical-data/"
         >DANS description</a>.</p>
   </info>
   <!--<mimeType>no idea</mimeType>-->

SIS/clarin/data/formats/fShapefile.xml

@@ -6,6 +6,7 @@
   </titleStmt>
   <keyword>GIS</keyword>
   <keyword>ArcGIS</keyword>
+  <keyword>Esri</keyword>
   <extId type="LOC">fdd000280</extId>
   <extId type="PRONOM">x-fmt/235</extId>
   <extId type="BabelNet">bn:02131405n</extId>
@@ -25,7 +26,7 @@
     <p>Note also that newer media types have been requested, respectively application/vnd.shp, /vnd.shx, and /vnd.dbf (see below).</p>
     <p>See the following for more information:</p>
     <ul>
-      <li><a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/esri-shapefile">DANS info</a></li>
+      <li><a href="https://dans.knaw.nl/en/file-formats/geographical-information-systems-gis/">DANS info</a></li>
       <li><a href="http://en.wikipedia.org/wiki/Shapefile">Wikipedia entry</a></li>
       <li><a href="https://desktop.arcgis.com/en/arcmap/latest/manage-data/shapefiles/what-is-a-shapefile.htm">"What is a shapefile?"</a> from ESRI</li>
       <li><a href="https://www.esri.com/content/dam/esrisites/sitecore-archive/Files/Pdfs/library/whitepapers/pdfs/shapefile.pdf">technical description</a> by ESRI</li>

SIS/clarin/data/formats/fTextPlain.xml

@@ -4,7 +4,7 @@
     <title>Plain text</title>
     <abbr>plainText</abbr>
   </titleStmt>
-  <keyword>text</keyword>
+  <keyword>plain text format</keyword>
 <!-- what other keywords should we add here? -->
   <info type="description">
     <p>Plain text is a pure sequence of character codes. (...) Plain text represents character

SIS/clarin/data/formats/fWorldfile.jpgw.xml

@@ -8,9 +8,10 @@
   <keyword>world file</keyword>
   <keyword>sidecar file</keyword>
   <keyword>georeference</keyword>
+  <keyword>Esri</keyword>
   <info type="description">
     <p>See <a href="../views/view-format.xq?id=fWorldfile.jpgw">Esri world file description</a>.</p>
-    <p>See <a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/jpeg-world-file">DANS info</a>.</p>
+    <p>See <a href="https://dans.knaw.nl/en/file-formats/images-georeference/">DANS info</a>.</p>
   </info>
   <mimeType>text/plain</mimeType>
   <fileExt>.jpgw</fileExt>

SIS/clarin/data/formats/fWorldfile.tifw.xml

@@ -8,9 +8,10 @@
   <keyword>world file</keyword>
   <keyword>sidecar file</keyword>
   <keyword>georeference</keyword>
+  <keyword>Esri</keyword>
   <info type="description">
     <p>See <a href="../views/view-format.xq?id=fWorldfile.jpgw">Esri world file description</a>.</p>
-    <p>See <a href="https://dans.knaw.nl/en/about/services/easy/information-about-depositing-data/before-depositing/file-formats/tiff-world-file">DANS info</a>.</p>
+    <p>See <a href="https://dans.knaw.nl/en/file-formats/images-georeference/">DANS info</a>.</p>
   </info>
   <mimeType>text/plain</mimeType>
   <fileExt>.tifw</fileExt>

SIS/clarin/data/formats/fWorldfile.xml

@@ -8,6 +8,7 @@
   <keyword>world file</keyword>
   <keyword>sidecar file</keyword>
   <keyword>georeference</keyword>
+  <keyword>Esri</keyword>
   <extId type="LOC">fdd000287</extId>
   <extId type="PRONOM">fmt/367</extId>
   <extId type="Wikidata">Q1134089</extId>

SIS/clarin/modules/menu.xql

@@ -63,6 +63,13 @@ declare function menu:view() {
                         <a style="display:block" href="{app:link("views/list-popular-formats.xq")}">Popular Formats</a>
                     </td>
                 </tr>
+                <tr>
+                    <td width="10px"></td>
+                    <td width="10px"></td>
+                    <td class="tdmenu">
+                        <a style="display:block" href="{app:link("views/kpi.xq")}">Relevant KPIs</a>
+                    </td>
+                </tr>
                 <tr>
                     <td width="10px"></td>
                     <td colspan="2" class="tdmenu">