X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=a219c387b178556cd413ef2cbe19469f3b2b3295;hb=fc8ec20708a70b6297d3c8b8c35b1086c6018cbb;hp=171b5efd78e7fbc86471810007cad1ec0eb4ff5b;hpb=74a756eeda9aaf5732589bea9dd75371b0cb35e0;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index 171b5efd..a219c387 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -27,14 +27,16 @@ my $state;
 my $bystate;
 my $itu;
 my $byitu;
-my $fromdxcc;
+my $fromdxcc = 0;
 my $exact;
+my $origin;
+my $ip;
 my ($doqsl, $doiota, $doqra, $dofilter);
 
 my $usesql = $main::dbh && $Spot::use_db_for_search;
 
 while ($f = shift @list) {		# next field
-	#  print "f: $f list: ", join(',', @list), "\n";
+	dbg "arg: $f list: " . join(',', @list) if isdbg('shdx');
 	if (!$from && !$to) {
 		($from, $to) = $f =~ m|^(\d+)[-/](\d+)$|; # is it a from -> to count?
 		next if $from && $to > $from;
@@ -56,17 +58,19 @@ while ($f = shift @list) {		# next field
 		next;
 	}
 	if (lc $f eq 'on' && $list[0]) { # is it freq range?
-		#    print "yup freq\n";
-		if ($list[0] =~ m|^(\d+)(?:\.\d+)?[-/](\d+)(?:\.\d+)?$|) {
-			push @freq, $1, $2;
+		dbg "freq $list[0]" if isdbg('shdx');
+		if (my ($from, $to) = $list[0] =~ m|^(\d+)(?:\.\d+)?(?:[-/](\d+)(?:\.\d+)?)?$|) {
+			$to = $from unless defined $to;
+			dbg "freq '$from' '$to'" if isdbg('shdx');
+			push @freq, $from, $to;
 			shift @list;
 			next;
 		} else {
 			my @r = split '/', lc $list[0];
-			# print "r0: $r[0] r1: $r[1]\n";
+			dbg "r0: $r[0] r1: $r[1]" if isdbg('shdx');
 			my @fr = Bands::get_freq($r[0], $r[1]);
 			if (@fr) {			# yup, get rid of extranous param
-				#	  print "freq: ", join(',', @fr), "\n";
+				dbg "freq: " . join(',', @fr) if isdbg('shdx');
 				push @freq, @fr;    # add these to the list
 				shift @list;
 				next;
@@ -74,22 +78,33 @@ while ($f = shift @list) {		# next field
 		}
 	}
 	if (lc $f eq 'day' && $list[0]) {
-		#   print "got day\n";
 		($fromday, $today) = split m|[-/]|, shift(@list);
+		dbg "got day $fromday/$today" if isdbg('shdx');
 		next;
 	}
 	if (lc $f eq 'info' && $list[0]) {
-		#   print "got info\n";
 		$info = shift @list;
+		dbg "got info $info" if isdbg('shdx');
 		next;
 	}
+	if (lc $f eq 'origin' && $list[0]) {
+		$origin = uc shift @list;
+		dbg "got origin $origin" if isdbg('shdx');
+		next;
+	}
+	if (lc $f eq 'ip' && $list[0]) {
+		$ip = shift @list;
+		dbg "got ip $ip" if isdbg('shdx');
+		next;
+	}
+
 	if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
-		#    print "got spotter\n";
 		$spotter = uc shift @list;
 		if ($list[0] && lc $list[0] eq 'dxcc') {
 			$fromdxcc = 1;
 			shift @list;
 		}
+		dbg "got spotter $spotter fromdxcc $fromdxcc" if isdbg('shdx');
 		next;
 	}
 	if (lc $f =~ /^filt/) {
@@ -148,7 +163,24 @@ while ($f = shift @list) {		# next field
 
 #$DB::single = 1;
 
-# first deal with the prefix
+# check origin
+if ($origin) {
+	$expr .= ' && ' if $expr;
+	$expr .= "\$f7 eq '$origin'";
+	$hint .= ' && ' if $hint;
+	$hint .= "m{$origin}";
+}
+
+# check (any) ip address
+if ($ip) {
+	$expr .= ' && ' if $expr;
+	$expr .= "\$f14 && \$f14 =~ m{^$ip}";
+	$hint .= ' && ' if $hint;
+	$ip =~ s/\./\\./g;			# IPV4
+	$hint .= "m{$ip}";
+}
+
+#  deal with the prefix
 if ($pre) {
 	my @ans;
 	
@@ -216,7 +248,7 @@ if (@freq) {
 # any info
 if ($info) {
 	$expr .= ' && ' if $expr;
-	$info =~ s{(.)}{"\Q$1"}ge;
+#	$info =~ s{(.)}{"\Q$1"}ge;
 	$expr .= "\$f3 =~ m{$info}i";
 	$hint .= ' && ' if $hint;
 	$hint .= "m{$info}i";
@@ -380,7 +412,12 @@ if ($doqra) {
 	$hint .= "m{$doqra}io";
 }
 
-#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
+$from ||= '';
+$to ||= '';
+$fromday ||= '';
+$today ||= '';
+
+dbg "expr: $expr from: $from to: $to fromday: $fromday today: $today" if isdbg('sh/dx');
   
 # now do the search
 my @res = Spot::search($expr, $fromday, $today, $from, $to, $hint, $dofilter ? $self : undef);