modified: src/db.c

modified:   src/db.h
	modified:   src/test.c
	modified:   src/ui.c

src/db.c

@@ -10,39 +10,37 @@
  *
  */
 
-
+#include "llist.h"
+#include "planner.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <time.h>
-#include "planner.h"
-#include "list.h"
 
 /*
 write a complete linkedlist to a task csv file.
  */
-void write_linkedlist_to_csv(llist* head, const char* filename) {
-	//Open file with write permision
-	FILE* file = fopen(filename, "w");
-	//if there is no file or a wrong file path you becom an error
+void write_linkedlist_to_csv(llist *head, const char *filename) {
+  // Open file with write permision
+  FILE *file = fopen(filename, "w");
+  // if there is no file or a wrong file path you becom an error
   if (file == NULL) {
-    	perror("Could not open file %s\n", filename);
-  	}
-  	else{
-    	//write the file header
+    fprintf(stderr, "Could not open file %s\n", filename);
+    exit(1);
+
+  } else {
+    // write the file header
     fprintf(file, "TaskName, Created, Deadline, Priority, Spare\n");
 
     // Iterate through the linked list and write the data to the CSV
-  		llist* current = head;
+    llist *current = head;
+    Task *task;
     while (current != NULL) {
+      task = current->data;
 
       // Write the task data to the CSV file
-    		fprintf(file, "%s, %lu, %lu, %d, %lu\n",
-            	task->name,
-            	task->created,
-            	task->deadline,
-            	task->priority,
-            	task->spare,
-
+      fprintf(file, "%s, %lu, %lu, %d, %lu\n", task->name, task->created,
+              task->deadline, task->priority, task->spare);
 
       current = current->next;
     }
@@ -54,49 +52,47 @@ void write_linkedlist_to_csv(llist* head, const char* filename) {
 read a task csv file and write the data in a linked list
  */
 
-void write_csv_to_llist(const char* filename) {
-	//Open file with read permision
-  FILE* file = fopen(filename, "r");
+llist *write_csv_to_llist(const char *filename) {
+  llist *list = NULL; // list to return
+  // Open file with read permision
+  FILE *file = fopen(filename, "r");
   if (file == NULL) {
-    perror("Could not open file %s\n", filename);
-  }
-  else{
-	char line[1024]; //Line Buffer
-    int count = 0; //task counter
-    llist *list = NULL
-    fgets(line, sizeof(line), file); //read and ignore file head
+    fprintf(stderr, "Could not open file %s\n", filename);
+
+  } else {
+    char line[1024];                 // Line Buffer
+    int count = 0;                   // task counter
+    fgets(line, sizeof(line), file); // read and ignore file head
+
     while (fgets(line, sizeof(line), file)) {
       count++;
-    	//remove newline sign
+      // remove newline sign
       line[strcspn(line, "\n")] = '\0';
 
       // column slice
       char *taskname = strtok(line, ",");
-        char *tsakcreation_dateSTR = strtok(NULL, ",");
-        char *tsakdeadline_dateSTR = strtok(NULL, ",");
-        char *tsakprioritySTR = strtok(NULL, ",");
-        char *tsakspareSTR = strtok(NULL, ",");
-
+      char *taskcreation_dateSTR = strtok(NULL, ",");
+      char *taskdeadline_dateSTR = strtok(NULL, ",");
+      char *taskprioritySTR = strtok(NULL, ",");
+      char *taskspareSTR = strtok(NULL, ",");
 
       // convert char in integer and date
-        unsigned long int taskcreation_date = strtoul(taskcreation_dateSTR,NULL,10);
-        unsigned long int taskdeadline_date = strtoul(taskdeadline_dateSTR,NULL,10);
-        unsigned long int taskspare = strtoul(taskspareSTR,NULL,10);
-        int priority = atoi(prioritySTR);
-
-
-
-        //create Task
-        Task *task = newTask(taskname, taskcreation_date, taskdeadline_date, taskpriority, taskspare);
-
+      unsigned long int taskcreation_date =
+          strtoul(taskcreation_dateSTR, NULL, 10);
+      unsigned long int taskdeadline_date =
+          strtoul(taskdeadline_dateSTR, NULL, 10);
+      unsigned long int taskspare = strtoul(taskspareSTR, NULL, 10);
+      int priority = atoi(taskprioritySTR);
 
+      // create Task
+      Task *task = newTask(taskname, taskcreation_date, taskdeadline_date,
+                           priority, taskspare);
 
       // Insert task into the linked list
       if (list == NULL) {
         // If the list is empty, initialize it with the first task
         list = llistNew(task, cmpTaskN);
-        }
-        else {
+      } else {
         // Append the task to the linked list
         llistAppend(list, task);
       }
@@ -104,8 +100,5 @@ void write_csv_to_llist(const char* filename) {
 
     fclose(file);
   }
-
-
-
+  return list; // null on error
 }
-

src/db.h

@@ -5,5 +5,5 @@
 
 #endif
 
-extern void write_linkedlist_to_csv(llist* head, const char* filename)
-extern void write_csv_to_llist(const char* filename)
+extern void write_linkedlist_to_csv(llist *head, const char *filename);
+extern void write_csv_to_llist(const char *filename);

src/test.c

@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-int main() {
+int test() {
 
   time_t now = time(NULL);
 

src/ui.c

@@ -5,7 +5,7 @@
 /* Created by Juergen Buechel, 13.12.2024/
  */
 #include "ui.h"
-// #include "db.h"
+#include "db.h"
 #include "llist.h"
 #include "planner.h" // for subject and event structs
 #include <assert.h>
@@ -31,9 +31,8 @@ int main(void) {
     if (scanf("%d", &choice) != 1) {
       printf("Falsche Eingabe\n");
     };
-    choice = 0;
+    // choice = 0;
 
-    while ((choice < 1 || choice > 5)) {
     switch (choice) {
     case 1: {
       printf(" Geben sie das gewünschte Fach ein: \n");
@@ -63,7 +62,7 @@ int main(void) {
     case 2:
       printf(
           "Geben Sie die zur verfuegung stehende Zeit für die Fächer an: \n");
-        scanf("%c", &taskspare);
+      scanf("%d", &taskspare);
       break;
 
     case 3:
@@ -123,7 +122,6 @@ int main(void) {
       // case 4: iCAl();break;
     }
     }
-    }
   } while (choice != 5);
   {
     return EXIT_SUCCESS;