[GeoNetwork-commit] SF.net SVN: geonetwork:[3609] sandbox/geocat.ch/trunk/web/geonetwork/xsl/ conversion

[<pva...@us...>]

Revision: 3609
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=3609&view=rev
Author:   pvalsecc
Date:     2009-05-06 07:20:17 +0000 (Wed, 06 May 2009)

Log Message:
-----------
Fixed a few conversion issues

Modified Paths:
--------------
    sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/19139CHE-to-GM03.xsl
    sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/resp-party.xsl
    sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/GM03to19139CHE/CHE03-to-19139.xsl

Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/19139CHE-to-GM03.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/19139CHE-to-GM03.xsl	2009-05-06 06:11:23 UTC (rev 3608)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/19139CHE-to-GM03.xsl	2009-05-06 07:20:17 UTC (rev 3609)
@@ -44,8 +44,9 @@
             <xsl:when test="$lang3='ita'">it</xsl:when>
             <xsl:when test="$lang3='eng'">en</xsl:when>
             <xsl:when test="$lang3='rhe'">rm</xsl:when>
+            <xsl:when test="$lang3='aar'">aa</xsl:when>
             <xsl:when test="$lang3=''"></xsl:when>
-            <xsl:otherwise>ERROR<xsl:value-of select="$lang3"/></xsl:otherwise>
+            <xsl:otherwise>ERROR_<xsl:value-of select="$lang3"/></xsl:otherwise>
         </xsl:choose>
     </xsl:template>
 
@@ -162,6 +163,7 @@
             <xsl:when test=".='#IT'">it</xsl:when>
             <xsl:when test=".='#EN'">en</xsl:when>
             <xsl:when test=".='#RM'">rm</xsl:when>
+            <xsl:when test=".='#AA'">aa</xsl:when>
             <xsl:otherwise><xsl:value-of select="@locale"/></xsl:otherwise>
         </xsl:choose></language>
     </xsl:template>

Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/resp-party.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/resp-party.xsl	2009-05-06 06:11:23 UTC (rev 3608)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/19139CHEtoGM03/resp-party.xsl	2009-05-06 07:20:17 UTC (rev 3609)
@@ -12,7 +12,11 @@
         <GM03_2Core.Core.CI_ResponsibleParty TID="x{generate-id(.)}">
             <xsl:apply-templates mode="text" select="che:individualFirstName"/>
             <xsl:apply-templates mode="text" select="che:individualLastName"/>
-            <xsl:apply-templates mode="RespParty" select="gmd:contactInfo/gmd:CI_Contact/gmd:address/che:CHE_CI_Address/gmd:electronicMailAddress|gmd:contactInfo/gmd:CI_Contact/gmd:address/gmd:CI_Address/gmd:electronicMailAddress"/>
+            <xsl:if test="gmd:contactInfo/gmd:CI_Contact/gmd:address/*/gmd:electronicMailAddress">
+                <electronicalMailAddress>
+                    <xsl:apply-templates mode="RespParty" select="gmd:contactInfo/gmd:CI_Contact/gmd:address/*/gmd:electronicMailAddress"/>
+                </electronicalMailAddress>
+            </xsl:if>
             <xsl:apply-templates mode="text" select="gmd:organisationName"/>
             <xsl:apply-templates mode="text" select="gmd:positionName"/>
             <xsl:apply-templates mode="text" select="che:organisationAcronym"/>
@@ -27,11 +31,9 @@
     </xsl:template>
 
     <xsl:template mode="RespParty" match="gmd:electronicMailAddress">
-        <electronicalMailAddress>
-            <GM03_2Core.Core.URL_>
-                <value><xsl:value-of select="gco:CharacterString/text()"/></value>
-             </GM03_2Core.Core.URL_>
-        </electronicalMailAddress>
+        <GM03_2Core.Core.URL_>
+            <value><xsl:value-of select="gco:CharacterString/text()"/></value>
+        </GM03_2Core.Core.URL_>
     </xsl:template>
 
     <xsl:template mode="RespParty" match="gmd:onlineResource">

Modified: sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/GM03to19139CHE/CHE03-to-19139.xsl
===================================================================
--- sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/GM03to19139CHE/CHE03-to-19139.xsl	2009-05-06 06:11:23 UTC (rev 3608)
+++ sandbox/geocat.ch/trunk/web/geonetwork/xsl/conversion/GM03to19139CHE/CHE03-to-19139.xsl	2009-05-06 07:20:17 UTC (rev 3609)
@@ -149,7 +149,8 @@
             <xsl:when test="$lang='IT'">ita</xsl:when>
             <xsl:when test="$lang='EN'">eng</xsl:when>
             <xsl:when test="$lang='RM'">rhe</xsl:when>
-            <xsl:otherwise><xsl:value-of select="$lang"/></xsl:otherwise>
+            <xsl:when test="$lang='AA'">aar</xsl:when>
+            <xsl:otherwise>ERROR_<xsl:value-of select="$lang"/></xsl:otherwise>
         </xsl:choose>
     </xsl:template>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.