1 files changed, 20 insertions, 195 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index ac5a9aea..ad04505d 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -76,7 +76,7 @@ on_namespaceContentSelectionChanged (gpointer signal, gpointer cls)
   int ncount;
   GtkTreeSelection *ns;
   GtkTreeIter iter;
-  char *freq;
+  char *next;
   int ok;
 
   count = gtk_tree_selection_count_selected_rows (content_selection);
@@ -91,12 +91,12 @@ on_namespaceContentSelectionChanged (gpointer signal, gpointer cls)
           (ncount == 1) &&
           (TRUE == gtk_tree_selection_get_selected (ns, NULL, &iter)))
         {
-          freq = NULL;
+          next = NULL;
           gtk_tree_model_get (list->model,
-                              &iter, IN_NAMESPACE_PUB_DATE_STRING, &freq, -1);
-          if ((freq != NULL) && (0 != strcmp (freq, _("never"))))
+                              &iter, IN_NAMESPACE_NEXT_STRING, &next, -1);
+          if ((next != NULL) && (0 != strlen (next)))
             ok = 1;
-          GNUNET_free_non_null (freq);
+          GNUNET_free_non_null (next);
         }
       gtk_widget_set_sensitive (list->updateButton, ok);
       list = list->next;
@@ -134,8 +134,6 @@ makeNamespaceFrame (NamespaceList * entry)
                               G_TYPE_STRING,    /* mime-type */
                               G_TYPE_STRING,    /* last-ID */
                               G_TYPE_STRING,    /* next-ID */
-                              G_TYPE_STRING,    /* pub-freq */
-                              G_TYPE_STRING,    /* next pub date */
                               G_TYPE_POINTER,   /* URI */
                               G_TYPE_POINTER);  /* META */
   entry->model = GTK_TREE_MODEL (model);
@@ -217,42 +215,6 @@ makeNamespaceFrame (NamespaceList * entry)
   renderer = gtk_cell_renderer_text_new ();
   col =
     gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
-                                                 -1,
-                                                 _("Publication Frequency"),
-                                                 renderer, "text",
-                                                 IN_NAMESPACE_PUB_FREQ_STRING,
-                                                 NULL);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  gtk_tree_view_column_set_clickable (column, TRUE);
-  gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_sort_column_id (column,
-                                           IN_NAMESPACE_PUB_FREQ_STRING);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
-  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
-                                      (GTK_TREE_VIEW (resultList), col - 1),
-                                      TRUE);
-  renderer = gtk_cell_renderer_text_new ();
-  col =
-    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
-                                                 -1,
-                                                 _("Next Publication Date"),
-                                                 renderer, "text",
-                                                 IN_NAMESPACE_PUB_DATE_STRING,
-                                                 NULL);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
-  gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  gtk_tree_view_column_set_clickable (column, TRUE);
-  gtk_tree_view_column_set_sort_column_id (column,
-                                           IN_NAMESPACE_PUB_DATE_STRING);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
-  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
-                                      (GTK_TREE_VIEW (resultList), col - 1),
-                                      TRUE);
-  renderer = gtk_cell_renderer_text_new ();
-  col =
-    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
                                                  -1, _("Last ID"), renderer,
                                                  "text",
                                                  IN_NAMESPACE_LAST_STRING,
