1 files changed, 18 insertions, 125 deletions

diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index f7bf5793..53e51e47 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -27,82 +27,32 @@
 #include "platform.h"
 #include "gnunetgtk_common.h"
 #include "fs.h"
+#include "meta.h"
 #include "collection.h"
 #include <extractor.h>
 
 static GladeXML * metaXML;
 
-
-
-/**
- * FIXME: somehow this function is not called
- * when the button is clicked.
- */
-void 
-on_collectionDialogMetaDataAddButton_clicked(gpointer dummy,
-                                             GtkWidget * uploadButton) {
-  GtkWidget * metaList;
-  GtkWidget * entryLine;
-  GtkWidget * typeCB;
-  const char * value;
-  EXTRACTOR_KeywordType type;
-  GtkListStore * metamodel;
-  GtkListStore * typemodel;
-  GtkTreeIter iter;
-  char * stype;
-  
-  metaList = glade_xml_get_widget(metaXML,
-                                  "collectionMetaDataTreeView");
-  metamodel
-    = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(metaList)));
-
-  entryLine = glade_xml_get_widget(metaXML,
-                                   "collectionMetaDataValueEntry"); 
-  value = gtk_entry_get_text(GTK_ENTRY(entryLine));
-  typeCB = glade_xml_get_widget(metaXML,
-                                "collectionMetaDataTypeComboBox"); 
-  typemodel
-    = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(typeCB)));
-  if (! gtk_combo_box_get_active_iter(GTK_COMBO_BOX(typeCB),
-                                      &iter))
-    return; /* oops */
-  gtk_tree_model_get(GTK_TREE_MODEL(typemodel),
-                     &iter,
-                     KTYPE_STRING, &stype,
-                     KTYPE_TYPE, &type,
-                     -1);  
-  gtk_list_store_append(metamodel,
-                        &iter);
-  gtk_list_store_set(metamodel,
-                     &iter,
-                     META_TYPE, type,
-                     META_STYPE, stype,
-                     META_VALUE, value,
-                     -1); 
-  gtk_entry_set_text(GTK_ENTRY(entryLine), "");
+void on_collectionDialogMetaDataAddButton_clicked(gpointer dummy,
+                                                  GtkWidget * uploadButton) {
+  handleMetaDataListUpdate(metaXML,
+                           "collectionMetaDataTypeComboBox",               
+                           "collectionMetaDataValueEntry",
+                           "collectionMetaDataTreeView");
 }
 
 
 void createCollection_clicked(GtkWidget * dummy1,
                                GtkWidget * dummy2) {  
-  GtkWidget * w;
   const char * collectionName;
+  const char * updateIntervalString;
+  GtkWidget * w;
   GtkWidget * nameLine;
-  GtkWidget * metaList;
   GtkWidget * dialog;
-  GtkWidget * metaType;
   GtkWidget * spin;
-  GtkListStore * metamodel;
-  GtkCellRenderer * renderer;
-  GtkListStore * keywordTypeModel;
-  GtkTreeIter iter;
   struct ECRS_MetaData * meta;
-  EXTRACTOR_KeywordType type;
-  const char * stype;
-  char * mvalue;
   struct ECRS_URI * root;
   cron_t updateInterval;
-  const char * updateIntervalString;
 
   metaXML
     = glade_xml_new(getGladeFileName(),
@@ -111,75 +61,18 @@ void createCollection_clicked(GtkWidget * dummy1,
   connectGladeWithPlugins(metaXML);
   dialog = glade_xml_get_widget(metaXML,
                                 "createCollectionDialog");
-  metamodel
-    = gtk_list_store_new(META_NUM,
-                         G_TYPE_INT,
-                         G_TYPE_STRING,
-                         G_TYPE_STRING);
-  metaList = glade_xml_get_widget(metaXML,
-                                  "collectionMetaDataTreeView");
-  renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Category"),
-                                              renderer,
-                                              "text", META_STYPE,
-                                              NULL);
-  renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-                                              -1,
-                                              _("Value"),
-                                              renderer,
-                                              "text", META_VALUE,
-                                              NULL);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
-                          GTK_TREE_MODEL(metamodel));
-  keywordTypeModel
-    = gtk_list_store_new(KTYPE_NUM,
-                         G_TYPE_STRING,
-                         G_TYPE_INT);
-  metaType 
-    = glade_xml_get_widget(metaXML,
-                           "collectionMetaTypeComboBox");
-  gtk_combo_box_set_model(GTK_COMBO_BOX(metaType),
-                          GTK_TREE_MODEL(keywordTypeModel));
-  for (type=0;type<EXTRACTOR_getHighestKeywordTypeNumber();type++) {   
-    stype = EXTRACTOR_getKeywordTypeAsString(type);    
-    gtk_list_store_append(keywordTypeModel,
-                          &iter);
-    gtk_list_store_set(keywordTypeModel,
-                       &iter,
-                       KTYPE_STRING, stype,
-                       KTYPE_TYPE, type,
-                       -1); 
-  }
-  renderer = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(metaType),
-                             renderer,
-                             FALSE);
-  gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),
-                                renderer,
-                                "text", KTYPE_STRING);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),
-                           0);
+  createMetaDataListTreeView(metaXML,
+                             "collectionMetaDataTreeView",
+                             NULL,
+                             NULL);
+  createMetaTypeComboBox(metaXML,
+                         "collectionMetaTypeComboBox");
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                   GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    meta = ECRS_createMetaData();
-    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(metamodel),
-                                      &iter)) {
-      do {      
-        gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
-                           &iter,
-                           META_TYPE, &type,
-                           META_VALUE, &mvalue,
-                           -1);
-        ECRS_addToMetaData(meta,
-                           type,
-                           mvalue);
-      } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(metamodel),
-                                        &iter));
-    }
+    meta = getMetaDataFromList(metaXML,
+                               "collectionMetaDataTreeView",
+                               NULL);
     spin = glade_xml_get_widget(metaXML,
                                 "collectionAnonymityLevel");    
     nameLine