Changeset 580 for MDService2/trunk/MDService2/src/xsl

Timestamp:

07/11/10 17:41:41 (14 years ago)

Author:

vronk

Message:

rework Component resolution in XSL:
redirect Comp-requests via MDService (to enable caching)

Location:

MDService2/trunk/MDService2/src/xsl

Files:

• XCQL2Xpath.xsl (modified) (1 diff)
• cmd_commons.xsl (modified) (1 diff)
• comp2view.xsl (modified) (3 diffs)
• params.xsl (modified) (1 diff)

MDService2/trunk/MDService2/src/xsl/XCQL2Xpath.xsl

@@ -42 +42 @@
 <xsl:output method="text" />
 
-
+        
 <xsl:template match="triple">
 <!--  this is rather hacky yet

MDService2/trunk/MDService2/src/xsl/cmd_commons.xsl

@@ -74 +74 @@
 
                 <!-- <xsl:variable name="resolved_fn" select="if (matches(@filename, $prefix)) then replace(@filename, $prefix, $prefix_replace) else if (document-uri(/)) then @filename else concat( $root_uri, '/', @filename)" /> -->
-                <xsl:variable name="resolved_fn" select="concat($components_uri, @ComponentId)" /> 
+                <!--  <xsl:variable name="resolved_fn" select="concat($components_uri, @ComponentId)" />  -->
+                <xsl:variable name="resolved_fn" select="concat($components_uri, my:extractID(@ComponentId))" />   
             <xsl:variable name="compid" select="@ComponentId" /> 
                 

MDService2/trunk/MDService2/src/xsl/comp2view.xsl

@@ -14 +14 @@
     <xsl:include href="cmd_commons.xsl"/>
 
-    <xsl:output method="html" encoding="UTF-8" indent="yes"/>
+    <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
                 
         <xsl:param name="title" 
@@ -87 +87 @@
                                         </xsl:if>               
                                 </span>
-                                <xsl:if test="@CardinalityMax &gt; 1" >
+                                <xsl:if test="number(@CardinalityMax) &gt; 1 or @CardinalityMax='unbounded'" >
                                         <span class="cmd cmd_add"><xsl:text> </xsl:text></span>                 
                                 </xsl:if>       
@@ -113 +113 @@
                 </span><br/>            
                   <input type="text" id="q_{@name}" value="" size="50" name="q_{@name}" /> 
-                <xsl:if test="@CardinalityMax &gt; 1" >
+                <xsl:if test="number(@CardinalityMax) &gt; 1 or @CardinalityMax='unbounded'" >
                         <span class="cmd cmd_add"><xsl:text> </xsl:text></span>                 
                 </xsl:if>               

MDService2/trunk/MDService2/src/xsl/params.xsl

@@ -12 +12 @@
                 
         <!--  for resolving components by suffixing with @ComponentId -->
-        <xsl:param name="components_uri" select="'http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/'" />          
+        <!-- <xsl:param name="components_uri" select="'http://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/components/'" /> -->
+        <!--  redirecting the resolution via MDService, to be able to make use of the cache
+                the absolute-URL is not nice, however I wasn't able to tell XSL how to resolve a relative url 
+        -->     
+        <xsl:param name="components_uri" select="'http://localhost:8080/MDService2/comp/xml/'" />               
         <xsl:param name="components_id_prefix" select="'clarin.eu:cr1:'" />
         
         <xsl:param name="detail_comp_prefix"  select="'comp/htmldetail/'"/> 
         <xsl:param name="detail_profile_prefix"  select="'compprofile/htmldetail/'"/> 
-        <xsl:param name="detail_complist_prefix"  select="if(contains(name(/*),'profile')) then $detail_profile_prefix else $detail_comp_prefix"/> <!-- table|list -->
+        <xsl:param name="detail_complist_prefix"  select="if(contains(name(/*),'profile')) then $detail_profile_prefix else $detail_comp_prefix"/>
         
         <xsl:param name="detail_model_prefix"  select="'?q='"/>