[gnunet-scheme] 17/324: Fix libextractor imports

[gnunet]

This is an automated email from the git hooks/post-receive script.

maxime-devos pushed a commit to branch master
in repository gnunet-scheme.

commit 61ab8a9e5d3ec297770731bc951b922d567e34de
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Sun Nov 8 22:06:51 2020 +0000

    Fix libextractor imports
---
 gnu/gnunet/metadata.scm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gnu/gnunet/metadata.scm b/gnu/gnunet/metadata.scm
index 94a0365..d8504d3 100644
--- a/gnu/gnunet/metadata.scm
+++ b/gnu/gnunet/metadata.scm
@@ -45,7 +45,12 @@
          (only (gnu extractor metaformats)
                METAFORMAT_UTF8
                METAFORMAT_C_STRING
-               METAFORMAT_BINARY)
+               METAFORMAT_BINARY
+               meta-format?
+               integer->meta-format)
+         (only (gnu extractor metatypes)
+               integer->meta-type
+               meta-type?)
          (only (gnu gnunet utils decompress) decompress)
          (only (gnu gnunet utils hat-let) let^)
          (only (srfi srfi-31) rec)
@@ -159,8 +164,8 @@ meta data) name of extracting plugin
 @var{data} actual meta-data found (bytevector)"
     (assert (meta-data? meta))
     (assert (string? plugin-name)) ;; TODO perhaps check for \0 bytes
-    (assert (extractor:metatype type))
-    (assert (extractor:metaformat format))
+    (assert (meta-type? type))
+    (assert (meta-format? format))
     (assert (or (not data-mime-type) (string? data-mime-type)))
     (assert (bytevector? data))
     ;; Figure out where to insert or set the meta data.
@@ -191,9 +196,9 @@ meta data) name of extracting plugin
                                         data-mime-type))
                      (old-format (meta-item-format item))
                      (new-format
-                      (if (and (equal? old-format extractor:C_STRING)
-                               (equal? format extractor:UTF8))
-                          extractor:UTF8
+                      (if (and (equal? old-format METAFORMAT_C_STRING)
+                               (equal? format METAFORMAT_UTF8))
+                          METAFORMAT_UTF8
                           old-format))
                      (new-item (%make-meta-item new-mime-type
                                                 (meta-item-data item)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.