@@ -301,10 +263,7 @@ makeNamespaceFrame (NamespaceList * entry)
 static int
 addNamespaceContentToModel (void *cls,
                             const GNUNET_ECRS_FileInfo * fi,
-                            const GNUNET_HashCode * lastId,
-                            const GNUNET_HashCode * nextId,
-                            GNUNET_Int32Time publicationFrequency,
-                            GNUNET_Int32Time nextPublicationTime)
+                            const char *lastId, const char *nextId)
 {
   GtkListStore *model = GTK_LIST_STORE (cls);
   GtkTreeIter iter;
@@ -312,10 +271,6 @@ addNamespaceContentToModel (void *cls,
   char *desc;
   char *mime;
   char *uriString;
-  GNUNET_EncName last;
-  GNUNET_EncName next;
-  char *freq;
-  char *date;
   unsigned long long size;
   char *size_h;
 
@@ -357,21 +312,8 @@ addNamespaceContentToModel (void *cls,
   else
     size = 0;
   uriString = GNUNET_ECRS_uri_to_string (fi->uri);
-  GNUNET_hash_to_enc (lastId, &last);
-  if (nextId != NULL)
-    GNUNET_hash_to_enc (nextId, &next);
-  else
-    memset (&next, 0, sizeof (GNUNET_EncName));
-  if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC)
-    date = GNUNET_strdup (_("unspecified"));
-  else if (publicationFrequency == GNUNET_ECRS_SBLOCK_UPDATE_NONE)
-    date = GNUNET_strdup (_("never"));
-  else
-    date = GNUNET_int32_time_to_string (&nextPublicationTime);
-  if (date[strlen (date) - 1] == '\n')
-    date[strlen (date) - 1] = '\0';
-
-  freq = updateIntervalToString (publicationFrequency);
+  if (nextId == NULL)
+    nextId = "";
   size_h = GNUNET_get_byte_size_as_fancy_string (size);
   gtk_list_store_append (model, &iter);
   gtk_list_store_set (model,
@@ -381,18 +323,14 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_HSIZE, size_h,
                       IN_NAMESPACE_DESCRIPTION, desc,
                       IN_NAMESPACE_MIMETYPE, mime,
-                      IN_NAMESPACE_LAST_STRING, &last,
-                      IN_NAMESPACE_NEXT_STRING, &next,
-                      IN_NAMESPACE_PUB_FREQ_STRING, freq,
-                      IN_NAMESPACE_PUB_DATE_STRING, date,
+                      IN_NAMESPACE_LAST_STRING, &lastId,
+                      IN_NAMESPACE_NEXT_STRING, &nextId,
                       IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
                       IN_NAMESPACE_META,
                       GNUNET_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
-  GNUNET_free (freq);
-  GNUNET_free (date);
   GNUNET_free (mime);
   GNUNET_free (desc);
   GNUNET_GTK_DEBUG_END ();
@@ -574,10 +512,8 @@ typedef struct
   unsigned int anonymityLevel;
   char *namespaceName;
   GNUNET_HashCode nsid;
-  GNUNET_Int32Time updateInterval;
-  GNUNET_HashCode *lastId;
-  GNUNET_HashCode thisId;
-  GNUNET_HashCode *nextId;
+  const char *thisId;
+  const char *nextId;
 } IUC;
 
 /**
@@ -607,9 +543,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->nsid,
-                                          cls->updateInterval,
-                                          cls->lastId,
-                                          &cls->thisId, cls->nextId, dst,
+                                          cls->thisId, cls->nextId, dst,
                                           meta);
   if (resultURI != NULL)
     {
@@ -626,12 +560,7 @@ addToNamespaceCB (GtkTreeModel * model,
           fi.uri = dst;
           fi.meta = meta;
           addNamespaceContentToModel (list->model,
-                                      &fi,
-                                      &cls->thisId,
-                                      cls->nextId,
-                                      cls->updateInterval,
-                                      cls->updateInterval +
-                                      GNUNET_get_time_int32 (NULL));
+                                      &fi, cls->thisId, cls->nextId);
         }
       GNUNET_ECRS_uri_destroy (resultURI);
     }
@@ -665,14 +594,11 @@ void
 on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 {
 
-  const char *identifierName;
   NamespaceList *list;
   GtkWidget *nameLine;
   GtkWidget *page;
   GtkWidget *notebook;
   GtkWidget *dialog;
-  GtkWidget *updateIntervalComboBox;
-  GNUNET_HashCode nextId;
   IUC cls;
   gint num;
 
@@ -699,53 +625,15 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
-  updateIntervalComboBox = glade_xml_get_widget (metaXML,
-                                                 "updateIntervalComboBoxEntry");
-  gtk_combo_box_set_active (GTK_COMBO_BOX (updateIntervalComboBox), 0);
-
-
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
-      if (GNUNET_OK != tryParseTimeInterval (metaXML,
-                                             "updateIntervalComboBoxEntry",
-                                             &cls.updateInterval))
-        {
-          /* this should be impossible - GNUNET_OK button is
-             deactivated while parse errors are there */
-          gtk_widget_destroy (dialog);
-          UNREF (metaXML);
-          metaXML = NULL;
-          dialog = gtk_message_dialog_new
-            (NULL,
-             GTK_DIALOG_MODAL,
-             GTK_MESSAGE_ERROR,
-             GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
-          gtk_dialog_run (GTK_DIALOG (dialog));
-          gtk_widget_destroy (dialog);
-          return;
-        }
       cls.anonymityLevel
         = getSpinButtonValue (metaXML, "anonymitySpinButton");
       nameLine = glade_xml_get_widget (metaXML,
                                        "namespaceContentIdentifierEntry");
-      identifierName = gtk_entry_get_text (GTK_ENTRY (nameLine));
-      if (identifierName == NULL)
-        identifierName = "";
-      GNUNET_hash (identifierName, strlen (identifierName), &cls.thisId);
-      cls.lastId = NULL;
-
+      cls.thisId = gtk_entry_get_text (GTK_ENTRY (nameLine));
       nameLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
-      identifierName = gtk_entry_get_text (GTK_ENTRY (nameLine));
-      if ((identifierName == NULL) || (strlen (identifierName) == 0))
-        {
-          cls.nextId = NULL;
-        }
-      else
-        {
-          GNUNET_hash (identifierName, strlen (identifierName), &nextId);
-          cls.nextId = &nextId;
-        }
+      cls.nextId = gtk_entry_get_text (GTK_ENTRY (nameLine));
       GNUNET_GTK_tree_selection_selected_foreach
         (content_selection, &addToNamespaceCB, &cls);
     }
@@ -764,24 +652,16 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 {
   NamespaceList *list;
   GtkTreeIter iter;
-  GNUNET_HashCode nextId;
-  GNUNET_HashCode lastId;
   GtkTreeSelection *selection;
   IUC cls;
   char *last;
   char *next;
-  char *freq;
-  GNUNET_EncName nextnext;
   GtkWidget *nextEntryLine;
   GtkWidget *identifierLabel;
-  GtkWidget *updateIntervalComboBox;
   GtkWidget *dialog;
-  GtkWidget *mdialog;
   GtkWidget *notebook;
   GtkWidget *page;
-  GtkTreeModel *model;
   gint num;
-  const char *nn_str;
 
   GNUNET_GTK_DEBUG_BEGIN ();
   /* find out which namespace this is about */
@@ -810,21 +690,12 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       return;
     }
   gtk_tree_model_get (list->model,
-                      &iter,
-                      IN_NAMESPACE_LAST_STRING, &last,
-                      IN_NAMESPACE_NEXT_STRING, &next,
-                      IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
-  if ((last == NULL) || (next == NULL) || (freq == NULL))
+                      &iter, IN_NAMESPACE_NEXT_STRING, &next, -1);
+  if ((last == NULL) || (next == NULL))
     {
       GNUNET_GE_BREAK (NULL, 0);
       return;
     }
-  if (GNUNET_OK != parseTimeInterval (freq, &cls.updateInterval))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
-      cls.updateInterval = GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC;
-    }
-
   /* create update dialog */
   metaXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -834,60 +705,15 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   identifierLabel = glade_xml_get_widget (metaXML, "identifierLabel");
   gtk_label_set_text (GTK_LABEL (identifierLabel), next);
