-simplify expiration editing for now

2 files changed, 40 insertions, 1 deletions

diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index cc3f14f2..a0d983df 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -260,6 +260,8 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
                                  (double) ymd->tm_sec);
     }
   }
+
+  /* FIXME: set source zone! */
 }
 
 
@@ -330,6 +332,8 @@ edit_dialog_putes_common_elements (struct EditDialogContext *edc)
     /* FIXME: implement! */
     GNUNET_break (0);
   }
+
+  /* FIXME: extract target zone! */
 }
 
 
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 9b7115ad..99152a90 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -860,7 +860,8 @@ check_name_validity_and_commit (GtkTreeIter *it,
                         GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
                         -1);
     if ( (NULL == n_name) ||
-         (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (n_name)) ||
+         ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (n_name)) &&
+           (0 != strcmp (n_name, GNUNET_GNS_MASTERZONE_STR)) ) ||
          (0 == n_type) ||
          (0 == n_exp_time) ||
          (NULL == n_value) ||
@@ -1092,6 +1093,34 @@ remove_records_by_path (const gchar *path)
 
 
 /**
+ * Convert an expiration time to a string for display.
+ *
+ * @param is_relative is the given time relative?
+ * @param exp_val expiration value
+ * @return string representing the value
+ */
+static char *
+exp_time_to_string (gboolean is_relative,
+                    uint64_t exp_val)
+{
+  if (is_relative)
+  {
+    struct GNUNET_TIME_Relative rel_time;
+    
+    rel_time.rel_value = exp_val;
+    return GNUNET_strdup (GNUNET_STRINGS_relative_time_to_string (rel_time, GNUNET_NO));
+  }
+  else
+  {
+    struct GNUNET_TIME_Absolute exp_abs;
+
+    exp_abs.abs_value = exp_val;
+    return GNUNET_strdup (GNUNET_STRINGS_absolute_time_to_string (exp_abs));
+  }
+}
+
+
+/**
  * The edit dialog completed; update the namestore and the 
  * view based on the new values in 'edc'.
  *
@@ -1103,6 +1132,7 @@ edit_dialog_continuation (struct EditDialogContext *edc,
                           GtkResponseType ret)
 {
   char *path;
+  char *estr;
 
   /* FIXME: logic to move records between zones is missing here!
      (#2473) */
@@ -1140,15 +1170,19 @@ edit_dialog_continuation (struct EditDialogContext *edc,
     break;
   case GTK_RESPONSE_OK:
     /* update model */
+    estr = exp_time_to_string (edc->n_is_relative,
+                               edc->n_exp_time);
     gtk_tree_store_set (ts, &edc->it,
                         GNS_TREESTORE_COL_NAME, edc->n_name,
                         GNS_TREESTORE_COL_IS_PUBLIC, edc->n_public,
                         GNS_TREESTORE_COL_EXP_TIME, edc->n_exp_time,
                         GNS_TREESTORE_COL_EXP_TIME_IS_REL, edc->n_is_relative,
+                        GNS_TREESTORE_COL_EXP_TIME_AS_STR, estr,
                         GNS_TREESTORE_COL_IS_SHADOW, edc->n_is_shadow,
                         GNS_TREESTORE_COL_VAL_AS_STR, edc->n_value,
                         GNS_TREESTORE_COL_VAL_COLOR, NULL,
                         -1);    
+    GNUNET_free (estr);
     if (GNUNET_YES == edc->old_record_in_namestore)
     {
       /* replace record in database with that from model */
@@ -1977,6 +2011,7 @@ zone_iteration_proc (void *cls,
     public = ((rd[c].flags & GNUNET_NAMESTORE_RF_PRIVATE) != GNUNET_NAMESTORE_RF_PRIVATE);
     /* Expiration time */
     time_is_relative = (0 != (rd[c].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+    
     if (time_is_relative)
     {
       struct GNUNET_TIME_Relative rel_time;