converting to new namespace / URI APIs

5 files changed, 54 insertions, 23 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 463f2b72..c14113d0 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -161,7 +161,12 @@ saveEventProcessor (void *cls)
     case GNUNET_FSUI_search_stopped:
       fs_search_stopped (event->data.SearchStopped.sc.cctx);
       break;
-
+    case GNUNET_FSUI_search_update:
+      fs_search_update (event->data.SearchUpdate.sc.cctx,
+                        &event->data.SearchUpdate.fi,
+                        event->data.SearchUpdate.availability_rank,
+                        event->data.SearchUpdate.applicability_rank);
+      break;
       /* download events */
     case GNUNET_FSUI_download_aborted:
       fs_download_aborted (event->data.DownloadAborted.dc.cctx);
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index e285039e..4a849582 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -433,7 +433,7 @@ addTabForNamespace (void *unused,
                             label);
   gtk_widget_show (notebook);
   GNUNET_NS_namespace_list_contents
-    (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
+    (ectx, cfg, namespaceId, &addNamespaceContentToModel, list->model);
   GNUNET_GTK_DEBUG_END ();
   /* enable "delete" menu entry */
 
@@ -562,7 +562,7 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   if (GTK_RESPONSE_YES != ret)
     return;
   gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
-  GNUNET_NS_namespace_delete (ectx, cfg, list->name);
+  GNUNET_NS_namespace_delete (ectx, cfg, &list->id);
   frame_destroy (list->treeview);
   GNUNET_GTK_DEBUG_END ();
 }
@@ -571,6 +571,7 @@ typedef struct
 {
   unsigned int anonymityLevel;
   char *namespaceName;
+  GNUNET_HashCode nsid;
   GNUNET_Int32Time updateInterval;
   GNUNET_HashCode *lastId;
   GNUNET_HashCode thisId;
@@ -603,7 +604,7 @@ addToNamespaceCB (GtkTreeModel * model,
     }
   resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000, /* FIXME: priority */
                                           GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
-                                          cls->namespaceName,
+                                          &cls->nsid,
                                           cls->updateInterval,
                                           cls->lastId,
                                           &cls->thisId, cls->nextId, dst,
@@ -688,6 +689,7 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       return;
     }
   cls.namespaceName = list->name;
+  cls.nsid = list->id;
 
   metaXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -796,6 +798,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       return;
     }
   cls.namespaceName = list->name;
+  cls.nsid = list->id;
 
   /* find out what we are updating */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
@@ -837,7 +840,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   if ((cls.updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) &&
       (GNUNET_OK == GNUNET_NS_compute_next_identifier (NULL,
                                                        cfg,
-                                                       cls.namespaceName,
+                                                       &cls.nsid,
                                                        &lastId,
                                                        &cls.thisId,
                                                        cls.updateInterval,
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 06dc4145..19fa561a 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -51,6 +51,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
   char *description;
   int rating;
   int newrating;
+  GNUNET_HashCode nsid;
 
   GNUNET_GTK_DEBUG_BEGIN ();
   spin =
@@ -78,9 +79,11 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
         {
           if (encStr != NULL)
             {
+              GNUNET_enc_to_hash(encStr,
+                                 &nsid);
               newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
               rating = GNUNET_NS_namespace_rank (ectx,
-                                                 cfg, encStr,
+                                                 cfg, &nsid,
                                                  newrating - rating);
               if (rating != newrating)
                 {
@@ -160,7 +163,7 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
             = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                     "fssearchKeywordComboBoxEntry");
           if (GNUNET_OK ==
-              GNUNET_NS_namespace_get_root (ectx, cfg, encStr, &root))
+              GNUNET_NS_namespace_get_root (ectx, cfg, &ns, &root))
             {
               GNUNET_hash_to_enc (&root, &enc);
               gtk_entry_set_text (GTK_ENTRY
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index a1c79784..44da2589 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -194,6 +194,23 @@ fs_search_result_received (SearchList * searchContext,
   updateSearchSummary (searchContext);
 }
 
+/**
+ * Update the applicability and availability rating
+ * for the given search result.
+ *
+ * @param info the search result (and metadata)
+ * @param availability_rank availability estimate
+ * @param applicability_rank relevance
+ */
+void fs_search_update (SearchList * searchContext,
+                       const GNUNET_ECRS_FileInfo * info,
+                       int availability_rank,
+                       unsigned int applicability_rank)
+{
+  /* FIXME */
+}
+
+
 static int
 on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
 {
@@ -389,7 +406,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   SearchList *list;
   gint pages;
   char *description;
-  const char *dhead;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   GtkNotebook *notebook;
@@ -419,26 +435,18 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
     }
 
   /* build new entry */
-  description = GNUNET_ECRS_uri_to_string (uri);
+  if (GNUNET_ECRS_uri_test_ksk(uri))
+    description = GNUNET_ECRS_ksk_uri_to_human_readable_string (uri);
+  else
+    description = GNUNET_NS_sks_uri_to_human_readable_string (ectx, cfg, uri);
   if (description == NULL)
     {
       GNUNET_GE_BREAK (ectx, 0);
       return NULL;
     }
-  GNUNET_GE_ASSERT (ectx,
-                    strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
-  dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
-  if (0 ==
-      strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX,
-               strlen (GNUNET_ECRS_SEARCH_INFIX)))
-    dhead = &dhead[strlen (GNUNET_ECRS_SEARCH_INFIX)];
-  else if (0 == strncmp (dhead,
-                         GNUNET_ECRS_SUBSPACE_INFIX,
-                         strlen (GNUNET_ECRS_SUBSPACE_INFIX)))
-    dhead = &dhead[strlen (GNUNET_ECRS_SUBSPACE_INFIX)];
   list = GNUNET_malloc (sizeof (SearchList));
   memset (list, 0, sizeof (SearchList));
-  list->searchString = GNUNET_strdup (dhead);
+  list->searchString = description;
   list->uri = GNUNET_ECRS_uri_duplicate (uri);
   list->fsui_list = fsui_list;
   list->next = search_head;
@@ -585,10 +593,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_list_store_append (search_summary, &iter);
   gtk_list_store_set (search_summary,
                       &iter,
-                      SEARCH_SUMMARY_NAME, dhead,
+                      SEARCH_SUMMARY_NAME, description,
                       SEARCH_SUMMARY_RESULT_COUNT, 0,
                       SEARCH_SUMMARY_INTERNAL, list, -1);
-  GNUNET_free (description);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
   list->summaryViewRowReference
     = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index 37c51818..bf280397 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -54,6 +54,19 @@ void fs_search_result_received (SearchList * searchContext,
                                 const struct GNUNET_ECRS_URI *uri);
 
 /**
+ * Update the applicability and availability rating
+ * for the given search result.
+ *
+ * @param info the search result (and metadata)
+ * @param availability_rank availability estimate
+ * @param applicability_rank relevance
+ */
+void fs_search_update (SearchList * searchContext,
+                       const GNUNET_ECRS_FileInfo * info,
+                       int availability_rank,
+                       unsigned int applicability_rank);
+
+/**
  * A search has been started.  Open tab.
  *
  * @return internal search context