5 files changed, 214 insertions, 37 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 1848755b..62a11d15 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -25,6 +25,8 @@
  */
 
 #include "platform.h"
+#include "gnunetgtk_common.h"
+#include "helper.h"
 #include "meta.h"
 #include "fs.h"
 #include <extractor.h>
@@ -383,4 +385,39 @@ struct ECRS_URI * getKeywordURIFromList(GladeXML * xml,
   return keywordURI;
 }
 
+
+int tryParseTimeInterval(GladeXML * xml,
+                         const char * intervalComboBoxEntry,
+                         TIME_T * interval) {
+  GtkWidget * update;
+  const char * timeSpec;
+
+  update = glade_xml_get_widget(xml,
+                                intervalComboBoxEntry);
+  timeSpec = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(update))));
+  if (timeSpec == NULL)
+    return SYSERR;
+  if (0 == strcmp(_("--sporadic update--"),
+                  timeSpec))
+    *interval = ECRS_SBLOCK_UPDATE_SPORADIC;
+  else if (0 == strcmp(_("--no update--"),
+                       timeSpec))
+    *interval = ECRS_SBLOCK_UPDATE_NONE;
+  else 
+    return parseTime(timeSpec,
+                     interval);
+  return OK;
+}
+
+unsigned int getAnonymityLevel(GladeXML * xml,
+                               const char * spinButtonName) {
+  GtkWidget * spin;
+
+  spin = glade_xml_get_widget(xml,
+                              spinButtonName);
+  return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
+}
+
+
+
 /* end of meta.c */
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index 745d8944..c41f23f1 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -59,5 +59,12 @@ struct ECRS_URI * getKeywordURIFromList(GladeXML * xml,
                                         const char * name);
 
 
+int tryParseTimeInterval(GladeXML * xml,
+                         const char * intervalComboBoxEntry,
+                         TIME_T * interval);
+
+unsigned int getAnonymityLevel(GladeXML * xml,
+                               const char * spinButtonName);
+
 /* end of meta.h */
 #endif
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 674e6c8a..21d304e6 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -660,7 +660,7 @@ static void initiateUpload(GtkTreeModel * model,
   }
 } 
 
