namespace update hacking and minor bugfixes

4 files changed, 86 insertions, 54 deletions

diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 34d7a12c..75fa1fd6 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -6313,6 +6313,7 @@ Phan Vinh Thinh <teppi82@gmail.com>
                   <property name="yalign">0.5</property>
                   <property name="xpad">5</property>
                   <property name="ypad">0</property>
+                  <property name="mnemonic_widget">namespaceUpdateAnonymitySpinButton</property>
                   <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                   <property name="width_chars">-1</property>
                   <property name="single_line_mode">False</property>
@@ -6371,6 +6372,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
                   <property name="yalign">0.5</property>
                   <property name="xpad">6</property>
                   <property name="ypad">0</property>
+                  <property name="mnemonic_widget">nextIdentifierEntry</property>
                   <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                   <property name="width_chars">-1</property>
                   <property name="single_line_mode">False</property>
@@ -6384,15 +6386,20 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
               </child>
 
               <child>
-                <widget class="GtkComboBoxEntry" id="nextIdentifierComboBoxEntry">
+                <widget class="GtkEntry" id="nextIdentifierEntry">
                   <property name="visible">True</property>
-                  <property name="add_tearoffs">False</property>
+                  <property name="can_focus">True</property>
+                  <property name="editable">True</property>
+                  <property name="visibility">True</property>
+                  <property name="max_length">0</property>
+                  <property name="text" translatable="yes"></property>
                   <property name="has_frame">True</property>
-                  <property name="focus_on_click">True</property>
+                  <property name="invisible_char">*</property>
+                  <property name="activates_default">False</property>
                 </widget>
                 <packing>
                   <property name="padding">0</property>
-                  <property name="expand">False</property>
+                  <property name="expand">True</property>
                   <property name="fill">True</property>
                 </packing>
               </child>
@@ -6525,6 +6532,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
                   <property name="yalign">0.5</property>
                   <property name="xpad">5</property>
                   <property name="ypad">0</property>
+                  <property name="mnemonic_widget">namespaceUpdateMetaValueEntry</property>
                   <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                   <property name="width_chars">-1</property>
                   <property name="single_line_mode">False</property>
@@ -6666,6 +6674,7 @@ Phan Vinh Thinh &lt;teppi82@gmail.com&gt;
                   <property name="yalign">0.5</property>
                   <property name="xpad">5</property>
                   <property name="ypad">0</property>
+                  <property name="mnemonic_widget">scrolledwindow31</property>
                   <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                   <property name="width_chars">-1</property>
                   <property name="single_line_mode">False</property>
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 62a11d15..e51a426b 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -385,6 +385,13 @@ struct ECRS_URI * getKeywordURIFromList(GladeXML * xml,
   return keywordURI;
 }
 
+char * updateIntervalToString(TIME_T interval) {
+  if (interval == ECRS_SBLOCK_UPDATE_SPORADIC)
+    return strdup(_("--sporadic update--"));
+  if (interval == ECRS_SBLOCK_UPDATE_NONE)
+    return strdup(_("--no update--"));
+  return timeIntervalToFancyString(interval * cronSECONDS);
+}
 
 int tryParseTimeInterval(GladeXML * xml,
                          const char * intervalComboBoxEntry,
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index c41f23f1..5e52709e 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -58,6 +58,7 @@ struct ECRS_MetaData * getMetaDataFromList(GladeXML * xml,
 struct ECRS_URI * getKeywordURIFromList(GladeXML * xml,
                                         const char * name);
 
+char * updateIntervalToString(TIME_T interval);
 
 int tryParseTimeInterval(GladeXML * xml,
                          const char * intervalComboBoxEntry,
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 21d304e6..ac0d42d0 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -119,32 +119,30 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                               -1,
-                                              _("Last ID"),
+                                              _("Publication Frequency"),
                                               renderer,
-                                              "text", IN_NAMESPACE_LAST_STRING,
+                                              "text", IN_NAMESPACE_PUB_FREQ_STRING,
                                               NULL);
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                               -1,
-                                              _("Next ID"),
+                                              _("Next Publication Date"),
                                               renderer,
-                                              "text", IN_NAMESPACE_NEXT_STRING,
+                                              "text", IN_NAMESPACE_PUB_DATE_STRING,
                                               NULL);
-
-
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                               -1,
-                                              _("Publication Frequency"),
+                                              _("Last ID"),
                                               renderer,
-                                              "text", IN_NAMESPACE_PUB_FREQ_STRING,
+                                              "text", IN_NAMESPACE_LAST_STRING,
                                               NULL);
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                               -1,
-                                              _("Next Publication Date"),
+                                              _("Next ID"),
                                               renderer,
