[GNUnet-SVN] r260 - in branches/GNUnet06/src/applications/afs: gtkui tools

[grothoff]

Author: grothoff
Date: 2005-02-14 10:09:30 -0800 (Mon, 14 Feb 2005)
New Revision: 260

Modified:
   branches/GNUnet06/src/applications/afs/gtkui/download.c
   branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c
Log:
fixing bug 837

Modified: branches/GNUnet06/src/applications/afs/gtkui/download.c
===================================================================
--- branches/GNUnet06/src/applications/afs/gtkui/download.c     2005-02-14 
04:24:26 UTC (rev 259)
+++ branches/GNUnet06/src/applications/afs/gtkui/download.c     2005-02-14 
18:09:30 UTC (rev 260)
@@ -349,8 +349,8 @@
 
   /* don't display more often than once/sec */
   TIME(&now);
-  if ((now-(dlm->lastDisplayTime)) < 1 &&
-      (stats->filesize != stats->progress))
+  if ( (now-(dlm->lastDisplayTime) < 1) &&
+       (stats->filesize != stats->progress))
     return;
   else
     dlm->lastDisplayTime = now;

Modified: branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c
===================================================================
--- branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c        
2005-02-14 04:24:26 UTC (rev 259)
+++ branches/GNUnet06/src/applications/afs/tools/gnunet-insert.c        
2005-02-14 18:09:30 UTC (rev 260)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing 
authors)
+     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -633,7 +633,9 @@
                              "NO") )
     printf(_("Option '%s' is implied by option '%s'.\n"),
           "-X", "-x");
-  extractors = getExtractors();
+  extractors = (testConfigurationString("GNUNET-INSERT",
+                                       "EXTRACT-KEYWORDS",
+                                       "NO")) ? NULL : extractors;
 #endif
   
   /* fixme: other sanity checks here? */
@@ -657,7 +659,9 @@
                          (const char**) gloKeywords,
                          gloKeywordCnt,
 #if USE_LIBEXTRACTOR
-                         extractors,
+                         (testConfigurationString("GNUNET-INSERT",
+                                                  "EXTRACT-KEYWORDS",
+                                                  "NO")) ? NULL : extractors,
 #else
                          NULL,
 #endif
@@ -798,7 +802,9 @@
                         &mimetype,
                         &keywords,
                         &num_keywords,
-                        extractors);
+                        (testConfigurationString("GNUNET-INSERT",
+                                                 "EXTRACT-KEYWORDS",
+                                                 "NO")) ? NULL : extractors);
 #endif   
     if (mimetype == NULL)
       mimetype = STRDUP("unknown");