You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by wk...@apache.org on 2012/02/10 10:43:05 UTC

svn commit: r1242717 - /incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl

Author: wkasper
Date: Fri Feb 10 09:43:05 2012
New Revision: 1242717

URL: http://svn.apache.org/viewvc?rev=1242717&view=rev
Log:
Improved support for value-title pattern in field extraction

Modified:
    incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl

Modified: incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl?rev=1242717&r1=1242716&r2=1242717&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl (original)
+++ incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/resources/xslt/hcard2rdf.xsl Fri Feb 10 09:43:05 2012
@@ -689,58 +689,41 @@
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:choose>
-    <xsl:when test="$use-camel-case != 0">
-      <!-- translate property name to camel case -->
-      <xsl:variable name="propCC">
-	<xsl:call-template name="camel-case">
-	  <xsl:with-param name="name" select="$prop"/>
-	</xsl:call-template>
-      </xsl:variable>
+	<!--  check for value-title form -->  
+  <xsl:variable name="value">
+  	<xsl:choose>
+  		<xsl:when test="*/@title">
+  			<xsl:value-of select="*/@title"/>
+  		</xsl:when>
+  		<xsl:otherwise>
+  			<xsl:value-of select="normalize-space(.)"/>
+  		</xsl:otherwise>
+  	</xsl:choose>
+  </xsl:variable>
 
-      <!--
-      <xsl:message>
-	<xsl:text>f: </xsl:text>
-	<xsl:value-of select="$f"/>
-	<xsl:text>; field: </xsl:text>
-	<xsl:value-of select="$field"/>
-	<xsl:text>; c: </xsl:text>
-	<xsl:value-of select="@class"/>
-	<xsl:text>; prop: </xsl:text>
-	<xsl:value-of select="$prop"/>
-	<xsl:text>; cc: </xsl:text>
-	<xsl:value-of select="$propCC"/>
-      </xsl:message>
-      -->
-
-      <xsl:if test="$f != 0">
-      <!--  Hier scheint das Problem zu sein! -->
-	<xsl:element name="{$propCC}" namespace="http://www.w3.org/2006/vcard/ns#">
-	  <xsl:value-of select="."/>
-	</xsl:element>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <!--
-      <xsl:message>
-	<xsl:text>f: </xsl:text>
-	<xsl:value-of select="$f"/>
-	<xsl:text>; field: </xsl:text>
-	<xsl:value-of select="$field"/>
-	<xsl:text>; c: </xsl:text>
-	<xsl:value-of select="@class"/>
-	<xsl:text>; prop: </xsl:text>
-	<xsl:value-of select="$prop"/>
-      </xsl:message>
-      -->
-
-      <xsl:if test="$f != 0">
-	<xsl:element name="{$prop}" namespace="http://www.w3.org/2006/vcard/ns#">
-	  <xsl:value-of select="."/>
-	</xsl:element>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
+	<xsl:choose>
+		<xsl:when test="$use-camel-case != 0">
+			<!-- translate property name to camel case -->
+			<xsl:variable name="propCC">
+				<xsl:call-template name="camel-case">
+					<xsl:with-param name="name" select="$prop" />
+				</xsl:call-template>
+			</xsl:variable>
+
+			<xsl:if test="$f != 0">
+				<xsl:element name="{$propCC}" namespace="http://www.w3.org/2006/vcard/ns#">
+					<xsl:value-of select="$value" />
+				</xsl:element>
+			</xsl:if>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:if test="$f != 0">
+				<xsl:element name="{$prop}" namespace="http://www.w3.org/2006/vcard/ns#">
+					<xsl:value-of select="$value" />
+				</xsl:element>
+			</xsl:if>
+		</xsl:otherwise>
+	</xsl:choose>
 
   <xsl:apply-templates select="*" mode="extract-field">
     <xsl:with-param name="field" select="$field"/>