[GeoNetwork-commit] SF.net SVN: geonetwork:[2827] sandbox/GeoSource/GeoNetwork/web/geonetwork/ xml/schemas/iso19139

[<fxp...@us...>]

Revision: 2827
          http://geonetwork.svn.sourceforge.net/geonetwork/?rev=2827&view=rev
Author:   fxprunayre
Date:     2009-04-03 08:30:35 +0000 (Fri, 03 Apr 2009)

Log Message:
-----------
Use onlinesource first, if null, use GetCapabilities operation url.

Modified Paths:
--------------
    sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139/extract-serviceInfo.xsl
    sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139fra/extract-serviceInfo.xsl

Modified: sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139/extract-serviceInfo.xsl
===================================================================
--- sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139/extract-serviceInfo.xsl	2009-04-03 08:29:15 UTC (rev 2826)
+++ sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139/extract-serviceInfo.xsl	2009-04-03 08:30:35 UTC (rev 2827)
@@ -9,24 +9,24 @@
 	<xsl:template match="gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']">
 		<serviceInfo>
 			
-			<!-- Get Service URL from GetCapabilities Operation, if null from distribution information -->
-			<xsl:variable name="url">
-				<xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>					
-			</xsl:variable>
-			<xsl:variable name="protocol">
-				<xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:protocol"/>
-			</xsl:variable>
-
-			<url>
-			<xsl:choose>
-				<xsl:when test="$url=''">
-					<xsl:value-of select="gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$url"/>
-				</xsl:otherwise>
-			</xsl:choose>
-			</url>
+		    <!-- Get Service URL from distribution information, if null from GetCapabilities Operation  -->
+		    <xsl:variable name="url">
+		        <xsl:value-of select="gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>
+		    </xsl:variable>
+		    <xsl:variable name="protocol">
+		        <xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:protocol"/>
+		    </xsl:variable>
+		    
+		    <url>
+		        <xsl:choose>
+		            <xsl:when test="$url=''">
+		                <xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>                    
+		            </xsl:when>
+		            <xsl:otherwise>
+		                <xsl:value-of select="$url"/>
+		            </xsl:otherwise>
+		        </xsl:choose>
+		    </url>
 			
 			<!-- Get service protocol -->
 			<protocol>

Modified: sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139fra/extract-serviceInfo.xsl
===================================================================
--- sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139fra/extract-serviceInfo.xsl	2009-04-03 08:29:15 UTC (rev 2826)
+++ sandbox/GeoSource/GeoNetwork/web/geonetwork/xml/schemas/iso19139fra/extract-serviceInfo.xsl	2009-04-03 08:30:35 UTC (rev 2827)
@@ -10,9 +10,9 @@
 	<xsl:template match="gmd:MD_Metadata|*[@gco:isoType='gmd:MD_Metadata']">
 		<serviceInfo>
 			
-			<!-- Get Service URL from GetCapabilities Operation, if null from distribution information -->
+		    <!-- Get Service URL from distribution information, if null from GetCapabilities Operation  -->
 			<xsl:variable name="url">
-				<xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>					
+			    <xsl:value-of select="gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>
 			</xsl:variable>
 			<xsl:variable name="protocol">
 				<xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:protocol"/>
@@ -21,7 +21,7 @@
 			<url>
 			<xsl:choose>
 				<xsl:when test="$url=''">
-					<xsl:value-of select="gmd:distributionInfo/gmd:MD_Distribution/gmd:transferOptions/gmd:MD_DigitalTransferOptions/gmd:onLine/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>
+				    <xsl:value-of select="gmd:identificationInfo/srv:SV_ServiceIdentification/srv:containsOperations/srv:SV_OperationMetadata[srv:operationName/gco:CharacterString='GetCapabilities']/srv:connectPoint/gmd:CI_OnlineResource/gmd:linkage/gmd:URL"/>				    
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="$url"/>


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