assorted bugfixes

4 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 56dddd2e..81aa9791 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -53,7 +53,7 @@ void createCollection_clicked(GtkWidget * dummy1,
   GtkWidget * spin;
   struct ECRS_MetaData * meta;
   struct ECRS_URI * root;
-  cron_t updateInterval;
+  TIME_T updateInterval;
 
   metaXML
     = glade_xml_new(getGladeFileName(),
diff --git a/src/plugins/fs/helper.c b/src/plugins/fs/helper.c
index f17f427b..70ff9e19 100644
--- a/src/plugins/fs/helper.c
+++ b/src/plugins/fs/helper.c
@@ -35,7 +35,7 @@
  * @return OK on success, SYSERR on error
  */
 int parseTime(const char * t,
-              cron_t * param) {
+              TIME_T * param) {
   int pos;
   int start;
   unsigned int val;
@@ -88,7 +88,7 @@ int parseTime(const char * t,
     while ( t[pos] == ' ')
       pos++;
   }  
-  *param = ret;
+  *param = ret / cronSECONDS;
   return OK;
 }
 
diff --git a/src/plugins/fs/helper.h b/src/plugins/fs/helper.h
index 24186aa7..72938fc3 100644
--- a/src/plugins/fs/helper.h
+++ b/src/plugins/fs/helper.h
@@ -35,6 +35,6 @@
  * @return OK on success, SYSERR on error
  */
 int parseTime(const char * t,
-              cron_t * val);
+              TIME_T * val);
 
 #endif
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 8282ce13..468d9a86 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -251,8 +251,8 @@ static int addNamespaceContentToModel(void * cls,
                                       const ECRS_FileInfo * fi,
                                       const HashCode512 * lastId,
                                       const HashCode512 * nextId,
-                                      cron_t publicationFrequency,
-                                      cron_t nextPublicationTime) {
+                                      TIME_T publicationFrequency,
+                                      TIME_T nextPublicationTime) {
   GtkListStore * model = GTK_LIST_STORE(cls);
   GtkTreeIter iter;
   char * filename;
@@ -298,9 +298,9 @@ static int addNamespaceContentToModel(void * cls,
   uriString = ECRS_uriToString(fi->uri);
   hash2enc(lastId, &last);
   hash2enc(nextId, &next);
-  t = nextPublicationTime / cronSECONDS;
+  t = nextPublicationTime;
   date = GN_CTIME(&t);
-  freq = timeIntervalToFancyString(publicationFrequency);
+  freq = timeIntervalToFancyString(publicationFrequency * cronSECONDS);
   gtk_list_store_append(model,
                         &iter);
   gtk_list_store_set(model,
@@ -554,7 +554,7 @@ void namespaceDelete_clicked(GtkWidget * dummy1,
 typedef struct {
   unsigned int anonymityLevel;
   char * namespaceName;
-  cron_t updateInterval;
+  TIME_T updateInterval;
   HashCode512 * lastId;
   HashCode512 thisId;
   HashCode512 * nextId;  
@@ -619,8 +619,7 @@ static void initiateUpload(GtkTreeModel * model,
                                  &cls->thisId,
                                  cls->nextId,
                                  cls->updateInterval,
-                                 cls->updateInterval 
-                                 + cronTime(NULL) );
+                                 cls->updateInterval + TIME(NULL));
     }
     ECRS_freeUri(resultURI);
   } else {