New graph implementation: the visit is no more pruned on a level base, but

when the number of the nodes in the graph exceeds a fixed limit.

diff --git a/helm/style/mk_dep_graph.xsl b/helm/style/mk_dep_graph.xsl
index b6c6041c94283a0a5334752da21b8539e4972414..739bd279bba6f11bdde265436b095601850bbc5f 100644 (file)
--- a/helm/style/mk_dep_graph.xsl
+++ b/helm/style/mk_dep_graph.xsl
@@ -38,9 +38,11 @@
 <xsl:param name="CICURI" select="''"/>
 <xsl:param name="PID" select="''"/>
 <xsl:param name="getterURL" select="''"/>
+<xsl:param name="uri_set_queueURL" select="'http://localhost:8084/'"/>
+<xsl:param name="uri_set_size" select="30"/>
 <xsl:variable name="base_URL_of_CIC_URI" select="concat($getterURL,'getxml?uri=')"/>
 
-<!-- CSC: next function because I don't remember the name of the    -->
+<!-- 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 -->
 <xsl:template name="quote">
  <xsl:param name="s" select="''"/>
@@ -115,9 +117,10 @@
  -->
  <xsl:text>strict digraph L0 { size = "83,83"; node [style=filled, shape = box];&CSCbr;</xsl:text>
  <!-- The nonce is used to force the document reload -->
- <xsl:variable name="dummy1" select="document(concat('http://phd.cs.unibo.it:8084/add_if_not_in?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
- <xsl:apply-templates mode="loop" select="document(concat('http://phd.cs.unibo.it:8084/get_next?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
- <xsl:variable name="dummy2" select="document(concat('http://phd.cs.unibo.it:8084/reset_to_empty?PID=',$PID))"/>
+ <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="dummy2" select="document(concat($uri_set_queueURL,'reset_to_empty?PID=',$PID))"/>
  <xsl:text>}</xsl:text>
 </xsl:template>
 
@@ -134,13 +137,19 @@
   <xsl:with-param name="do_not_visit" select="name(.)"/>
  </xsl:apply-templates>
  <!-- The couple (uri,nonce) is used to force the document reload -->
- <xsl:apply-templates mode="loop" select="document(concat('http://phd.cs.unibo.it:8084/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=',@value,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
 </xsl:template>
 
 <xsl:template mode="first_time" match="*">
  <xsl:param name="currentCICURI" select="''"/>
  <xsl:param name="quotedCurrentCICURI" select="''"/>
  <xsl:param name="do_not_visit" select="'uri'"/>
+ <xsl:if test="$do_not_visit='uri'">
+  <xsl:apply-templates select=".">
+   <xsl:with-param name="currentCICURI" select="$currentCICURI"/>
+   <xsl:with-param name="quotedCurrentCICURI" select="$quotedCurrentCICURI"/>
+  </xsl:apply-templates>
+ </xsl:if>
  <xsl:text> </xsl:text>
  <xsl:value-of select="$quotedCurrentCICURI"/>
 <!-- <xsl:text> [fontname="LucidaSansRegular",color=red,label="</xsl:text> -->
@@ -149,16 +158,10 @@
  <xsl:text>",URL="</xsl:text>
  <xsl:value-of select="$currentCICURI"/>
  <xsl:text>"</xsl:text>
- <xsl:if test="$do_not_visit='marked_uri'">
+ <xsl:if test="name(document(concat($uri_set_queueURL,'is_overflowed?uri=',$quotedCurrentCICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))/*)='true'">
   <xsl:text>,color=red</xsl:text>
  </xsl:if>
  <xsl:text>];&CSCbr;</xsl:text>
- <xsl:if test="$do_not_visit='uri'">
-  <xsl:apply-templates select=".">
-   <xsl:with-param name="currentCICURI" select="$currentCICURI"/>
-   <xsl:with-param name="quotedCurrentCICURI" select="$quotedCurrentCICURI"/>
-  </xsl:apply-templates>
- </xsl:if>
 </xsl:template>
 
 <!-- CSC: uriType missing!!! -->
@@ -171,13 +174,14 @@
     <xsl:with-param name="s" select="@uri"/>
    </xsl:call-template>
   </xsl:variable>
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="$quotedCurrentCICURI"/>
-  <xsl:text> -&gt; </xsl:text>
-  <xsl:value-of select="$quotedURI"/>
-  <xsl:text>;&CSCbr;</xsl:text>
-  <!-- The nonce is used to force the document reload -->
-  <xsl:variable name="dummy" select="document(concat('http://phd.cs.unibo.it:8084/add_if_not_in?uri=',@uri,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
+  <!-- The nonce, quotedCurrentCICURI are used to force the document reload -->
+  <xsl:if test="not(name(document(concat($uri_set_queueURL,'add_if_not_in?uri=',@uri,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;quotedCurrentCICURI=',$quotedCurrentCICURI))/*)='not_added_because_already_too_many')">
+   <xsl:text> </xsl:text>
+   <xsl:value-of select="$quotedCurrentCICURI"/>
+   <xsl:text> -&gt; </xsl:text>
+   <xsl:value-of select="$quotedURI"/>
+   <xsl:text>;&CSCbr;</xsl:text>
+  </xsl:if>
  </xsl:if>
  <xsl:apply-templates>
   <xsl:with-param name="currentCICURI" select="$currentCICURI"/>

