[GNUnet-SVN] r30696 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2013-11-14 14:30:29 +0100 (Thu, 14 Nov 2013)
New Revision: 30696

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
Log:
- fix message log level
- fix merging
- fix docu


Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2013-11-14 13:24:25 UTC 
(rev 30695)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2013-11-14 13:30:29 UTC 
(rev 30696)
@@ -442,7 +442,7 @@
   if ((NULL == nick) || (GNUNET_OK != res))
   {
     GNUNET_CRYPTO_ecdsa_key_get_public (zone, &pub);
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "No nick name set for zone `%s'\n",
+    GNUNET_log(GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK, "No nick name 
set for zone `%s'\n",
         GNUNET_CRYPTO_ecdsa_public_key_to_string (&pub));
     return NULL;
   }
@@ -536,12 +536,14 @@
   {
     nick->flags = (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ 
GNUNET_GNSRECORD_RF_PRIVATE;
     merge_records (rd_count,rd, 1, nick, &res_count, &res);
+    //fprintf (stderr, "Merging %u records for `%s' with NICK 
records\n",rd_count, name);
     GNUNET_free (nick);
   }
   else
   {
     res_count = rd_count;
     res = (struct GNUNET_GNSRECORD_Data *) rd;
+    //fprintf (stderr, "Not merging %u records for `%s' with NICK 
records\n",rd_count, name);
   }
 
   name_len = strlen (name) + 1;
@@ -563,7 +565,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Sending `%s' message with %u records and size %u\n",
              "RECORD_RESULT",
-             rd_count,
+             res_count,
              msg_size);
   GNUNET_SERVER_notification_context_unicast (nc,
                                              client,
@@ -636,7 +638,7 @@
 
 /**
  * We just touched the plaintext information about a name in our zone;
- * refresh the corresponding (encrypted) block in the namestore.
+ * refresh the corresponding (encrypted) block in the namecache.
  *
  * @param client client responsible for the request
  * @param rid request ID of the client