[GNUnet-SVN] r6609 - GNUnet/src/applications/fs/gap

[gnunet]

Author: grothoff
Date: 2008-03-23 21:35:10 -0600 (Sun, 23 Mar 2008)
New Revision: 6609

Modified:
   GNUnet/src/applications/fs/gap/querymanager.c
Log:
fix

Modified: GNUnet/src/applications/fs/gap/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/gap/querymanager.c       2008-03-24 03:21:00 UTC 
(rev 6608)
+++ GNUnet/src/applications/fs/gap/querymanager.c       2008-03-24 03:35:10 UTC 
(rev 6609)
@@ -564,8 +564,20 @@
       hmc.request = request;
       hmc.processed = 0;
       hmc.have_more = GNUNET_NO;
-      datastore->get (&request->queries[0], request->type,
-                     &have_more_processor, &hmc);
+      
+      if (request->type == GNUNET_ECRS_BLOCKTYPE_DATA)
+       {
+         if ( ((1 == datastore->get (&request->queries[0], request->type,
+                                     &have_more_processor, &hmc)) ||
+               (1 == datastore->get (&request->queries[0],
+                                     GNUNET_ECRS_BLOCKTYPE_ONDEMAND,
+                                     &have_more_processor, &hmc))) &&
+              (hmc.have_more == GNUNET_NO) )
+           request->have_more = 0;
+       }
+      else
+       datastore->get (&request->queries[0], request->type,
+                       &have_more_processor, &hmc);
       if (hmc.have_more)
        request->have_more += HAVE_MORE_INCREMENT;
     }