sync

3 files changed, 90 insertions, 28 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index e51a426b..bd62b62b 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -393,15 +393,8 @@ char * updateIntervalToString(TIME_T interval) {
   return timeIntervalToFancyString(interval * cronSECONDS);
 }
 
-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))));
+int parseTimeInterval(const char * timeSpec,
+                      TIME_T * interval) {
   if (timeSpec == NULL)
     return SYSERR;
   if (0 == strcmp(_("--sporadic update--"),
@@ -416,6 +409,19 @@ int tryParseTimeInterval(GladeXML * xml,
   return OK;
 }
 
+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))));
+  return parseTimeInterval(timeSpec,
+                           interval);
+}
+
 unsigned int getAnonymityLevel(GladeXML * xml,
                                const char * spinButtonName) {
   GtkWidget * spin;
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index 5e52709e..41bcbd69 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -64,6 +64,9 @@ int tryParseTimeInterval(GladeXML * xml,
                          const char * intervalComboBoxEntry,
                          TIME_T * interval);
 
+int parseTimeInterval(const char * frequency,
+                      TIME_T * interval);
+
 unsigned int getAnonymityLevel(GladeXML * xml,
                                const char * spinButtonName);
 
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index ac0d42d0..5a4056ae 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -327,7 +327,10 @@ static int addNamespaceContentToModel(void * cls,
     size = 0;
   uriString = ECRS_uriToString(fi->uri);
   hash2enc(lastId, &last);
-  hash2enc(nextId, &next);
+  if (nextId != NULL) 
+    hash2enc(nextId, &next);
+  else
+    memset(&next, 0, sizeof(EncName));
   if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC) 
     date = STRDUP(_("unspecified"));
   else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE) 
@@ -684,6 +687,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   GtkTreeSelection * selection;
   IUC cls;
   gint num;
+  GtkTreeIter iter;
 
   contentList
     = glade_xml_get_widget(getMainXML(),
@@ -703,6 +707,16 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
     gtk_widget_destroy(dialog);      
     return;    
   }
+  if (FALSE == gtk_tree_selection_get_selected(selection,
+                                               NULL,
+                                               &iter)) {
+    BREAK();
+    return;
+  }
+  gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
+                     &iter,
+                     NAMESPACE_META, &meta,
+                     -1);
 
   notebook
     = glade_xml_get_widget(getMainXML(),
@@ -729,7 +743,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   createMetaDataListTreeView(metaXML,
                              "metaDataTreeView",
                              "namespaceInsertPreview",
-                             NULL);
+                             meta);
   createMetaTypeComboBox(metaXML,
                          "namespaceInsertMetaTypeComboBox");
   dialog = glade_xml_get_widget(metaXML,
@@ -836,6 +850,16 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
     gtk_widget_destroy(dialog);      
     return;    
   }
+  if (FALSE == gtk_tree_selection_get_selected(selection,
+                                               NULL,
+                                               &iter)) {
+    BREAK();
+    return;
+  }
+  gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
+                     &iter,
+                     NAMESPACE_META, &meta,
+                     -1);
 
   notebook
     = glade_xml_get_widget(getMainXML(),
@@ -881,7 +905,6 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                      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(),
@@ -909,8 +932,34 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   }
   nameLine = glade_xml_get_widget(metaXML,
                                   "nextIdentifierEntry");
-  gtk_entry_set_text(GTK_ENTRY(nameLine),
-                     ""); /* FIXME: compute next for sporadic updates (extend libecrs?) */
+  if (OK != parseTimeInterval(freq,
+                              &cls.updateInterval)) {
+    BREAK();
+    cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+  }
+  if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) {
+    gtk_entry_set_text(GTK_ENTRY(nameLine),
+                       ""); 
+  } else {
+    EncName updateName;
+    
+    if (OK != FSUI_computeNextId(list->name,
+                                 &prevId,
+                                 &cls.thisId,
+                                 cls.updateInterval,
+                                 &nextId)) {
+      BREAK();
+      UNREF(metaXML);
+      metaXML = NULL;
+      return;
+    }
+    hash2enc(&nextId,
+             &updateName);
+    gtk_entry_set_text(GTK_ENTRY(nameLine),
+                       (const char*) &updateName); 
+    gtk_entry_set_editable(GTK_ENTRY(nameLine),
+                           FALSE);
+  }
 
   update = glade_xml_get_widget(metaXML,
                                 "namespaceUpdateIntervalComboBoxEntry");
@@ -927,9 +976,22 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                   GTK_RESPONSE_OK);
   if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+    const char * error = NULL;
+    nameLine = glade_xml_get_widget(metaXML,
+                                    "nextIdentifierEntry");
     if (OK != tryParseTimeInterval(metaXML,
                                    "namespaceUpdateIntervalComboBoxEntry",
                                    &cls.updateInterval)) {
+      error = _("Failed to parse given time interval!");
+    } else {
+      identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
+      if ( (cls.updateInterval != ECRS_SBLOCK_UPDATE_NONE) &&
+           ( (identifierName == NULL) ||
+             (strlen(identifierName) == 0)) ) {
+        error = _("You must specify an identifier for the next publication.");
+      }
+    }
+    if (error != NULL) {
       gtk_widget_destroy(dialog);
       UNREF(metaXML);
       metaXML = NULL;
@@ -938,12 +1000,15 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
          GTK_DIALOG_MODAL,
          GTK_MESSAGE_ERROR,
          GTK_BUTTONS_CLOSE,
-         _("Failed to parse given time interval!"));
+         error);
       gtk_dialog_run(GTK_DIALOG(dialog));
       gtk_widget_destroy(dialog);      
       return;
     }
-
+    hash(identifierName,
+         strlen(identifierName),
+         &nextId);
+    cls.nextId = &nextId;
     cls.meta = getMetaDataFromList(metaXML,
                                    "namespaceUpdateMetaDataTreeView",
                                    "namespaceUpdatePreviewImage");
@@ -951,18 +1016,6 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                                 "namespaceUpdateAnonymitySpinButton");    
     cls.anonymityLevel
       = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
-    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;
-    }
 
     gtk_tree_selection_selected_foreach
       (selection,