X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDb.pm;h=0f30e5b05b423d31d698c0700b4c21353525e39f;hb=68d8a8f62c229b470cf341d0347a89f56aa6531b;hp=ab37f85291010d3ab951336a6a8d8b93dd1329af;hpb=1fcf24aae37e929a6b9c2dab9ca5afff00d8db57;p=spider.git

diff --git a/perl/DXDb.pm b/perl/DXDb.pm
index ab37f852..0f30e5b0 100644
--- a/perl/DXDb.pm
+++ b/perl/DXDb.pm
@@ -12,8 +12,7 @@ use DXVars;
 use DXLog;
 use DXUtil;
 use DB_File;
-
-use Carp;
+use DXDebug;
 
 use vars qw($opentime $dbbase %avail %valid $lastprocesstime $nextstream %stream);
 
@@ -21,12 +20,28 @@ $opentime = 5*60;				# length of time a database stays open after last access
 $dbbase = "$main::root/db";		# where all the databases are kept;
 %avail = ();					# The hash contains a list of all the databases
 %valid = (
-		  accesst => '9,Last Access Time,atime',
+		  accesst => '9,Last Accs Time,atime',
 		  createt => '9,Create Time,atime',
-		  lastt => '9,Last Update Time,atime',
+		  lastt => '9,Last Upd Time,atime',
 		  name => '0,Name',
 		  db => '9,DB Tied hash',
 		  remote => '0,Remote Database',
+		  pre => '0,Heading txt',
+		  post => '0,Tail txt',
+		  chain => '0,Search these,parray',
+		  disable => '0,Disabled?,yesno',
+		  nf => '0,Not Found txt',
+		  cal => '0,No Key txt',
+		  allowread => '9,Allowed read,parray',
+		  denyread => '9,Deny read,parray',
+		  allowupd => '9,Allow upd,parray',
+		  denyupd => '9,Deny upd,parray',
+		  fwdupd => '9,Forw upd to,parray',
+		  template => '9,Upd Templates,parray',
+		  te => '9,End Upd txt',
+		  tae => '9,End App txt',
+		  atemplate => '9,App Templates,parray',
+		  help => '0,Help txt,parray',
 		 );
 
 $lastprocesstime = time;
@@ -70,9 +85,8 @@ sub load
 # save all the database descriptors
 sub save
 {
-	my $date = cldatetime($main::systime);
-	
-	writefilestr($dbbase, "dbs", "pl", \%avail, "#\n# database descriptor file\n# Don't alter this by hand unless you know what you are doing\n# last modified $date\n#\n");
+	closeall();
+	writefilestr($dbbase, "dbs", "pl", \%avail);
 }
 
 # get the descriptor of the database you want.
@@ -85,7 +99,7 @@ sub getdesc
 
 	# search for a partial if not found direct
 	unless ($r) {
-		for (values %avail) {
+		for (sort { $a->{name} cmp $b->{name} }values %avail) {
 			if ($_->{name} =~ /^$name/) {
 				$r = $_;
 				last;
@@ -112,7 +126,8 @@ sub close
 {
 	my $self = shift;
 	if ($self->{db}) {
-		untie $self->{db};
+		undef $self->{db};
+		delete $self->{db};
 	}
 }
 
@@ -164,8 +179,10 @@ sub new
 	my $self = bless {};
 	my $name = shift;
 	my $remote = shift;
+	my $chain = shift;
 	$self->{name} = lc $name;
 	$self->{remote} = uc $remote if $remote;
+	$self->{chain} = $chain if $chain && ref $chain;
 	$self->{accesst} = $self->{createt} = $self->{lastt} = $main::systime;
 	$avail{$self->{name}} = $self;
 	mkdir $dbbase, 02775 unless -e $dbbase;
@@ -292,6 +309,14 @@ sub sendremote
 	$dxchan->send(DXProt::pc46($main::mycall, $tonode, $stream));
 }
 
+# print a value from the db reference
+sub print
+{
+	my $self = shift;
+	my $s = shift;
+	return $self->{$s} ? $self->{$s} : undef; 
+} 
+
 # various access routines
 
 #
@@ -322,6 +347,9 @@ sub AUTOLOAD
 	$name =~ s/.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+	# this clever line of code creates a subroutine which takes over from autoload
+	# from OO Perl - Conway
+	*{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
 	@_ ? $self->{$name} = shift : $self->{$name} ;
 }