1 files changed, 162 insertions, 6 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 48d41958..c2062f4f 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -1,4 +1,4 @@
-/*
+ /*
      This file is part of GNUnet.
      (C) 2005 Christian Grothoff (and other contributing authors)
 
@@ -206,6 +206,7 @@ static int updateView(const ECRS_FileInfo * fi,
                      NAMESPACE_SIZE, size,
                      NAMESPACE_URISTRING, uriString,
                      NAMESPACE_URI, ECRS_dupUri(fi->uri),
+                     NAMESPACE_META, ECRS_dupMetaData(fi->meta),
                      -1);
   FREE(filename);
   FREE(uriString);
@@ -725,24 +726,144 @@ void namespaceDelete_clicked(GtkWidget * dummy1,
   FREE(list);
 }
 
+typedef struct {
+  unsigned int anonymityLevel;
+  char * namespaceName;
+  cron_t updateInterval;
+  HashCode512 * lastId;
+  HashCode512 thisId;
+  HashCode512 * nextId;  
+  struct ECRS_MetaData * meta;
+} IUC;
 
+/**
+ * Publish the selected file in the
+ * selected namespace.
+ */
+static void initiateUpload(GtkTreeModel * model,
+                           GtkTreePath * path,
+                           GtkTreeIter * iter,
+                           gpointer data) {
+  IUC * cls = data;
+  struct ECRS_URI * resultURI;
+  struct ECRS_URI * dst;
+  struct ECRS_MetaData * ometa;
+  struct ECRS_MetaData * meta;
+  NamespaceList * list;
+  ECRS_FileInfo fi;
+
+  dst = NULL;
+  meta = cls->meta;
+  gtk_tree_model_get(model,
+                     iter,
+                     NAMESPACE_URI, &dst,
+                     NAMESPACE_META, &ometa,
+                     -1);
+  /* FIXME: we may want to optionally combine the metadata from the
+     original file ID (ometa) with the new metadata (cls->meta) here;
+     or if we limit us to one file at a time, show the original
+     metadata immediately with the dialog. */
+  
+  if (dst == NULL) {
+    BREAK();
+    return;
+  }  
+  if (OK == FSUI_addToNamespace(ctx,
+                                cls->anonymityLevel,
+                                cls->namespaceName,
+                                cls->updateInterval,
+                                cls->lastId,
+                                &cls->thisId,
+                                cls->nextId,
+                                dst,
+                                meta,
+                                &resultURI)) {
+    list = head;
+    while ( (list != NULL) &&
+            (0 != strcmp(cls->namespaceName,
+                         list->name)) )
+      list = list->next;
+    if (list == NULL) {
+      BREAK();
+    } else {
+      /* update namespace content list! */
+      fi.uri = resultURI;
+      fi.meta = meta;
+      addNamespaceContentToModel(list->model,
+                                 &fi,
+                                 &cls->thisId,
+                                 cls->nextId,
+                                 cls->updateInterval,
+                                 cls->updateInterval 
+                                 + cronTime(NULL) );
+    }
+    ECRS_freeUri(resultURI);
+  } else {
+    infoMessage(YES,
+                _("Failed to insert content into namespace "
+                  "(consult logs).\n"));
+  }
+} 
 
 void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
                                       GtkWidget * dummy2) {
   const char * identifierName;
+  NamespaceList * list;
   GtkWidget * nameLine;
+  GtkWidget * page;
+  GtkWidget * notebook;
   GtkWidget * metaList;
   GtkWidget * dialog;
   GtkWidget * spin;
+  GtkWidget * update;
   GtkListStore * metamodel;
   GtkCellRenderer * renderer;
   GtkTreeIter iter;
   struct ECRS_MetaData * meta;
   EXTRACTOR_KeywordType type;
   char * mvalue;
-  HashCode512 identifier;
+  HashCode512 nextId;
+  GtkWidget * contentList;
+  GtkTreeSelection * selection;
+  IUC cls;
+  gint num;
+
+  contentList
+    = glade_xml_get_widget(getMainXML(),
+                           "availableContentList");
+  selection 
+    = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList));
+  if (0 == gtk_tree_selection_count_selected_rows(selection)) {
+   /* IMPROVE-ME: disable the menu item
+      as long as this may happen! */
+    dialog = gtk_message_dialog_new 
+      (NULL,
+       GTK_DIALOG_MODAL,
+       GTK_MESSAGE_ERROR,
+       GTK_BUTTONS_CLOSE,
+       _("You must select some available content for publication first!"));
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);      
+    return;    
+  }
+
+  notebook
+    = glade_xml_get_widget(getMainXML(),
+                           "localNamespacesNotebook");
+  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
+  GNUNET_ASSERT(num != -1);
+  page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
+                                  num);
+  list = head;
+  while ( (list != NULL) &&
+          (list->namespacepage != page) )
+    list = list->next;
+  if (list == NULL) {
+    BREAK();
+    return;
+  }
+  cls.namespaceName = list->name;
 
-  /* FIXME */
   metaXML
     = glade_xml_new(getGladeFileName(),
                     "namespaceMetaDataDialog",
@@ -792,7 +913,9 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
                                         &iter));
     }
     spin = glade_xml_get_widget(metaXML,
-                                "namespaceAnonymityspinbutton");    
+                                "anonymitySpinButton");    
+    cls.anonymityLevel
+      = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
     nameLine = glade_xml_get_widget(metaXML,
                                     "namespaceContentIdentifierEntry");
     identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
@@ -800,9 +923,32 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
       identifierName = "";
     hash(identifierName,
          strlen(identifierName),
-         &identifier);
+         &cls.thisId);
+    cls.lastId = NULL;
 
+    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 {      
+      hash(identifierName,
+           strlen(identifierName),
+           &nextId);
+      cls.nextId = &nextId;
+    }
+    cls.meta = meta;
+    update = glade_xml_get_widget(metaXML,
+                                  "updateIntervalComboBoxEntry");
+    cls.updateInterval = 0; /* FIXME */
 
+    gtk_tree_selection_selected_foreach
+      (selection,
+       &initiateUpload,
+       &cls);
+
+    ECRS_freeMetaData(meta);
   }
   gtk_widget_destroy(dialog);
   UNREF(metaXML);
@@ -811,7 +957,16 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
 
 void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                                       GtkWidget * dummy2) {
-  /* FIXME */
+  GtkWidget * dialog;
+
+  dialog = gtk_message_dialog_new 
+    (NULL,
+     GTK_DIALOG_MODAL,
+     GTK_MESSAGE_ERROR,
+     GTK_BUTTONS_CLOSE,
+     _("Not implemented!"));
+  gtk_dialog_run(GTK_DIALOG(dialog));
+  gtk_widget_destroy(dialog);      
 }
 
 
@@ -829,6 +984,7 @@ void fs_namespace_start() {
                              G_TYPE_STRING, /* name */
                              G_TYPE_UINT64, /* size */
                              G_TYPE_STRING, /* uri-string */
+                             G_TYPE_POINTER,
                              G_TYPE_POINTER); /* uri */
   gtk_tree_view_set_model(GTK_TREE_VIEW(contentList),
                           GTK_TREE_MODEL(model));