DKAN: Fix date conversion to accept "DD-MM-YYYY HH:MM" format

[tkohr]

PR makes regExLoc for localized date conversion more permissive. Now accepts - and / as date separators and just whitespace chars between date and time. This allows date formats such as 31-03-2023 00:15 in addition to the current "jeu, 24/12/2020 - 03:00.

IMO, it makes sense to make the existing regexp more permissive, as this will also allow similar formats like

• jeu, 24/12/2020 03:00
• 24/12/2020 03:00
• 24-12-2020 - 03:00

A more restrictive alternative would be to add a separate regexp and matching condition :

<!-- example of custom date: "24-12-2020 00:00" -->
<xsl:variable name="regExCustom">^([0-9]{2})-([0-9]{2})-([0-9]{4}) ([0-9]{2}:[0-9]{2})$</xsl:variable>

<xsl:when test="matches($value, $regExCustom)">
  <xsl:value-of select="replace($value, $regExCustom, '$3-$2-$1T$4:00')"></xsl:value-of>
</xsl:when>

[fgravin]

Ok to accept - or /, but did you notice that the format is different as well ?

eg "metadata_created": "11-03-2021 14:00", is DD-MM-YYYY and not YYYY-MM-DD
It means that the comment below is deprecated cause the expression does not support this format 2020-12-09 00:00:00
I mentioned that DKAN seems to output all kinds of date format, see https://opendata.hautsdefrance.fr/?q=api/3/action/current_package_list_with_resources which should be supported as well.

Also don't you forget the \ before the slash ? I had to add them to test the regexp on https://regex101.com/

^.*([0-9]{2})[-\/]([0-9]{2})[-\/]([0-9]{4})\s+([0-9]{2}:[0-9]{2})$

But maybe in XSL it's ok

Thanks

[tkohr]

Thanks for the feedback !

The date format 2020-12-09 00:00:00 is handled by the regExInt one line below.

Indeed, the \ is apparently not supported in XSL here (causing "invalid escape sequence" errors). https://regexr.com/ does not reclaim it, neither.

I've added the potential - separator between date and time (which I forgot) and added accepting optional seconds (which will not be used via the capturing group but stay :00 for the sake of simplicity).

[fgravin]

Does it match 2020-12-09 00:00:00 ?

[tkohr]

This one does I think, doesn't it?

[fgravin]

yes sorry looks good !

[fgravin]

Great work, it covers all formats (so far 😄 )