add groups

src/CMakeLists.txt

@@ -4,7 +4,7 @@
 configure_file(zm_config.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config.h" @ONLY)
 
 # Group together all the source files that are used by all the binaries (zmc, zma, zmu, zms etc)
-set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm_curl_camera.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_eventstream.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_input.cpp zm_ffmpeg_camera.cpp zm_image.cpp zm_jpeg.cpp zm_libvlc_camera.cpp zm_local_camera.cpp zm_monitor.cpp zm_monitorstream.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_packet.cpp zm_packetqueue.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_nvsocket.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_rtsp_auth.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_swscale.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_video.cpp zm_videostore.cpp zm_zone.cpp zm_storage.cpp)
+set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm_curl_camera.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_eventstream.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_input.cpp zm_ffmpeg_camera.cpp zm_group.cpp zm_image.cpp zm_jpeg.cpp zm_libvlc_camera.cpp zm_local_camera.cpp zm_monitor.cpp zm_monitorstream.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_packet.cpp zm_packetqueue.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_nvsocket.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_rtsp_auth.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_swscale.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_video.cpp zm_videostore.cpp zm_zone.cpp zm_storage.cpp)
 
 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})

src/zm_group.cpp

@@ -0,0 +1,69 @@
+/*
+ * ZoneMinder regular expression class implementation, $Date$, $Revision$
+ * Copyright (C) 2001-2008 Philip Coombes
+ * 
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/ 
+
+#include "zm.h"
+#include "zm_db.h"
+
+#include "zm_group.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+Group::Group() {
+	Warning("Instantiating default Group Object. Should not happen.");
+	id = 0;
+  parent_id = 0;
+	strcpy(name, "Default");
+}
+
+Group::Group( MYSQL_ROW &dbrow ) {
+	unsigned int index = 0;
+	id = atoi( dbrow[index++] );
+	parent_id = dbrow[index] ? atoi( dbrow[index] ): 0; index++;
+	strncpy( name, dbrow[index++], sizeof(name)-1 );
+}
+
+/* If a zero or invalid p_id is passed, then the old default path will be assumed.  */
+Group::Group( unsigned int p_id ) {
+	id = 0;
+
+	if ( p_id ) {
+		char sql[ZM_SQL_SML_BUFSIZ];
+		snprintf( sql, sizeof(sql), "SELECT Id, ParentId, Name FROM Group WHERE Id=%d", p_id );
+		Debug(2,"Loading Group for %d using %s", p_id, sql );
+		zmDbRow dbrow;
+		if ( ! dbrow.fetch( sql ) ) {
+			Error( "Unable to load group for id %d: %s", p_id, mysql_error( &dbconn ) );
+		} else {
+			unsigned int index = 0;
+			id = atoi( dbrow[index++] );
+      parent_id = dbrow[index] ? atoi( dbrow[index] ): 0; index++;
+			strncpy( name, dbrow[index++], sizeof(name)-1 );
+			Debug( 1, "Loaded Group area %d '%s'", id, this->Name() );
+		}
+	}
+	if ( ! id ) {
+		Debug(1,"No id passed to Group constructor.");
+		strcpy(name, "Default");
+	}
+}
+
+Group::~Group() {
+}

src/zm_group.h

@@ -0,0 +1,43 @@
+/*
+ * ZoneMinder Group Class Interface, $Date$, $Revision$
+ * Copyright (C) 2001-2008 Philip Coombes
+ * 
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/  
+
+#include "zm_db.h"
+
+#ifndef ZM_GROUP_H
+#define ZM_GROUP_H
+
+class Group {
+
+protected:
+	unsigned int	id;
+	unsigned int	parent_id;
+	char name[64+1];
+
+public:
+	Group();
+	explicit Group( MYSQL_ROW &dbrow );
+	explicit Group( unsigned int p_id );
+	~Group();
+
+	unsigned int	Id() const { return id; }
+	unsigned int	ParentId() const { return id; }
+	const char *Name() const { return name; }
+};
+
+#endif // ZM_GROUP_H