diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-12-19 19:34:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-12-19 19:34:19 +0000 |
commit | 87fd9e3b35da02c5a6756842f6e094d0fb95c37f (patch) | |
tree | 7cdb0672dc299605778d8df2115da52ad05e7133 /src/fs/gnunet-publish.c | |
parent | 39e7845fde50aaf8bece5f873901b1b864577149 (diff) | |
download | gnunet-87fd9e3b35da02c5a6756842f6e094d0fb95c37f.tar.gz gnunet-87fd9e3b35da02c5a6756842f6e094d0fb95c37f.zip |
-preserve command-line keywords even if extractor is disabled
Diffstat (limited to 'src/fs/gnunet-publish.c')
-rw-r--r-- | src/fs/gnunet-publish.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 4525affd8..08b34c6d6 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c | |||
@@ -273,6 +273,12 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi, | |||
273 | 273 | ||
274 | if (cls == fi) | 274 | if (cls == fi) |
275 | return GNUNET_OK; | 275 | return GNUNET_OK; |
276 | if ( (disable_extractor) && | ||
277 | (NULL != *uri) ) | ||
278 | { | ||
279 | GNUNET_FS_uri_destroy (*uri); | ||
280 | *uri = NULL; | ||
281 | } | ||
276 | if (NULL != topKeywords) | 282 | if (NULL != topKeywords) |
277 | { | 283 | { |
278 | if (*uri != NULL) | 284 | if (*uri != NULL) |
@@ -296,12 +302,6 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi, | |||
296 | } | 302 | } |
297 | if (!do_disable_creation_time) | 303 | if (!do_disable_creation_time) |
298 | GNUNET_CONTAINER_meta_data_add_publication_date (m); | 304 | GNUNET_CONTAINER_meta_data_add_publication_date (m); |
299 | if ( (disable_extractor) && | ||
300 | (NULL != *uri) ) | ||
301 | { | ||
302 | GNUNET_FS_uri_destroy (*uri); | ||
303 | *uri = NULL; | ||
304 | } | ||
305 | if (extract_only) | 305 | if (extract_only) |
306 | { | 306 | { |
307 | fn = GNUNET_CONTAINER_meta_data_get_by_type (m, | 307 | fn = GNUNET_CONTAINER_meta_data_get_by_type (m, |