Changeset 2725 for cats/ISOcat/trunk/mod-ISOcat-access-data/access/dc_check.xsl

Timestamp:

03/20/13 16:21:19 (11 years ago)

Author:

mwindhouwer

Message:

M mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/xml/spies.xml
M mod-ISOcat-interface-gi/interface/JSXAPPS/ISOcat/help/profile.html

• updated help info with regard to the Private profile, which is now the 'undecided' profile

M mod-ISOcat-site/site/index_files/news.html
M mod-ISOcat-site/site/index_files/TDGs.html
M mod-ISOcat-site/pub/isocat.pub

• keep track of the revision info

M mod-ISOcat-access-data/access/dc_check.xsl

• if a DC is (still) assigned to the 'undecided' profile an warning is raised
• if a DC is assigned to the 'undecided' profile next to one or more thematic profile an error is raised

File:

• cats/ISOcat/trunk/mod-ISOcat-access-data/access/dc_check.xsl (modified) (2 diffs)

cats/ISOcat/trunk/mod-ISOcat-access-data/access/dc_check.xsl

@@ -225 +225 @@
         
         <xsl:template match="dcif:descriptionSection/dcif:profile">
-                <xsl:if test="$standard-flag and current()='undecided'">
+                <xsl:if test="current()='undecided'">
                         <xsl:choose>
-                                <xsl:when test="ancestor::dcif:dataCategory/@isocat:type='closed'">
+                                <xsl:when test="count(distinct-values(../dcif:profile))=1">
                                         <xsl:call-template name="warning">
-                                                <xsl:with-param name="msg">Standardized data categories can't be a member of the 'undecided' profile.</xsl:with-param>
+                                                <xsl:with-param name="msg">This data category is (still) a member of the 'undecided' profile.</xsl:with-param>
                                                 <xsl:with-param name="standard" select="'allow'"/>
                                         </xsl:call-template>
@@ -235 +235 @@
                                 <xsl:otherwise>
                                         <xsl:call-template name="error">
-                                                <xsl:with-param name="msg">Standardized data categories can't be a member of the 'undecided' profile.</xsl:with-param>
+                                                <xsl:with-param name="msg">This data category is a member of the 'undecided' profile and one or more thematic profiles.</xsl:with-param>
                                         </xsl:call-template>
                                 </xsl:otherwise>
                         </xsl:choose>
                 </xsl:if>
+                <xsl:if test="$standard-flag and current()='undecided'">
+                        <xsl:call-template name="error">
+                                <xsl:with-param name="msg">Standardized data categories can't be a member of the 'undecided' profile.</xsl:with-param>
+                        </xsl:call-template>
+                </xsl:if>
                 <xsl:if test="$standard-flag and current()='not available'">
                         <xsl:choose>
-                                <xsl:when test="ancestor::dcif:dataCategory/@isocat:type='not available'">
+                                <xsl:when test="ancestor::dcif:dataCategory/@isocat:type='closed'">
                                         <xsl:call-template name="warning">
                                                 <xsl:with-param name="msg">Standardized data categories can't be a member of the 'not available' profile.</xsl:with-param>