[GNUnet-SVN] r20353 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-03-07 20:09:47 +0100 (Wed, 07 Mar 2012)
New Revision: 20353

Modified:
   gnunet/src/fs/fs_publish_ksk.c
   gnunet/src/fs/gnunet-publish.c
Log:
-disable extractor should also imply not using the filename as a keyword

Modified: gnunet/src/fs/fs_publish_ksk.c
===================================================================
--- gnunet/src/fs/fs_publish_ksk.c      2012-03-07 18:38:49 UTC (rev 20352)
+++ gnunet/src/fs/fs_publish_ksk.c      2012-03-07 19:09:47 UTC (rev 20353)
@@ -188,7 +188,7 @@
   }
   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);

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2012-03-07 18:38:49 UTC (rev 20352)
+++ gnunet/src/fs/gnunet-publish.c      2012-03-07 19:09:47 UTC (rev 20353)
@@ -291,6 +291,11 @@
   }
   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,