diff --git a/helm/style/mk_meta_graph.xsl b/helm/style/mk_meta_graph.xsl
index e19e8daa22f0ab0785c4c7cfcbfd3b74d4f2986b..0f6acba1dcbafcfa768d70529d21b8d36e48a8c3 100644 (file)
--- a/helm/style/mk_meta_graph.xsl
+++ b/helm/style/mk_meta_graph.xsl
@@ -38,10 +38,14 @@
 <xsl:param name="CICURI" select="''"/>
 <xsl:param name="PID" select="''"/>
 <xsl:param name="getterURL" select="''"/>
+<xsl:param name="uri_set_queueURL" select="'http://localhost:8084/'"/>
+<xsl:param name="uri_set_size" select="30"/>
 <xsl:variable name="RDF_base_URL_of_CIC_URI" select="concat($getterURL,'getxml?uri=helm:rdf:www.cs.unibo.it/helm/rdf/rdfprova//')"/>
 
-<!-- CSC: next function because I don't remember the name of the    -->
+<!-- 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 -->
+
+<!-- The next function is used to quote URIs for dotty -->
 <xsl:template name="quote">
  <xsl:param name="s" select="''"/>
  <xsl:param name="news" select="''"/>
@@ -109,15 +113,47 @@
  </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 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="dummy1" select="document(concat('http://phd.cs.unibo.it:8084/add_if_not_in?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
- <xsl:apply-templates mode="loop" select="document(concat('http://phd.cs.unibo.it:8084/get_next?uri=',$CICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
- <xsl:variable name="dummy2" select="document(concat('http://phd.cs.unibo.it:8084/reset_to_empty?PID=',$PID))"/>
+ <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=',$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>
 
@@ -149,8 +185,13 @@
    </xsl:apply-templates>
   </xsl:otherwise>
  </xsl:choose>
+ <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('http://phd.cs.unibo.it:8084/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>
 
 
@@ -158,6 +199,12 @@
  <xsl:param name="currentCICURI" select="''"/>
  <xsl:param name="quotedCurrentCICURI" select="''"/>
  <xsl:param name="do_not_visit" select="'uri'"/>
+ <xsl:if test="$do_not_visit='uri'">
+  <xsl:apply-templates select=".">
+   <xsl:with-param name="currentCICURI" select="$currentCICURI"/>
+   <xsl:with-param name="quotedCurrentCICURI" select="$quotedCurrentCICURI"/>
+  </xsl:apply-templates>
+ </xsl:if>
  <xsl:text> </xsl:text>
  <xsl:value-of select="$quotedCurrentCICURI"/>
 <!-- <xsl:text> [fontname="LucidaSansRegular",color=red,label="</xsl:text> -->
@@ -166,16 +213,10 @@
  <xsl:text>",URL="</xsl:text>
  <xsl:value-of select="$currentCICURI"/>
  <xsl:text>"</xsl:text>
- <xsl:if test="$do_not_visit='marked_uri'">
+ <xsl:if test="name(document(concat($uri_set_queueURL,'is_overflowed?uri=',$quotedCurrentCICURI,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))/*)='true'">
   <xsl:text>,color=red</xsl:text>
  </xsl:if>
  <xsl:text>];&CSCbr;</xsl:text>
- <xsl:if test="$do_not_visit='uri'">
-  <xsl:apply-templates select=".">
-   <xsl:with-param name="currentCICURI" select="$currentCICURI"/>
-   <xsl:with-param name="quotedCurrentCICURI" select="$quotedCurrentCICURI"/>
-  </xsl:apply-templates>
- </xsl:if>
 </xsl:template>
 
 <xsl:template match="occurs">
@@ -187,13 +228,19 @@
     <xsl:with-param name="s" select="@uri"/>
    </xsl:call-template>
   </xsl:variable>
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="$quotedCurrentCICURI"/>
-  <xsl:text> -&gt; </xsl:text>
-  <xsl:value-of select="$quotedURI"/>
-  <xsl:text>;&CSCbr;</xsl:text>
-  <!-- The nonce is used to force the document reload -->
-  <xsl:variable name="dummy" select="document(concat('http://phd.cs.unibo.it:8084/add_if_not_in?uri=',@uri,'&amp;nonce=',generate-id(),'&amp;PID=',$PID))"/>
+ <xsl:variable name="quoted_uri">
+  <xsl:call-template name="quote_url">
+   <xsl:with-param name="s" select="@uri"/>
+  </xsl:call-template>
+ </xsl:variable>
+  <!-- The nonce, quotedCurrentCICURI are used to force the document reload -->
+  <xsl:if test="not(name(document(concat($uri_set_queueURL,'add_if_not_in?uri=',$quoted_uri,'&amp;nonce=',generate-id(),'&amp;PID=',$PID,'&amp;quotedCurrentCICURI=',$quotedCurrentCICURI))/*)='not_added_because_already_too_many')">
+   <xsl:text> </xsl:text>
+   <xsl:value-of select="$quotedCurrentCICURI"/>
+   <xsl:text> -&gt; </xsl:text>
+   <xsl:value-of select="$quotedURI"/>
+   <xsl:text>;&CSCbr;</xsl:text>
+  </xsl:if>
  </xsl:for-each>
 </xsl:template>