Changeset 27840 for branches/simtest_nebulous_branches/ippScripts/scripts/ipp_image_path.pl

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/ipp_image_path.pl (modified) (4 diffs)

branches/simtest_nebulous_branches/ippScripts/scripts/ipp_image_path.pl

@@ -19 +19 @@
 use PS::IPP::Metadata::Config;
 use PS::IPP::Config 1.01 qw( :standard );
+use Nebulous::Client;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
 
-my ($exp_name, $class_id, $from_registered, $dbname, $verbose);
+my ($exp_name, $class_id, $from_registered, $dbname, $verbose, $alternate);
 
 GetOptions(
@@ -31 +32 @@
     'dbname|d=s'    => \$dbname, # Database name    
     'verbose'       => \$verbose,   # Print to stdout
+    'alternate'     => \$alternate,
 ) or pod2usage( 2 );
 
@@ -99 +101 @@
                 $path = resolve_ipp008_file($uri);
             } elsif ($use_017_workaround && ($uri =~ /4683/) &&
-                    ($uri =~ /ipp017/)) {
+                     ($uri =~ /ipp017/)) {
                 $path = resolve_ipp017_file($uri);
-            } else {
+            } elsif ($alternate) {
+                my $neb = $ipprc->nebulous();
+                my $uris = $neb->find_instances($uri,'any');
+                my @files = map {URI->new($_)->file if $_} @$uris;
+
+                if ($#files > 0) {
+                    $path = $files[1];
+                }
+                else {
+                    $path = $files[0];
+                }
+
+            }
+            else {
                 $path = $ipprc->file_resolve($uri);
             }
@@ -108 +123 @@
             # remove the leading "file://" if present
             $path =~ s/^file\:\/\///;
+            $nfiles++;
+            print "$path\n";
         }
-        $nfiles++;
-        print "$path\n";
     }
     if (!$nfiles) {