[GNUnet-SVN] r2310 - in GNUnet: contrib src/applications/fs/tools

[grothoff]

Author: grothoff
Date: 2005-12-04 23:13:54 -0800 (Sun, 04 Dec 2005)
New Revision: 2310

Modified:
   GNUnet/contrib/config-client.in
   GNUnet/src/applications/fs/tools/gnunet-insert.c
Log:
fixing mantis 980

Modified: GNUnet/contrib/config-client.in
===================================================================
--- GNUnet/contrib/config-client.in     2005-12-05 07:06:30 UTC (rev 2309)
+++ GNUnet/contrib/config-client.in     2005-12-05 07:13:54 UTC (rev 2310)
@@ -129,6 +129,25 @@
                timing out (in seconds).  Default is "3000", which should be 
enough
                for pretty much anything. Use 0 for no timeout.
 
+       config DIRECT-KEYWORDS
+       bool "Generate keywords for files inside of recursively inserted 
directories?"
+       default y
+       help
+               If this option is set to YES, libextractor will be used to 
generate
+               keywords for files inside of directories.  If the option is NO,
+               files in directories can only be found from the directory (or,
+               of course, from the explicit GNUnet URL).
+
+       config TOP-KEYWORDS
+       bool "Generate keywords for the top-level file or directory?"
+       default y
+       help
+               If this option is set to YES, libextractor will be used to 
generate
+               keywords for the file or directory that is inserted.  If the 
option is NO,
+               libextractor will not be used for the top-level file or 
directory
+               (you can still specify keywords manually).
+
+
        config MAXRESULTS
        int "Default limit for the number of search results"
        default 0

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-12-05 07:06:30 UTC 
(rev 2309)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2005-12-05 07:13:54 UTC 
(rev 2310)
@@ -691,9 +691,9 @@
                         getConfigurationInt("FS",
                                             "ANONYMITY-SEND"),
                         doIndex,
-                        testConfigurationString("FS",
+                        !testConfigurationString("FS",
                                                 "DIRECT-KEYWORDS",
-                                                "YES"),
+                                                "NO"),
                         meta,
                         gloURI,
                         topURI);
@@ -709,7 +709,9 @@
                      getConfigurationInt("FS",
                                          "ANONYMITY-SEND"),
                      doIndex,
-                     YES,
+                     !testConfigurationString("FS",
+                                             "TOP-KEYWORDS",
+                                             "NO"),
                      meta,
                      topURI);
     ECRS_freeUri(topURI);