-void on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1,
+void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy1,
                                                                GtkWidget * dummy2) {
   handleMetaDataListUpdate(metaXML,
                            "namespaceInsertMetaTypeComboBox",
@@ -671,14 +671,11 @@ void on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked(GtkWidget * dummy
 void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
                                       GtkWidget * dummy2) {
   const char * identifierName;
-  const char * timeSpec;
   NamespaceList * list;
   GtkWidget * nameLine;
   GtkWidget * page;
   GtkWidget * notebook;
   GtkWidget * dialog;
-  GtkWidget * spin;
-  GtkWidget * update;
   struct ECRS_MetaData * meta;
   HashCode512 nextId;
   GtkWidget * contentList;
@@ -738,19 +735,9 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                   GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    update = glade_xml_get_widget(metaXML,
-                                  "updateIntervalComboBoxEntry");
-    timeSpec = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(update))));
-    if (timeSpec == NULL)
-      timeSpec = "";
-    if (0 == strcmp(_("--sporadic update--"),
-                    timeSpec))
-      cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
-    else if (0 == strcmp(_("--no update--"),
-                         timeSpec))
-      cls.updateInterval = ECRS_SBLOCK_UPDATE_NONE;
-    else if (OK != parseTime(timeSpec,
-                             &cls.updateInterval)) {
+    if (OK != tryParseTimeInterval(metaXML,
+                                   "updateIntervalComboBoxEntry",
+                                   &cls.updateInterval)) {
       gtk_widget_destroy(dialog);
       UNREF(metaXML);
       metaXML = NULL;
@@ -768,10 +755,9 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
     meta = getMetaDataFromList(metaXML,
                                "metaDataTreeView",
                                "namespaceInsertPreview");
-    spin = glade_xml_get_widget(metaXML,
-                                "anonymitySpinButton");    
     cls.anonymityLevel
-      = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
+      = getAnonymityLevel(metaXML,
+                          "anonymitySpinButton");    
     nameLine = glade_xml_get_widget(metaXML,
                                     "namespaceContentIdentifierEntry");
     identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
@@ -807,21 +793,171 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   metaXML = NULL;
 }
 
+typedef struct {
+  unsigned int anonymityLevel;
+  char * namespaceName;
+  TIME_T updateInterval;
+  HashCode512 lastId;
+  HashCode512 thisId;
+  HashCode512 * nextId;  
+  struct ECRS_MetaData * meta;
+} UUC;
 
 
 void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                                       GtkWidget * dummy2) {
+  const char * identifierName;
+  NamespaceList * list;
+  GtkWidget * nameLine;
+  GtkWidget * page;
+  GtkWidget * notebook;
   GtkWidget * dialog;
+  GtkWidget * spin;
+  GtkWidget * update;
+  struct ECRS_MetaData * meta;
+  HashCode512 nextId;
+  GtkWidget * contentList;
+  GtkTreeSelection * selection;
+  GtkTreeSelection * selectionNamespace;
+  UUC cls;
+  gint num;
+  char * oldName;
+  struct ECRS_URI * uri;
 
-  /* FIXME: implement update! */
-  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);      
+  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;
+
+  /* check that in namespace (updateable) content is selected! */
+  selectionNamespace
+    = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->treeview));
+  if (0 == gtk_tree_selection_count_selected_rows(selectionNamespace)) {
+   /* 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 existing namespace content to be updated first!"));
+    gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);      
+    return;    
+  }
+
+  metaXML
+    = glade_xml_new(getGladeFileName(),
+                    "namespaceUpdateDialog",
+                    PACKAGE_NAME);
+  connectGladeWithPlugins(metaXML);
+
+  
+  uri = NULL; // FIXME
+  oldName = STRDUP("FIXME"); // ECRS_uriToString(uri);
+  nameLine = glade_xml_get_widget(metaXML,
+                                  "identifierLabel");
+  gtk_label_set_text(GTK_LABEL(nameLine),
+                     oldName);
+  FREE(oldName);
+  /* FIXME: set next identifier label! */
+
+  update = glade_xml_get_widget(metaXML,
+                                "namespaceUpdateIntervalComboBoxEntry");
+  /* FIXME: set update interval! */
+
+
+  createMetaDataListTreeView(metaXML,
+                             "namespaceUpdateMetaDataTreeView",
+                             "namespaceUpdatePreviewImage",
+                             NULL);
+  createMetaTypeComboBox(metaXML,
+                         "namespaceUpdateMetaTypeComboBox");
+  dialog = glade_xml_get_widget(metaXML,
+                                "namespaceUpdateDialog");
+  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
+                                  GTK_RESPONSE_OK);
+  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+    if (OK != tryParseTimeInterval(metaXML,
+                                   "namespaceUpdateIntervalComboBoxEntry",
+                                   &cls.updateInterval)) {
+      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;
+    }
+
+    meta = getMetaDataFromList(metaXML,
+                               "namespaceUpdateMetaDataTreeView",
+                               "namespaceUpdatePreviewImage");
+    spin = glade_xml_get_widget(metaXML,
+                                "namespaceUpdateAnonymitySpinButton");    
+    cls.anonymityLevel
+      = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
+    nameLine = glade_xml_get_widget(metaXML,
+                                    "nextIdentifierComboBoxEntry");
+    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;
+    /*
+      FIXME:
+      gtk_tree_selection_selected_foreach
+      (selection,
+       &initiateUpload,
+       &cls);
+    */
+    ECRS_freeMetaData(meta);
+  }
+  gtk_widget_destroy(dialog);
+  UNREF(metaXML);
+  metaXML = NULL;
 }
 
 void on_clearAvailableContentButton_clicked(GtkWidget * dummy1,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 66d278b8..f81031d8 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -28,6 +28,7 @@
 #include "gnunetgtk_common.h"
 #include "search.h"
 #include "fs.h"
+#include "meta.h"
 #include <extractor.h>
 
 
@@ -591,11 +592,9 @@ void on_fssearchbutton_clicked(gpointer dummy2,
   gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
                                 pages);
   gtk_widget_show(notebook);
-  spin = glade_xml_get_widget(getMainXML(),
-                              "searchAnonymitySelectionSpinButton");
   FSUI_startSearch(ctx,
-                   gtk_spin_button_get_value_as_int
-                   (GTK_SPIN_BUTTON(spin)),
+                   getAnonymityLevel(getMainXML(),
+                                     "searchAnonymitySelectionSpinButton"),
                    uri);
   FREE(tabtxt);
 }
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 259c8c86..ef67f85d 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -364,8 +364,6 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
                                "previewImage");   
     keywordURI = getKeywordURIFromList(metaXML,
                                        "metaDataDialogKeywordList");
-    spin = glade_xml_get_widget(getMainXML(),
-                                "uploadAnonymityLevelSpinButton");  
     if (doRec) {
       gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
                                      ECRS_SEARCH_INFIX);      
@@ -381,8 +379,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
     } else {
       FSUI_upload(ctx,
                   filename,
-                  gtk_spin_button_get_value_as_int
-                  (GTK_SPIN_BUTTON(spin)),
+                  getAnonymityLevel(metaXML,
+                                    "uploadAnonymityLevelSpinButton"),    
                   doIndex,
                   NO,
                   meta,