Changeset 17669 for trunk/ippScripts/scripts/ipp_image_path.pl

Timestamp:

May 13, 2008, 4:18:40 PM (18 years ago)

Author:

bills

Message:

use file_resolve() to resolve nebulous paths since it's fixed now

File:

• trunk/ippScripts/scripts/ipp_image_path.pl (modified) (1 diff)

trunk/ippScripts/scripts/ipp_image_path.pl

@@ -77 +77 @@
         my ($scheme) = $uri =~/^(path|neb|file):/;
 
-        # XXX: I'd like to just use file_resolve but it doesn't currently
-        # work for nebulous paths
         if (!$scheme) {
             $path =  $uri;
         } else {
-            if (lc($scheme) ne "neb") {
-                $path = $ipprc->file_resolve($uri);
-            } else {
-                # use neb-locate
-                my $command = "$neb_locate $uri";
-                my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                    run(command => $command, verbose => $verbose);
-                unless ($success) {
-                    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                    warn ("Unable to run $command: $error_code");
-                    exit($error_code);
-                }
-                $path = "@$stdout_buf";
-                chomp $path;
-            }
+            $path = $ipprc->file_resolve($uri);
         }
         if ($path) {