1 files changed, 23 insertions, 16 deletions

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);