From: Christian Grothoff Date: Wed, 16 Jun 2010 12:25:39 +0000 (+0000) Subject: pass do_index X-Git-Tag: initial-import-from-subversion-38251~21368 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b54183facf116a32aaa2b7b960a251f6ddc10fa5;p=oweals%2Fgnunet.git pass do_index --- diff --git a/TODO b/TODO index 807a7c602..3f016c50f 100644 --- a/TODO +++ b/TODO @@ -23,7 +23,6 @@ [On W32, we need to select after calling socket before doing connect etc.] * GNUNET-GTK: - implement publish dialog - + add (single file) + edit (meta data add, meta data del, meta data type population, keyword add (button, activate entry line), keyword remove, anonymity level, priority, index/insert, normalize keywords, previews, preview widget for file chooser!?) diff --git a/src/fs/fs.c b/src/fs/fs.c index 9797becad..ece6350ca 100644 --- a/src/fs/fs.c +++ b/src/fs/fs.c @@ -1334,6 +1334,7 @@ find_file_position (struct GNUNET_FS_FileInformation *pos, * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index? * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue (always) @@ -1346,6 +1347,7 @@ fip_signal_resume(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index 367061cae..2e9b7b667 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c @@ -732,7 +732,9 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir, void *proc_cls) { struct GNUNET_FS_FileInformation *pos; + int no; + no = GNUNET_NO; if (GNUNET_OK != proc (proc_cls, dir, @@ -741,6 +743,7 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir, &dir->keywords, &dir->anonymity, &dir->priority, + (dir->is_directory) ? &no : &dir->data.file.do_index, &dir->expirationTime, &dir->client_info)) return; @@ -749,6 +752,7 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir, pos = dir->data.dir.entries; while (pos != NULL) { + no = GNUNET_NO; if (GNUNET_OK != proc (proc_cls, pos, @@ -757,6 +761,7 @@ GNUNET_FS_file_information_inspect (struct GNUNET_FS_FileInformation *dir, &pos->keywords, &pos->anonymity, &pos->priority, + (dir->is_directory) ? &no : &dir->data.file.do_index, &pos->expirationTime, &pos->client_info)) break; @@ -781,7 +786,9 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi, void *cleaner_cls) { struct GNUNET_FS_FileInformation *pos; + int no; + no = GNUNET_NO; if (fi->is_directory) { /* clean up directory */ @@ -799,6 +806,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi, &fi->keywords, &fi->anonymity, &fi->priority, + &no, &fi->expirationTime, &fi->client_info); GNUNET_free_non_null (fi->data.dir.dir_data); @@ -818,6 +826,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi, &fi->keywords, &fi->anonymity, &fi->priority, + &fi->data.file.do_index, &fi->expirationTime, &fi->client_info); } diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 4d93579bd..a7aa695f3 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -940,6 +940,7 @@ GNUNET_FS_publish_main_ (void *cls, * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index? * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue (always) @@ -952,6 +953,7 @@ fip_signal_start(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { @@ -976,6 +978,7 @@ fip_signal_start(void *cls, * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index? * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue (always) @@ -988,6 +991,7 @@ fip_signal_suspend(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { @@ -1112,6 +1116,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index? * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue (always) @@ -1124,6 +1129,7 @@ fip_signal_stop(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 519f3e35c..3dee82333 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c @@ -227,6 +227,7 @@ meta_printer (void *cls, * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index? * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue, GNUNET_NO to remove @@ -241,6 +242,7 @@ publish_inspector (void *cls, struct GNUNET_FS_Uri **uri, unsigned int *anonymity, unsigned int *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index 2d66d5185..2574db7dc 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -57,6 +57,7 @@ mycleaner(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info) { diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index a200406d5..c5db0a7fc 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h @@ -1600,6 +1600,7 @@ GNUNET_FS_meta_data_extract_from_file (struct * @param uri pointer to the keywords that will be used for this entry (can be modified) * @param anonymity pointer to selected anonymity level (can be modified) * @param priority pointer to selected priority (can be modified) + * @param do_index should we index (can be modified) * @param expirationTime pointer to selected expiration time (can be modified) * @param client_info pointer to client context set upon creation (can be modified) * @return GNUNET_OK to continue, GNUNET_NO to remove @@ -1613,6 +1614,7 @@ typedef int (*GNUNET_FS_FileInformationProcessor)(void *cls, struct GNUNET_FS_Uri **uri, uint32_t *anonymity, uint32_t *priority, + int *do_index, struct GNUNET_TIME_Absolute *expirationTime, void **client_info);