Changeset 17604 for trunk/ippScripts/scripts/ipp_inject_fileset.pl

Timestamp:

May 9, 2008, 11:04:07 AM (18 years ago)

Author:

eugene

Message:

rationalize workdir, tess_id, and dvodb

File:

• trunk/ippScripts/scripts/ipp_inject_fileset.pl (modified) (3 diffs)

trunk/ippScripts/scripts/ipp_inject_fileset.pl

@@ -51 +51 @@
 my $pxinject = can_run('pxinject') or die "Can't find pxinject\n";
 
+# tess_id needs to be an absolute path, or it must start with file://, path://, or neb://
+if ($tess_id) {
+    $tess_id = &fixpath ($tess_id);
+}
+
+# dvodb needs to be an absolute path, or it must start with file://, path://, or neb://
+if ($dvo_db) {
+    $dvo_db = &fixpath ($dvo_db);
+}
+
 # workdir needs to be an absolute path, or it must start with file://, path://, or neb://
 if ($workdir) {
-    my $valid = 0;
-    $valid |= ($workdir =~ m|^file://|);
-    $valid |= ($workdir =~ m|^path://|);
-    $valid |= ($workdir =~ m|^neb://|);
-    $valid |= ($workdir =~ m|^/|);
-
-    if (!$valid) {
-        $workdir = File::Spec->rel2abs( $workdir );
-        print "adjust workdir to $workdir\n";
-    }
+    $workdir = &fixpath ($workdir);
 }
 
@@ -104 +105 @@
 $command_exp .= " -workdir $workdir";
 $command_exp .= " -reduction $reduction" if defined $reduction;
-$command_exp .= " -dvo_db $dvo_db"       if defined $dvo_db;
+$command_exp .= " -dvodb $dvo_db"        if defined $dvo_db;
 $command_exp .= " -tess_id $tess_id"     if defined $tess_id;
 $command_exp .= " -end_stage $end_stage" if defined $end_stage;
@@ -160 +161 @@
 exit 0;
 
+sub fixpath {
+    my $path = shift;
+    my $valid = 0;
+    $valid |= ($path =~ m|^file://|);
+    $valid |= ($path =~ m|^path://|);
+    $valid |= ($path =~ m|^neb://|);
+    $valid |= ($path =~ m|^/|);
+
+    if (!$valid) {
+        $path = File::Spec->rel2abs( $path );
+    }
+    return $path;
+}
+
 __END__