Working on charts

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@68 dd492736-c11a-0410-ad51-8c26713eaf7f

cronjob/chart/image_file/image_common.h

@@ -0,0 +1,6 @@
+typedef struct image_cfg_t {
+  char	*img_name;
+} image_cfg;
+
+
+extern image_cfg img_cfg;

cronjob/chart/image_file/image_config.c

@@ -0,0 +1,51 @@
+/*
+
+   chart.c        -- Part of Chart-generator for the weatherstation
+
+   Copyright (C) 2006 Jan Losinski
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "../common.h"
+#include "image_common.h"
+#include "../config.h"
+
+/* Zuordnung zwischen Schlüsselwörtern in der Config, Der Funktion, die diese auswertet 
+ * und dem eld in der Options-Struktur */
+static const config_keyword keywords[] = {
+  /* keyword		handler  	 	variable address			default */
+  {"filename", 		read_str,                &(img_cfg.img_name),         		""},
+/*  {"image_cfg",    	add_image_cfg,          &(global_opts.image_cfg),         	""},
+  {"image_cfg_location",read_str,               &(global_opts.image_cfg_location),    	DEFAULT_PG_HOST},
+  */
+  {"",			NULL, 	  		NULL,					""}
+};
+
+
+get_image_cfg(char *file){
+char *buff = malloc(sizeof(char)*(strlen(file)+strlen(global_opts.image_cfg_location)+1));
+
+buff = strcpy(buff, global_opts.image_cfg_location);
+buff = strcat(buff, file);
+
+printf("dada\n");
+
+return read_config(file, 1, keywords);
+}

cronjob/chart/image_file/image_config.h

@@ -0,0 +1,23 @@
+/*
+
+   chart.c        -- Part of Chart-generator for the weatherstation
+
+   Copyright (C) 2006 Jan Losinski
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+int get_image_cfg(char *);

cronjob/chart/image_file/image_file.c

@@ -21,9 +21,25 @@
 */
 #include <stdio.h>
 #include <stdlib.h>
+#include "../definitions.h"
+#include "../common.h"
+#include "image_common.h"
 #include "image_file.h"
+#include "image_config.h"
+
+
+image_cfg img_cfg;
 
 void process_image_cfg(char *image_cfg_file){
   printf("%s\n",image_cfg_file);
+
+  
+
+  get_image_cfg(image_cfg_file);
+
+  if (img_cfg.img_name != NULL){
+    DEBUGOUT2("Image-Name = %s\n",img_cfg.img_name);
+  }
+
   sleep(3);
 }

cronjob/chart/image_file/testimage.conf

@@ -0,0 +1 @@
+filename	testbildl