X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXXml.pm;h=968b6148cf04f48d60e3564bd1292891eec19e37;hb=af378e74088394d9c70a9a01d67a311cf4774d96;hp=c6c8ee6922835d3c160789544878f30c1be61c0d;hpb=c134d6e811bd0e40ae18cdba9b4941f747c48aaf;p=spider.git

diff --git a/perl/DXXml.pm b/perl/DXXml.pm
index c6c8ee69..968b6148 100644
--- a/perl/DXXml.pm
+++ b/perl/DXXml.pm
@@ -9,18 +9,34 @@
 use strict;
 
 package DXXml;
+use IsoTime;
 
-use DXChannel;
 use DXProt;
+use DXDebug;
+use DXLog;
+use DXXml::Ping;
+use DXXml::Dx;
 
-use vars qw($VERSION $BRANCH $xs);
+use vars qw($VERSION $BRANCH $xs $id);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-$xs = undef;							# the XML::Simple parser instance
+$xs = undef;					# the XML::Simple parser instance
+$id = 0;						# the next ID to be used
 
+# generate a new XML sentence structure 
+sub new
+{
+	my $pkg = shift;
+	my $class = ref $pkg || $pkg;
+	return bless{@_}, $class;
+}
+
+#
+# note that this a function not a method
+#
 sub init
 {
 	return unless $main::do_xml;
@@ -34,13 +50,79 @@ sub init
 	undef $@;
 }
 
+#
+# note that this a function not a method
+#
 sub normal
 {
+	my $dxchan = shift;
+	my $line = shift;
+
+	unless ($main::do_xml) {
+		dbg("xml not enabled, IGNORED") if isdbg('chanerr');
+		return;
+	}
+	
+	my ($rootname) = $line =~ '<(\w+) ';
+	my $pkg = "DXXml::" . ucfirst lc "$rootname";
+
+	unless (defined *{"${pkg}::"} && $pkg->can('handle_input')) {
+		dbg("xml sentence $rootname not recognised, IGNORED") if isdbg('chanerr');
+		return;
+	}
+		
+	my $xref;
+	unless ($xref = $pkg->decode_xml($dxchan, $line))  {
+		dbg("invalid XML ($@), IGNORED") if isdbg('chanerr');
+		undef $@;
+		return;
+	}
+	
+	# mark the handle as accepting xml (but only if they 
+	# have at least one right)
+	$dxchan->handle_xml(1);
 
+	$xref = bless $xref, $pkg;
+	$xref->{'-xml'} = $line; 
+	$xref->handle_input($dxchan);
 }
 
+#
+# note that this a function not a method
+#
 sub process
 {
 
 }
+
+sub decode_xml
+{
+	my $pkg = shift;
+	my $dxchan = shift;
+	my $line = shift;
+
+	my $xref;
+	eval {$xref = $xs->XMLin($line)};
+	return $xref;
+}
+
+sub nextid
+{
+	my $r = $id++;
+	$id = 0 if $id > 999;
+	return $r;
+}
+
+sub toxml
+{
+	my $self = shift;
+
+	$self->{o} ||= $main::mycall;
+	$self->{t} ||= IsoTime::dayms();
+	$self->{id} ||= nextid();
+
+	my ($name) = ref $self =~ /::(\w+)$/;
+	my $s = $xs->XMLout($self, RootName =>$name, NumericEscape=>1);
+	return $self->{'-xml'} = $s;
+}
 1;