* the URI passed to the rdfly deamon is now CICURI, except that quoting

  rules are different.

diff --git a/helm/on-line/xslt/metadataControl.xsl b/helm/on-line/xslt/metadataControl.xsl
index 9960ab776b3421bd86630fca5b1cb62d8b0b443b..c893437b3bbc860168435e36bf24853a42ec3904 100644 (file)
--- a/helm/on-line/xslt/metadataControl.xsl
+++ b/helm/on-line/xslt/metadataControl.xsl
@@ -16,21 +16,17 @@
 <xsl:template match="InductiveDefinition">
  <xsl:for-each select="InductiveType">
   <xsl:variable name="CICURIInductiveType" select="concat($CICURI,'#xpointer(1/',position())"/>
-  <xsl:variable name="RDFURIInductiveType" select="concat($CICURI,',',position())"/>
   <h3>Metadata related to <xsl:value-of select="@name"/>:</h3>
   <xsl:call-template name="makelink">
    <xsl:with-param name="name" select="@name"/>
    <xsl:with-param name="CICURI" select="concat($CICURIInductiveType,')')"/>
-   <xsl:with-param name="RDFURI" select="$RDFURIInductiveType"/>
   </xsl:call-template>
   <xsl:for-each select="Constructor">
    <xsl:variable name="CICURIConstructor" select="concat($CICURIInductiveType,'/',position(),')')"/>
-   <xsl:variable name="RDFURIConstructor" select="concat($RDFURIInductiveType,',',position())"/>
    <h3>Metadata related to <xsl:value-of select="@name"/>:</h3>
    <xsl:call-template name="makelink">
     <xsl:with-param name="name" select="@name"/>
     <xsl:with-param name="CICURI" select="$CICURIConstructor"/>
-    <xsl:with-param name="RDFURI" select="$RDFURIConstructor"/>
    </xsl:call-template>
   </xsl:for-each>
  </xsl:for-each>
@@ -41,7 +37,6 @@
   <xsl:call-template name="makelink">
    <xsl:with-param name="name" select="$CICURI"/>
    <xsl:with-param name="CICURI" select="$CICURI"/>
-   <xsl:with-param name="RDFURI" select="$CICURI"/>
   </xsl:call-template>
 </xsl:template>
 

diff --git a/helm/on-line/xslt/metadataLib.xsl b/helm/on-line/xslt/metadataLib.xsl
index 9f5c0020c0481ccb92c21cd6184d4312ab6463a2..bb7346196c67c95a6808253094f036feac2edd75 100644 (file)
--- a/helm/on-line/xslt/metadataLib.xsl
+++ b/helm/on-line/xslt/metadataLib.xsl
@@ -6,6 +6,7 @@
 
 <xsl:import href="utils.xsl"/>
 <xsl:import href="show_dc.xsl"/>
+<xsl:import href="links_library.xsl"/>
 
 <xsl:param name="CICURI" select="''"/>
 <xsl:param name="getterURL" select="''"/>
@@ -54,15 +55,19 @@
 <xsl:template name="makelink">
  <xsl:param name="name" select="''"/>
  <xsl:param name="CICURI" select="''"/>
- <xsl:param name="RDFURI" select="''"/>
  <xsl:variable name="quotedCICURI">
   <xsl:call-template name="jsquote">
    <xsl:with-param name="s" select="$CICURI"/>
    <xsl:with-param name="times" select="2"/>
   </xsl:call-template>
  </xsl:variable>
+ <xsl:variable name="quotedCICURIforURL">
+  <xsl:call-template name="quote">
+   <xsl:with-param name="s" select="$CICURI"/>
+  </xsl:call-template>
+ </xsl:variable>
  <xsl:choose>
-  <xsl:when test="document(concat($BaseRDFURLBackward,$RDFURI))/*/*/*">
+  <xsl:when test="document(concat($BaseRDFURLBackward,$quotedCICURIforURL))/*/*/*">
    <p>
     <script>
      var CICURI = "<xsl:value-of select="$CICURI"/>";
@@ -87,7 +92,7 @@
  </xsl:choose>
 
  <xsl:choose>
-  <xsl:when test="document(concat($BaseRDFURLForward,$RDFURI))/*/*/*">
+  <xsl:when test="document(concat($BaseRDFURLForward,$quotedCICURIforURL))/*/*/*">
    <p>
     <!-- CSC: Cut & Paster from above ==> create a single javascript function -->
     <script>