-                                              "text", IN_NAMESPACE_PUB_DATE_STRING,
+                                              "text", IN_NAMESPACE_NEXT_STRING,
                                               NULL);
   child = gtk_bin_get_child(GTK_BIN(window));
   gtk_widget_ref(GTK_WIDGET(child));
@@ -294,7 +292,6 @@ static int addNamespaceContentToModel(void * cls,
   char * freq;
   char * date;
   unsigned long long size;
-  TIME_T t;
 
   filename = ECRS_getFirstFromMetaData(fi->meta,
                                        EXTRACTOR_FILENAME,
@@ -331,9 +328,14 @@ static int addNamespaceContentToModel(void * cls,
   uriString = ECRS_uriToString(fi->uri);
   hash2enc(lastId, &last);
   hash2enc(nextId, &next);
-  t = nextPublicationTime;
-  date = GN_CTIME(&t);
-  freq = timeIntervalToFancyString(publicationFrequency * cronSECONDS);
+  if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC) 
+    date = STRDUP(_("unspecified"));
+  else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE) 
+    date = STRDUP(_("never"));
+  else 
+    date = GN_CTIME(&nextPublicationTime);
+  
+  freq = updateIntervalToString(publicationFrequency);
   gtk_list_store_append(model,
                         &iter);
   gtk_list_store_set(model,
@@ -793,17 +795,6 @@ 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;
@@ -814,15 +805,18 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   GtkWidget * dialog;
   GtkWidget * spin;
   GtkWidget * update;
+  GtkTreeIter iter;
   struct ECRS_MetaData * meta;
   HashCode512 nextId;
+  HashCode512 prevId;
   GtkWidget * contentList;
   GtkTreeSelection * selection;
   GtkTreeSelection * selectionNamespace;
-  UUC cls;
+  IUC cls;
   gint num;
-  char * oldName;
-  struct ECRS_URI * uri;
+  const char * last;
+  const char * next;
+  const char * freq;
 
   contentList
     = glade_xml_get_widget(getMainXML(),
@@ -876,32 +870,56 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
     gtk_widget_destroy(dialog);      
     return;    
   }
-
+  if (FALSE == gtk_tree_selection_get_selected(selectionNamespace,
+                                               NULL,
+                                               &iter)) {
+    BREAK();
+    return;
+  }
+  gtk_tree_model_get(list->model,
+                     &iter,
+                     IN_NAMESPACE_LAST_STRING, &last,
+                     IN_NAMESPACE_NEXT_STRING, &next,
+                     IN_NAMESPACE_PUB_FREQ_STRING, &freq,
+                     IN_NAMESPACE_META, &meta,
+                     -1);
   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! */
+                     next);
+  if (OK != enc2hash(next,
+                     &cls.thisId)) {
+    BREAK(); 
+    UNREF(metaXML);
+    metaXML = NULL;
+    return;
+  }
+  if (OK == enc2hash(last,
+                     &prevId)) {
+    cls.lastId = &prevId;
+  } else {
+    BREAK(); /* should not happen, try to continue */
+    cls.lastId = NULL;
+  }
+  nameLine = glade_xml_get_widget(metaXML,
+                                  "nextIdentifierEntry");
+  gtk_entry_set_text(GTK_ENTRY(nameLine),
+                     ""); /* FIXME: compute next for sporadic updates (extend libecrs?) */
 
   update = glade_xml_get_widget(metaXML,
                                 "namespaceUpdateIntervalComboBoxEntry");
-  /* FIXME: set update interval! */
-
-
+  gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(update))),
+                     freq);
   createMetaDataListTreeView(metaXML,
                              "namespaceUpdateMetaDataTreeView",
                              "namespaceUpdatePreviewImage",
-                             NULL);
+                             meta);
   createMetaTypeComboBox(metaXML,
                          "namespaceUpdateMetaTypeComboBox");
   dialog = glade_xml_get_widget(metaXML,
@@ -926,15 +944,15 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
       return;
     }
 
-    meta = getMetaDataFromList(metaXML,
-                               "namespaceUpdateMetaDataTreeView",
-                               "namespaceUpdatePreviewImage");
+    cls.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");
+                                    "nextIdentifierEntry");
     identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
     if ( (identifierName == NULL) ||
          (strlen(identifierName) == 0)) {
@@ -945,15 +963,12 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
            &nextId);
       cls.nextId = &nextId;
     }
-    cls.meta = meta;
-    /*
-      FIXME:
-      gtk_tree_selection_selected_foreach
+
+    gtk_tree_selection_selected_foreach
       (selection,
        &initiateUpload,
-       &cls);
-    */
-    ECRS_freeMetaData(meta);
+       &cls);    
+    ECRS_freeMetaData(cls.meta);
   }
   gtk_widget_destroy(dialog);
   UNREF(metaXML);