rough in generic object, using some similar syntax to dbix

scripts/ZoneMinder/lib/ZoneMinder/Object.pm

@@ -0,0 +1,163 @@
+# ==========================================================================
+#
+# ZoneMinder Object Module, $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.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Object;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+require ZoneMinder::Base;
+
+our @ISA = qw(Exporter ZoneMinder::Base);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration   use ZoneMinder ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = (
+    'functions' => [ qw(
+    ) ]
+);
+push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw();
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use POSIX;
+
+use vars qw/ $table $primary_key /;
+
+sub table {
+	$table = $_[1];
+}
+
+sub primary_key {
+	$primary_key = $_[1];
+}
+
+sub new {
+    my ( $parent, $id, $data ) = @_;
+
+	my $self = {};
+	bless $self, $parent;
+	if ( ( $$self{$primary_key} = $id ) or $data ) {
+#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
+		$self->load( $data );
+	}
+	return $self;
+} # end sub new
+
+sub load {
+	my ( $self, $data ) = @_;
+	my $type = ref $self;
+	if ( ! $data ) {
+		if ( ! $$self{$primary_key} ) { 
+			my ( $caller, undef, $line ) = caller;
+			Error( (ref $self) . "::load called without $primary_key from $caller:$line");
+		} else {
+	#$log->debug("Object::load Loading from db $type");
+			$data = $ZoneMinder::Database::dbh->selectrow_hashref( "SELECT * FROM $table WHERE $primary_key=?", {}, $$self{$primary_key} );
+			if ( ! $data ) {
+				if ( $ZoneMinder::Database::dbh->errstr ) {
+					Error( "Failure to load Object record for $$self{$primary_key}: Reason: " . $ZoneMinder::Database::dbh->errstr );
+				} # end if
+			} # end if
+		} # end if
+	} # end if ! $data
+	if ( $data and %$data ) {
+		@$self{keys %$data} = values %$data;
+	} # end if
+} # end sub load
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Object;
+  
+  This package should likely not be used directly, as it is meant mainly to be a parent for all other ZoneMinder classes.
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut

scripts/ZoneMinder/lib/ZoneMinder/Storage.pm

@@ -31,7 +31,7 @@ use warnings;
 require Exporter;
 require ZoneMinder::Base;
 
-our @ISA = qw(Exporter ZoneMinder::Base);
+our @ISA = qw(Exporter ZoneMinder::Object);
 
 # Items to export into callers namespace by default. Note: do not export
 # names by default without a very good reason. Use EXPORT_OK instead.
@@ -64,34 +64,8 @@ use ZoneMinder::Database qw(:all);
 
 use POSIX;
 
-sub new {
+__PACKAGE__->table('Storage');
-    my ( $parent, $id, $data ) = @_;
+__PACKAGE__->primary_key('Id');
-
-	my $self = {};
-	bless $self, $parent;
-	if ( ( $$self{Id} = $id ) or $data ) {
-#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
-		$self->load( $data );
-	}
-	return $self;
-} # end sub new
-
-sub load {
-	my ( $self, $data ) = @_;
-	my $type = ref $self;
-	if ( ! $data ) {
-#$log->debug("Object::load Loading from db $type");
-		$data = $ZoneMinder::Database::dbh->selectrow_hashref( 'SELECT * FROM Storage WHERE Id=?', {}, $$self{Id} );
-		if ( ! $data ) {
-			if ( $ZoneMinder::Database::dbh->errstr ) {
-				Error( "Failure to load Storage record for $$self{id}: Reason: " . $ZoneMinder::Database::dbh->errstr );
-			} # end if
-		} # end if
-	} # end if ! $data
-	if ( $data and %$data ) {
-		@$self{keys %$data} = values %$data;
-	} # end if
-} # end sub load
 
 sub find {
     shift if $_[0] eq 'ZoneMinder::Storage';