Eliminate obsolete RDF index.

diff --git a/v7/src/xml/rdf-struct.scm b/v7/src/xml/rdf-struct.scm
index fcf68c07749ef77ace0f14bd1a712fa0c0de3655..a89d9b4a321242955c1f1af6fc88bd111ea09486 100644 (file)
--- a/v7/src/xml/rdf-struct.scm
+++ b/v7/src/xml/rdf-struct.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: rdf-struct.scm,v 1.28 2007/08/01 00:13:35 cph Exp $
+$Id: rdf-struct.scm,v 1.29 2007/08/01 00:15:42 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -159,37 +159,6 @@ USA.
   (and (string=? (rdf-literal-text l1) (rdf-literal-text l2))
        (eq? (%rdf-literal-type l1) (%rdf-literal-type l2))))
 \f
-;;;; Triples index (deprecated)
-
-(define-record-type <rdf-index>
-    (%make-rdf-index subjects predicates objects)
-    rdf-index?
-  (subjects rdf-index-subjects)
-  (predicates rdf-index-predicates)
-  (objects rdf-index-objects))
-
-(define-guarantee rdf-index "RDF index")
-
-(define (make-rdf-index)
-  (%make-rdf-index (make-eq-hash-table)
-                  (make-eq-hash-table)
-                  (make-eq-hash-table)))
-
-(define (add-to-rdf-index triple index)
-  (let ((add
-        (lambda (key index)
-          (hash-table/put! index
-                           key
-                           (cons triple
-                                 (hash-table/get index
-                                                 key
-                                                 '()))))))
-    (add (rdf-triple-subject triple) (rdf-index-subjects index))
-    (add (rdf-triple-predicate triple) (rdf-index-predicates index))
-    (let ((o (rdf-triple-object triple)))
-      (if (not (rdf-literal? o))
-         (add o (rdf-index-objects index))))))
-\f
 ;;;; Qnames
 
 (define (register-rdf-prefix prefix expansion #!optional registry)

diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index ea5e0cdc520da9e3620dbd1a3105cb43d5c145d1..1503d267eefb6e52edd6d2d40e0e0250432a9f86 100644 (file)
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml.pkg,v 1.94 2007/08/01 00:13:37 cph Exp $
+$Id: xml.pkg,v 1.95 2007/08/01 00:15:44 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -536,32 +536,27 @@ USA.
   (export ()
          *default-rdf-prefix-registry*
          <rdf-bnode>
-         <rdf-index>
          <rdf-literal>
          <rdf-prefix-registry>
          <rdf-triple>
-         add-to-rdf-index
          canonicalize-rdf-object
          canonicalize-rdf-predicate
          canonicalize-rdf-subject
          canonicalize-rdf-uri
          copy-rdf-prefix-registry
          error:not-rdf-bnode
-         error:not-rdf-index
          error:not-rdf-literal
          error:not-rdf-prefix
          error:not-rdf-prefix-registry
          error:not-rdf-qname
          error:not-rdf-triple
          guarantee-rdf-bnode
-         guarantee-rdf-index
          guarantee-rdf-literal
          guarantee-rdf-prefix
          guarantee-rdf-prefix-registry
          guarantee-rdf-qname
          guarantee-rdf-triple
          make-rdf-bnode
-         make-rdf-index
          make-rdf-literal
          make-rdf-qname
          make-rdf-triple
@@ -571,10 +566,6 @@ USA.
          port/set-rdf-prefix-registry
          rdf-bnode-name
          rdf-bnode?
-         rdf-index-objects
-         rdf-index-predicates
-         rdf-index-subjects
-         rdf-index?
          rdf-literal-language
          rdf-literal-text
          rdf-literal-type