From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 7 Mar 2012 19:09:47 +0000 (+0000)
Subject: -disable extractor should also imply not using the filename as a keyword
X-Git-Tag: initial-import-from-subversion-38251~14367
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8aaf1f156eee428287d573f07144b56fd298a81b;p=oweals%2Fgnunet.git

-disable extractor should also imply not using the filename as a keyword
---

diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 5119de4c5..0b6d407ab 100644
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -188,7 +188,7 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing under keyword `%s'\n",
-              keyword);
+              &keyword[1]);
   /* first character of keyword indicates if it is
    * mandatory or not -- ignore for hashing */
   GNUNET_CRYPTO_hash (&keyword[1], strlen (&keyword[1]), &key);
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 50f507d93..84d581384 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -291,6 +291,11 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi,
   }
   if (!do_disable_creation_time)
     GNUNET_CONTAINER_meta_data_add_publication_date (m);
+  if (disable_extractor)
+  {
+    GNUNET_FS_uri_destroy (*uri);
+    *uri = NULL;
+  }
   if (extract_only)
   {
     fn = GNUNET_CONTAINER_meta_data_get_by_type (m,