metadataControl and demultiplexMutual merged together into metadataControl

diff --git a/helm/on-line/html/cic/control.html b/helm/on-line/html/cic/control.html
index 377aa7db024103c5064070ba0802c7c5bcaf3e8e..8114cbde6aad596f05434aa28332d9fea31a1bd3 100644 (file)
--- a/helm/on-line/html/cic/control.html
+++ b/helm/on-line/html/cic/control.html
@@ -49,13 +49,8 @@ td.back { background-color: #e6e6fa; color: brown }
      var url = unescape(getParam('url'));
      var getterURL = extractParam(url,'param.getterURL');
      var CICURI = extractParam(url,'param.CICURI');
-     if (CICURI.substr(-4,4) == ".ind") {
-      url = setParam(url,"keys","DM%2CRT");
-      url = setParam(url,"xmluri", getterURL + "getxml%3Furi%3D" + CICURI);
-     } else {
-      url = setParam(url,"keys","MC%2CRT");
-      url = setParam(url,"xmluri", getterURL + "resolve%3Furi%3D" + CICURI);
-     }
+     url = setParam(url,"keys","MC%2CRT");
+     url = setParam(url,"xmluri", getterURL + "getxml%3Furi%3D" + CICURI);
      url = setParam(url,"prop.media-type","text/html");
      url = setParam(url,"prop.encoding","iso-8859-1");
      document.write(

diff --git a/helm/on-line/xslt/demultiplexMutual.xsl b/helm/on-line/xslt/demultiplexMutual.xsl
deleted file mode 100644 (file)
index 30beaeb..0000000
--- a/helm/on-line/xslt/demultiplexMutual.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:subst="http://www.cs.unibo.it/helm/subst">
-
-<xsl:output 
-       method="xml"
-       encoding="iso-8859-1" 
-       media-type="text/html"
-       doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-       doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" />
-
-<xsl:include href="metadataLib.xsl"/>
-
-<xsl:variable name="url" select="concat($getterURL,'resolve?uri=helm:rdf:www.cs.unibo.it/helm/rdf/forward//')"/>
-
-<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:apply-templates select="document(concat($url,$RDFURIInductiveType))" mode="makelink">
-   <xsl:with-param name="name" select="@name"/>
-   <xsl:with-param name="CICURI" select="concat($CICURIInductiveType,')')"/>
-   <xsl:with-param name="RDFURI" select="$RDFURIInductiveType"/>
-  </xsl:apply-templates>
-  <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:apply-templates select="document(concat($url,$RDFURIConstructor))" mode="makelink">
-    <xsl:with-param name="name" select="@name"/>
-    <xsl:with-param name="CICURI" select="$CICURIConstructor"/>
-    <xsl:with-param name="RDFURI" select="$RDFURIConstructor"/>
-   </xsl:apply-templates>
-  </xsl:for-each>
- </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>

diff --git a/helm/on-line/xslt/metadataControl.xsl b/helm/on-line/xslt/metadataControl.xsl
index 82646bce7fa408290319e3a2bf2cb0ce6c15a970..4842a0f8babfafeeabcc225b63e2b24735efe0d1 100644 (file)
--- a/helm/on-line/xslt/metadataControl.xsl
+++ b/helm/on-line/xslt/metadataControl.xsl
@@ -13,12 +13,38 @@
 
 <xsl:include href="metadataLib.xsl"/>
 
-<xsl:template match="unresolved|url">
- <xsl:apply-templates mode="makelink" select=".">
-  <xsl:with-param name="name" select="$CICURI"/>
-  <xsl:with-param name="CICURI" select="$CICURI"/>
-  <xsl:with-param name="RDFURI" select="$CICURI"/>
- </xsl:apply-templates>
+<xsl:variable name="url" select="concat($getterURL,'resolve?uri=helm:rdf:www.cs.unibo.it/helm/rdf/forward//')"/>
+
+<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:apply-templates select="document(concat($url,$RDFURIInductiveType))" mode="makelink">
+   <xsl:with-param name="name" select="@name"/>
+   <xsl:with-param name="CICURI" select="concat($CICURIInductiveType,')')"/>
+   <xsl:with-param name="RDFURI" select="$RDFURIInductiveType"/>
+  </xsl:apply-templates>
+  <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:apply-templates select="document(concat($url,$RDFURIConstructor))" mode="makelink">
+    <xsl:with-param name="name" select="@name"/>
+    <xsl:with-param name="CICURI" select="$CICURIConstructor"/>
+    <xsl:with-param name="RDFURI" select="$RDFURIConstructor"/>
+   </xsl:apply-templates>
+  </xsl:for-each>
+ </xsl:for-each>
+</xsl:template>
+
+<!-- Not an Inductive Type -->
+<xsl:template match="*">
+  <xsl:apply-templates select="document(concat($url,$CICURI))" mode="makelink">
+   <xsl:with-param name="name" select="$CICURI"/>
+   <xsl:with-param name="CICURI" select="$CICURI"/>
+   <xsl:with-param name="RDFURI" select="$CICURI"/>
+  </xsl:apply-templates>
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/helm/uwobo-panel/control.html b/helm/uwobo-panel/control.html
index 475df6164acf3ca0f6040a83558f6de1551584a1..52855dd7a498120e305604e53599186df86f4704 100644 (file)
--- a/helm/uwobo-panel/control.html
+++ b/helm/uwobo-panel/control.html
@@ -227,8 +227,7 @@ the getter is used by default (you can deselect it, however):
         <option value="L2H,http://phd.cs.unibo.it/helm/xslt/ls2html.xsl,false">Getter LS ==&gt; HTML</option>
         <option value="GP,http://phd.cs.unibo.it/helm/xslt/getParam.xsl,false">Get Param</option>
         <option value="RT,http://phd.cs.unibo.it/helm/xslt/resolve_topurl.xsl,false">Logic-sheet to substitute the interface URL</option>
-        <option value="DM,http://phd.cs.unibo.it/helm/xslt/demultiplexMutual.xsl,false">Stylesheet to create the link to the metadata for inductive types</option>
-        <option value="MC,http://phd.cs.unibo.it/helm/xslt/metadataControl.xsl,false">Stylesheet to create the link to the metadata for constants and variables</option>
+        <option value="MC,http://phd.cs.unibo.it/helm/xslt/metadataControl.xsl,false">Stylesheet to create links to metadata</option>
         <option value="MGL,http://phd.cs.unibo.it/helm/xslt/makeGraphLinks.xsl,false">Add hyperlink menus to graphs</option>
         <option value="MMG,mk_meta_graph.xsl,true">Make graph of backward dependencies</option>
         <option value="MDG,mk_dep_graph.xsl,true">Make graph of dependencies</option>