[MOBY-guts] biomoby commit

[Mark Wilkinson]

mwilkinson
Fri Apr 11 19:29:53 EDT 2008
Update of /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY
In directory dev.open-bio.org:/tmp/cvs-serv16850

Modified Files:
	Config.pm 
Log Message:
trying to make the configuration a class variable rather than an instance variable
moby-live/Perl/MOBY-Server/lib/MOBY Config.pm,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/Config.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/Config.pm	2008/02/21 00:21:27	1.1
+++ /home/repository/moby/moby-live/Perl/MOBY-Server/lib/MOBY/Config.pm	2008/04/11 23:29:53	1.2
@@ -50,11 +50,11 @@
 	#ATTRIBUTES
 	my %_attr_data =    #         DEFAULT    	ACCESSIBILITY
 	  (
-		mobycentral      => [ undef, 'read/write' ],
-		mobyobject       => [ undef, 'read/write' ],
-		mobynamespace    => [ undef, 'read/write' ],
-		mobyservice      => [ undef, 'read/write' ],
-		mobyrelationship => [ undef, 'read/write' ],
+		mobycentral      => [ [], 'read/write' ],
+		mobyobject       => [ [], 'read/write' ],
+		mobynamespace    => [ [], 'read/write' ],
+		mobyservice      => [ [], 'read/write' ],
+		mobyrelationship => [ [], 'read/write' ],
 		valid_secondary_datatypes => [["String", "Integer", "DateTime", "Float", "Boolean"],  'read'],
 		primitive_datatypes => [["String", "Integer", "DateTime", "Float", "Boolean"], 'read'],
 
@@ -99,6 +99,7 @@
 			$self->{$attrname} = $self->_default_for($attrname);
 		}
 	}
+	return $self if $self->mobycentral->{'dbname'};  # if it has been set, then just return it
 	my $file = $ENV{MOBY_CENTRAL_CONFIG};
 	( -e $file ) || die "MOBY Configuration file $file doesn't exist $!\n";
 	chomp $file;