Changeset 13826

Timestamp:

Jun 13, 2007, 6:03:39 PM (19 years ago)

Author:

Paul Price

Message:

Need to fix filter for finding matches when there's square brackets in
it --- they need to be escaped in the string.

File:

• trunk/ippScripts/scripts/warp_overlap.pl (modified) (5 diffs)

trunk/ippScripts/scripts/warp_overlap.pl

@@ -129 +129 @@
             my $fileLevel = $imfile->{filelevel};
             my $entry = "";
-            if ($fileLevel eq "chip") {
+            if (lc($fileLevel) eq "chip") {
                 my $class_id = $imfile->{class_id};
                 my $chipRoot = $ipprc->file_resolve( $imfile->{chip_path_base} );
@@ -136 +136 @@
                 print STDERR "class: $class_id, chiproot: $chipRoot, extname: $extname\n";
                 
-                $entry = "$psastroRootFile\[$extname\]";
+                $entry = $psastroRootFile . '\[' . $extname . '\]';
             } else {
                 $entry = "$psastroRootFile";
             }
+
             my @skycells = &select_skycells ($entry, @matchlist);
             foreach my $skycell (@skycells) {
@@ -150 +151 @@
                 push @overlaps, \%overlap;
                 
-                printf STDERR "overlap: %s : %s\n", $skycell, $imfile->{cam_id};
+                printf STDERR "overlap: %s : %s , %s\n", $skycell, $imfile->{cam_id}, $imfile->{class_id};
                 
                 # generate a unique list of the skycells
@@ -204 +205 @@
 close $overlapFile;
 
+system "cat $overlapName";
+
 # Add the processed file to the database
 unless ($no_update) {
@@ -232 +235 @@
 sub select_skycells 
 {
-    my $entry = shift;
-    my @list = @_;
-
-    my $skycell;
+    my $entry = shift;          # File+Ext to search for
+    my @list = @_;              # List of "File+Ext : skycell"
+
     my @skycells = ();
 
     foreach my $line (@list) {
         if ($line =~ m|$entry|) {
-            ($skycell) = $line =~ m|$entry\S*\s+:\s+(\S+)|;
+            my ($skycell) = $line =~ m|$entry\S*\s+:\s+(\S+)|;
             push @skycells, $skycell;
         }