Bug removed/Feature changed: CIC URIs for inductive data types

and constructors ending with an #xpointer are now handled
(more) correctly.

diff --git a/helm/graphs/tools/draw_graph.cgi b/helm/graphs/tools/draw_graph.cgi
index 7a11ab50056d0664477fe6d8ccf00fe5cf5e160e..d5d5b4a82ac0d25efde06a224e46d518b02ca25f 100755 (executable)
--- a/helm/graphs/tools/draw_graph.cgi
+++ b/helm/graphs/tools/draw_graph.cgi
@@ -22,7 +22,7 @@ while (my $c = $d->accept) {
             my $http_query = $r->url->equery;
             my $cgi = new CGI("$http_query");
             my $url = $cgi->param('url');
-           $url = uri_unescape($url).'&param.PID='.$$;
+           $url = $url.'&param.PID='.$$;
            print "URL: $url\n";
 
             my $ua = LWP::UserAgent->new;

diff --git a/helm/style/mk_dep_graph.xsl b/helm/style/mk_dep_graph.xsl
index dee91b3c1bdf6d5cc1d038d70d89ae0cdb33b5b7..86933883c9e1cc532190f9fc148a5418b4cc2028 100644 (file)
--- a/helm/style/mk_dep_graph.xsl
+++ b/helm/style/mk_dep_graph.xsl
@@ -40,7 +40,7 @@
 <xsl:param name="getterURL" select="''"/>
 <xsl:param name="uri_set_queueURL" select="''"/>
 <xsl:param name="uri_set_size" select="30"/>
-<xsl:variable name="base_URL_of_CIC_URI" select="concat($getterURL,'getxml?uri=')"/>
+<xsl:variable name="base_URL_of_URI" select="concat($getterURL,'getxml?uri=')"/>
 
 <!-- CSC: next functions because I don't remember the name of the    -->
 <!-- CSC: subst function of xslt and I don't have the specs with me -->
@@ -111,15 +111,59 @@
  </xsl:choose>
 </xsl:template>
 
+<!-- The next function is used to quote URIs to embed them in an URL -->
+<xsl:template name="quote_url">
+ <xsl:param name="s" select="''"/>
+ <xsl:param name="news" select="''"/>
+ <xsl:choose>
+  <xsl:when test="$s = ''"><xsl:value-of select="$news"/></xsl:when>
+  <xsl:otherwise>
+   <xsl:variable name="char" select="substring($s,1,1)"/>
+   <xsl:choose>
+    <xsl:when test="$char = '#'">
+     <xsl:call-template name="quote_url">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,'%23')"/>
+     </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:call-template name="quote_url">
+      <xsl:with-param name="s" select="substring($s,2)"/>
+      <xsl:with-param name="news" select="concat($news,$char)"/>
+     </xsl:call-template>
+    </xsl:otherwise>
+   </xsl:choose>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="removeXPointer">
+ <xsl:param name="uri" select="''"/>
+ <xsl:variable name="before" select="substring-before($uri,'#xpointer')"/>
+ <xsl:choose>
+  <xsl:when test="$before=''">
+   <xsl:value-of select="$uri"/>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:value-of select="$before"/>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
 <xsl:template match="/">
  <!--
  <xsl:text>strict digraph L0 { size = "83,83"; concentrate=true; node [style=filled, shape = box];&CSCbr;</xsl:text>
  -->
  <xsl:text>strict digraph L0 { size = "83,83"; node [style=filled, shape = box];&CSCbr;</xsl:text>
+ <xsl:variable name="quoted_CICURI">
+  <xsl:call-template name="quote_url">
+   <xsl:with-param name="s" select="$CICURI"/>
+  </xsl:call-template>
+ </xsl:variable>
  <!-- The nonce is used to force the document reload -->
- <xsl:variable name="dummy0" select="document(concat($uri_set_queueURL,'set_uri_set_size?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;size=',$uri_set_size))"/>
- <xsl:variable name="dummy1" select="document(concat($uri_set_queueURL,'add_if_not_in?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
- <xsl:apply-templates mode="loop" select="document(concat($uri_set_queueURL,'get_next?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
+ <xsl:variable name="dummy0" select="document(concat($uri_set_queueURL,'set_uri_set_size?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;size=',$uri_set_size))"/>
+ <xsl:variable name="dummy1" select="document(concat($uri_set_queueURL,'add_if_not_in?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
+ <xsl:apply-templates mode="loop" select="document(concat($uri_set_queueURL,'get_next?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
  <xsl:variable name="dummy2" select="document(concat($uri_set_queueURL,'reset_to_empty?PID=',$PID))"/>
  <xsl:text>}</xsl:text>
 </xsl:template>
@@ -127,7 +171,12 @@
 <xsl:template mode="loop" match="empty"/>
 
 <xsl:template mode="loop" match="uri|marked_uri">
- <xsl:apply-templates mode="first_time" select="document(concat($base_URL_of_CIC_URI,@value))/*">
+ <xsl:variable name="rawuri">
+  <xsl:call-template name="removeXPointer">
+   <xsl:with-param name="uri" select="@value"/>
+  </xsl:call-template>
+ </xsl:variable>
+ <xsl:apply-templates mode="first_time" select="document(concat($base_URL_of_URI,$rawuri))/*">
   <xsl:with-param name="currentCICURI" select="@value"/>
   <xsl:with-param name="quotedCurrentCICURI">
    <xsl:call-template name="quote">
@@ -136,8 +185,13 @@
   </xsl:with-param>
   <xsl:with-param name="do_not_visit" select="name(.)"/>
  </xsl:apply-templates>
+ <xsl:variable name="quoted_value">
+  <xsl:call-template name="quote_url">
+   <xsl:with-param name="s" select="@value"/>
+  </xsl:call-template>
+ </xsl:variable>
  <!-- The couple (uri,nonce) is used to force the document reload -->
- <xsl:apply-templates mode="loop" select="document(concat($uri_set_queueURL,'get_next?uri=',@value,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
+ <xsl:apply-templates mode="loop" select="document(concat($uri_set_queueURL,'get_next?uri=',$quoted_value,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
 </xsl:template>
 
 <xsl:template mode="first_time" match="*">

diff --git a/helm/style/mk_meta_graph.xsl b/helm/style/mk_meta_graph.xsl
index 243aedc44d788658343819e27c38bce2c2f8a43f..f9d6faa2334f2a6f5b6ad5ad03d88dfc964954d5 100644 (file)
--- a/helm/style/mk_meta_graph.xsl
+++ b/helm/style/mk_meta_graph.xsl
@@ -167,7 +167,7 @@
   </xsl:call-template>
  </xsl:variable>
  <!-- The nonce is used to force the document reload -->
- <xsl:variable name="dummy0" select="document(concat($uri_set_queueURL,'set_uri_set_size?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;size=',$uri_set_size))"/>
+ <xsl:variable name="dummy0" select="document(concat($uri_set_queueURL,'set_uri_set_size?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;size=',$uri_set_size))"/>
  <xsl:variable name="dummy1" select="document(concat($uri_set_queueURL,'add_if_not_in?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
  <xsl:apply-templates mode="loop" select="document(concat($uri_set_queueURL,'get_next?uri=',$quoted_CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
  <xsl:variable name="dummy2" select="document(concat($uri_set_queueURL,'reset_to_empty?PID=',$PID))"/>