[GNUnet-SVN] r11767 - in gnunet: . src/fs src/include

[gnunet]

Author: grothoff
Date: 2010-06-16 14:25:39 +0200 (Wed, 16 Jun 2010)
New Revision: 11767

Modified:
   gnunet/TODO
   gnunet/src/fs/fs.c
   gnunet/src/fs/fs_file_information.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/gnunet-publish.c
   gnunet/src/fs/test_fs_file_information.c
   gnunet/src/include/gnunet_fs_service.h
Log:
pass do_index

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2010-06-16 11:34:03 UTC (rev 11766)
+++ gnunet/TODO 2010-06-16 12:25:39 UTC (rev 11767)
@@ -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!?)

Modified: gnunet/src/fs/fs.c
===================================================================
--- gnunet/src/fs/fs.c  2010-06-16 11:34:03 UTC (rev 11766)
+++ gnunet/src/fs/fs.c  2010-06-16 12:25:39 UTC (rev 11767)
@@ -1334,6 +1334,7 @@
  * @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 @@
                  struct GNUNET_FS_Uri **uri,
                  uint32_t *anonymity,
                  uint32_t *priority,
+                 int *do_index,
                  struct GNUNET_TIME_Absolute *expirationTime,
                  void **client_info)
 {

Modified: gnunet/src/fs/fs_file_information.c
===================================================================
--- gnunet/src/fs/fs_file_information.c 2010-06-16 11:34:03 UTC (rev 11766)
+++ gnunet/src/fs/fs_file_information.c 2010-06-16 12:25:39 UTC (rev 11767)
@@ -732,7 +732,9 @@
                                    void *proc_cls)
 {
   struct GNUNET_FS_FileInformation *pos;
+  int no;
 
+  no = GNUNET_NO;
   if (GNUNET_OK !=
       proc (proc_cls, 
            dir,
@@ -741,6 +743,7 @@
            &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 @@
   pos = dir->data.dir.entries;
   while (pos != NULL)
     {
+      no = GNUNET_NO;
       if (GNUNET_OK != 
          proc (proc_cls, 
                pos,
@@ -757,6 +761,7 @@
                &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 @@
                                    void *cleaner_cls)
 {
   struct GNUNET_FS_FileInformation *pos;
+  int no;
 
+  no = GNUNET_NO;
   if (fi->is_directory)
     {
       /* clean up directory */
@@ -799,6 +806,7 @@
                 &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 @@
                 &fi->keywords,
                 &fi->anonymity,
                 &fi->priority,
+                &fi->data.file.do_index,
                 &fi->expirationTime,
                 &fi->client_info);
     }

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-06-16 11:34:03 UTC (rev 11766)
+++ gnunet/src/fs/fs_publish.c  2010-06-16 12:25:39 UTC (rev 11767)
@@ -940,6 +940,7 @@
  * @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 @@
                 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 @@
  * @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 @@
                   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 @@
  * @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 @@
                struct GNUNET_FS_Uri **uri,
                uint32_t *anonymity,
                uint32_t *priority,
+               int *do_index,
                struct GNUNET_TIME_Absolute *expirationTime,
                void **client_info)
 {

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2010-06-16 11:34:03 UTC (rev 11766)
+++ gnunet/src/fs/gnunet-publish.c      2010-06-16 12:25:39 UTC (rev 11767)
@@ -227,6 +227,7 @@
  * @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 @@
                   struct GNUNET_FS_Uri **uri,
                   unsigned int *anonymity,
                   unsigned int *priority,
+                  int *do_index,
                   struct GNUNET_TIME_Absolute *expirationTime,
                   void **client_info)
 {

Modified: gnunet/src/fs/test_fs_file_information.c
===================================================================
--- gnunet/src/fs/test_fs_file_information.c    2010-06-16 11:34:03 UTC (rev 
11766)
+++ gnunet/src/fs/test_fs_file_information.c    2010-06-16 12:25:39 UTC (rev 
11767)
@@ -57,6 +57,7 @@
          struct GNUNET_FS_Uri **uri,
          uint32_t *anonymity,
          uint32_t *priority,
+         int *do_index,
          struct GNUNET_TIME_Absolute *expirationTime,
          void **client_info)
 {

Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h      2010-06-16 11:34:03 UTC (rev 
11766)
+++ gnunet/src/include/gnunet_fs_service.h      2010-06-16 12:25:39 UTC (rev 
11767)
@@ -1600,6 +1600,7 @@
  * @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 @@
                                                  struct GNUNET_FS_Uri **uri,
                                                  uint32_t *anonymity,
                                                  uint32_t *priority,
+                                                 int *do_index,
                                                  struct GNUNET_TIME_Absolute 
*expirationTime,
                                                  void **client_info);