Add error in qualifiers management and do not fail anymore on non-gregorian calendar

diff --git a/xslts/get_next_step.xslt b/xslts/get_next_step.xslt
index b46e5ec64738618f2e427e3de28886727b9f15c6..602256a9f072bd78f27e0655b82278732ad2d525 100644 (file)
--- a/xslts/get_next_step.xslt
+++ b/xslts/get_next_step.xslt
@@ -99,7 +99,6 @@
                                <xsl:value-of select="wdef:quantity/@wdef:unit" />
                                <xsl:text>"}</xsl:text>
                        </xsl:when>
-                       <xsl:when test="wdef:qualifier"></xsl:when>
                        <xsl:when test="wdef:ref-element">
                                <xsl:value-of select="wdef:ref-element" />
                        </xsl:when>
@@ -147,6 +146,8 @@
                                <xsl:value-of select="wdef:coordinate/wdef:ref-element" />
                                <xsl:text>"}</xsl:text>
                        </xsl:when>
+                       <!-- wdef:qualifier must stay at the end of the list so it has least predecence -->
+<!--                   <xsl:when test="wdef:qualifier"></xsl:when> -->
                        <xsl:otherwise>
                                <xsl:message terminate="yes">
                                        <xsl:text>Cannot import "</xsl:text>

diff --git a/xslts/merge_rdf.xslt b/xslts/merge_rdf.xslt
index 67ac607f5cc8185b500b994799cda82049fc9131..7ecde30d715cee028d4b14fbeb5fe1737f44b4bb 100644 (file)
--- a/xslts/merge_rdf.xslt
+++ b/xslts/merge_rdf.xslt
@@ -326,7 +326,13 @@
                                                </xsl:variable>
                                                
                                                <xsl:if test="not($wd-date-description/wikibase:timeCalendarModel[@rdf:resource = concat($wd-resource-prefix, 'Q1985727')])">
-                                                       <xsl:message terminate="yes">Can only deal with gregorian calendar for now</xsl:message>
+                                                       <xsl:text>yes</xsl:text>
+                                                       <xsl:message terminate="no">
+                                                               <xsl:value-of select="$element-id" />
+                                                               <xsl:text>-</xsl:text>
+                                                               <xsl:value-of select="$PID" />
+                                                               <xsl:text>Can only deal with gregorian calendar for now. Our value will not be imported.</xsl:text>
+                                                       </xsl:message>
                                                </xsl:if>
                                                
                                                <xsl:choose>