X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fdx.pl;h=c98699969ad095cc4518eab077ee5bf936009821;hb=8942c27356acc5d5f5a20134461bcf7e6bd6a044;hp=e3d3aed284a3fdd4431830e158314355c9acfd4e;hpb=e5b0e3dee551a224de284a5ba550098256fcb268;p=spider.git

diff --git a/cmd/show/dx.pl b/cmd/show/dx.pl
index e3d3aed2..c9869996 100644
--- a/cmd/show/dx.pl
+++ b/cmd/show/dx.pl
@@ -5,7 +5,7 @@
 #
 
 my ($self, $line) = @_;
-my @list = split /\s+/, $line;		      # split the line up
+my @list = split /\s+/, $line;	# split the line up
 
 my @out;
 my $f;
@@ -19,98 +19,97 @@ my $spotter;
 my $info;
 my $expr;
 
-while ($f = shift @list) {                 # next field
-  print "f: $f list: ", join(',', @list), "\n";
-  if (!$from && !$to) {
-    ($from, $to) = $f =~ /^(\d+)-(\d+)$/o;         # is it a from -> to count?
-    next if $from && $to > $from;
-  }
-  if (!$to) {
-    ($to) = $f =~ /^(\d+)$/o if !$to;              # is it a to count?
-    next if $to;
-  }
-  if (lc $f eq 'on' && $list[0]) {                  # is it freq range?
-    print "yup freq\n";
-    my @r = split '/', $list[0];
-	print "r0: $r[0] r1: $r[1]\n";
-	@freq = Bands::get_freq($r[0], $r[1]);
-	if (@freq) {                 # yup, get rid of extranous param
-	  print "freq: ", join(',', @freq), "\n";
-	  shift @list;
-	  next;
+while ($f = shift @list) {		# next field
+	#  print "f: $f list: ", join(',', @list), "\n";
+	if (!$from && !$to) {
+		($from, $to) = $f =~ /^(\d+)-(\d+)$/o; # is it a from -> to count?
+		next if $from && $to > $from;
+	}
+	if (!$to) {
+		($to) = $f =~ /^(\d+)$/o if !$to; # is it a to count?
+		next if $to;
+	}
+	if (lc $f eq 'on' && $list[0]) { # is it freq range?
+		#    print "yup freq\n";
+		my @r = split '/', $list[0];
+			# print "r0: $r[0] r1: $r[1]\n";
+		my @fr = Bands::get_freq($r[0], $r[1]);
+		if (@fr) {			# yup, get rid of extranous param
+			#	  print "freq: ", join(',', @fr), "\n";
+			shift @list;
+			push @freq, @fr;    # add these to the list
+			next;
+		}
+	}
+	if (lc $f eq 'day' && $list[0]) {
+		#   print "got day\n";
+		($fromday, $today) = split '-', shift(@list);
+		next;
+	}
+	if (lc $f eq 'info' && $list[0]) {
+		#   print "got info\n";
+		$info = shift @list;
+		next;
+	}
+	if ((lc $f eq 'spotter' || lc $f eq 'by') && $list[0]) {
+		#    print "got spotter\n";
+		$spotter = uc shift @list;
+		next;
+	}
+	if (!$pre) {
+		$pre = uc $f;
 	}
-  }
-  if (lc $f eq 'day' && $list[0]) {
-    print "got day\n";
-    ($fromday, $today) = split '-', shift(@list);
-	next;
-  }
-  if (lc $f eq 'info' && $list[0]) {
-    print "got info\n";
-	$info = shift @list;
-	next;
-  }
-  if (lc $f eq 'spotter' && $list[0]) {
-    print "got spotter\n";
-	$spotter = uc shift @list;
-	next;
-  }
-  if (!$pre) {
-    $pre = uc $f;
-  }
 }
 
 # first deal with the prefix
 if ($pre) {
-  $expr = "\$f1 =~ /";
-  $pre =~ s|/|\\/|;          # change the slashes to \/ 
-  if ($pre =~ /^\*/o) {
-    $pre =~ s/^\*//;;
-    $expr .= "$pre\$/o";
-  } else {
-	$expr .= "^$pre/o";
-  }
+	$expr = "\$f1 =~ /";
+	$pre =~ s|/|\\/|;			# change the slashes to \/ 
+	if ($pre =~ /^\*/o) {
+		$pre =~ s/^\*//;;
+		$expr .= "$pre\$/o";
+	} else {
+		$expr .= "^$pre/o";
+	}
 } else {
-  $expr = "1";             # match anything
+	$expr = "1";				# match anything
 }
   
 # now deal with any frequencies specified
 if (@freq) {
-  $expr .= ($expr) ? " && (" : "(";
-  my $i;
-  for ($i; $i < @freq; $i += 2) {
-    $expr .= "(\$f0 >= $freq[0] && \$f0 <= $freq[1]) ||";
-  }
-  chop $expr;
-  chop $expr;
-  $expr .= ")";
+	$expr .= ($expr) ? " && (" : "(";
+	my $i;
+	for ($i = 0; $i < @freq; $i += 2) {
+		$expr .= "(\$f0 >= $freq[$i] && \$f0 <= $freq[$i+1]) ||";
+	}
+	chop $expr;
+	chop $expr;
+	$expr .= ")";
 }
 
 # any info
 if ($info) {
-  $expr .= " && " if $expr;
-  $info =~ s|/|\\/|;
-  $expr .= "\$f3 =~ /$info/io";
+	$expr .= " && " if $expr;
+	$info =~ s|/|\\/|;
+	$expr .= "\$f3 =~ /$info/io";
 }
 
 # any spotter
 if ($spotter) {
-  $expr .= " && " if $expr;
-  $spotter =~ s|/|\\/|;
-  $expr .= "\$f4 =~ /$spotter/o";
+	$expr .= " && " if $expr;
+	$spotter =~ s|/|\\/|;
+	$expr .= "\$f4 =~ /$spotter/o";
 }
 
-print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
+#print "expr: $expr from: $from to: $to fromday: $fromday today: $today\n";
   
 # now do the search
 my @res = Spot::search($expr, $fromday, $today, $from, $to);
 my $ref;
 my @dx;
 foreach $ref (@res) {
-  @dx = @$ref;
-  my $t = ztime($dx[2]);
-  my $d = cldate($dx[2]);
-  push @out, sprintf "%9s %-12s %s %s %-28s <%s>", $dx[0], $dx[1], $d, $t, $dx[3], $dx[4];
+	@dx = @$ref;
+	push @out, Spot::formatl(@dx);
 }
 
 return (1, @out);