03/04: Revert "graph: Provide access to the package record in the emit functions."

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 5e60bef9802e448924f889d34d95a249b008652c
Author: Ludovic Courtès <address@hidden>
Date:   Thu Aug 24 15:53:57 2017 +0200

    Revert "graph: Provide access to the package record in the emit functions."
    
    This reverts commit 5d7e8543659874682b618bba799ba7cd6ffce554, which
    broke 'tests/graph.scm' and broke node types not related to <package>
    objects, such as '%reference-node-type'.
---
 guix/graph.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/guix/graph.scm b/guix/graph.scm
index 5b650f5..d7fd5f3 100644
--- a/guix/graph.scm
+++ b/guix/graph.scm
@@ -1,7 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2017 Roel Janssen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,7 +22,6 @@
   #:use-module (guix monads)
   #:use-module (guix records)
   #:use-module (guix sets)
-  #:use-module (guix packages)
   #:use-module (rnrs io ports)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
@@ -172,9 +170,9 @@ typically returned by 'node-edges' or 'node-back-edges'."
           name))
 (define (emit-epilogue port)
   (display "\n}\n" port))
-(define (emit-node id node port)
+(define (emit-node id label port)
   (format port "  \"~a\" [label = \"~a\", shape = box, fontname = 
Helvetica];~%"
-          id (package-full-name node)))
+          id label))
 (define (emit-edge id1 id2 port)
   (format port "  \"~a\" -> \"~a\" [color = ~a];~%"
           id1 id2 (pop-color id1)))
@@ -215,11 +213,11 @@ var nodes = {},
   (format port "</script><script type=\"text/javascript\" 
src=\"~a\"></script></body></html>"
           (search-path %load-path "graph.js")))
 
-(define (emit-d3js-node id node port)
+(define (emit-d3js-node id label port)
   (format port "\
 nodes[\"~a\"] = {\"id\": \"~a\", \"label\": \"~a\", \"index\": 
nodeArray.length};
 nodeArray.push(nodes[\"~a\"]);~%"
-          id id (package-full-name node) id))
+          id id label id))
 
 (define (emit-d3js-edge id1 id2 port)
   (format port "links.push({\"source\": \"~a\", \"target\": \"~a\"});~%"
@@ -243,9 +241,9 @@ nodeArray.push(nodes[\"~a\"]);~%"
 (define (emit-cypher-epilogue port)
   (format port ""))
 
-(define (emit-cypher-node id node port)
+(define (emit-cypher-node id label port)
   (format port "MERGE (p:Package { id: ~s }) SET p.name = ~s;~%"
-          id (package-name node)))
+          id label ))
 
 (define (emit-cypher-edge id1 id2 port)
   (format port "MERGE (a:Package { id: ~s });~%" id1)
@@ -298,7 +296,7 @@ true, draw reverse arrows."
                                         (ids          (mapm %store-monad
                                                             node-identifier
                                                             dependencies)))
-                     (emit-node id head port)
+                     (emit-node id (node-label head) port)
                      (for-each (lambda (dependency dependency-id)
                                  (if reverse-edges?
                                      (emit-edge dependency-id id port)