-  GNUNET_enc_to_hash (last, &lastId);
-  cls.lastId = &lastId;
-  GNUNET_enc_to_hash (next, &cls.thisId);
-
+  cls.thisId = next;
   nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
-  if ((cls.updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) &&
-      (GNUNET_OK == GNUNET_NS_compute_next_identifier (NULL,
-                                                       cfg,
-                                                       &cls.nsid,
-                                                       &lastId,
-                                                       &cls.thisId,
-                                                       cls.updateInterval,
-                                                       &nextId)))
-    {
-      GNUNET_hash_to_enc (&nextId, &nextnext);
-      gtk_entry_set_text (GTK_ENTRY (nextEntryLine), (char *) &nextnext);
-      gtk_widget_set_sensitive (nextEntryLine, FALSE);
-    }
-  /* set update interval in dialog to
-     the existing update interval */
-  updateIntervalComboBox = glade_xml_get_widget (metaXML,
-                                                 "namespaceUpdateIntervalComboBoxEntry");
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (updateIntervalComboBox));
-  gtk_list_store_insert (GTK_LIST_STORE (model), &iter, 0);
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, freq, -1);
-  gtk_combo_box_set_active (GTK_COMBO_BOX (updateIntervalComboBox), 0);
-
   /* run update dialog */
   if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
     goto CLEANUP;
   gtk_widget_hide (dialog);
 
   /* get data from update dialog */
-  nn_str = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
-  if (nn_str == NULL)
-    nn_str = "";
-  GNUNET_hash (nn_str, strlen (nn_str), &nextId);
-  cls.nextId = &nextId;
-
-  if (GNUNET_OK != tryParseTimeInterval (metaXML,
-                                         "namespaceUpdateIntervalComboBoxEntry",
-                                         &cls.updateInterval))
-    {
-      /* This should be impossible since the
-         the GNUNET_OK button is deactivated while parse errors are present */
-      mdialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
-      gtk_dialog_run (GTK_DIALOG (mdialog));
-      gtk_widget_destroy (mdialog);
-      goto CLEANUP;
-    }
+  cls.nextId = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
   cls.anonymityLevel
     = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
 
@@ -900,7 +726,6 @@ CLEANUP:
   metaXML = NULL;
   free (last);
   free (next);
-  free (freq);
   GNUNET_GTK_DEBUG_END ();
 }