Changeset 43099

Timestamp:

Sep 22, 2026, 3:14:54 PM (41 hours ago)

Author:

eugene

Message:

check that the selected TESS_ID and DVODB are defined in the site.config

File:

• branches/eam_branches/ipp-pstamp-20260421/ippScripts/scripts/ipp_inject_fileset.pl (modified) (1 diff)

branches/eam_branches/ipp-pstamp-20260421/ippScripts/scripts/ipp_inject_fileset.pl

@@ -53 +53 @@
 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 is not defined in the list of tessellations in ipprc,
+# then 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);
+    # test if tess_id is listed in the TESSELLATION metadata block
+    my $tess_dir = $ipprc->tessellation_catdir( $tess_id ); # Tessellation catdir for DVO
+    unless (defined $tess_dir) { die "configuration error"; }
+    if ($tess_dir eq $tess_id) {
+        # if $tess_dir matches $tess_id, it must be a filename, not a TESSELLATION entry
+        $tess_id = &fixpath ($tess_dir);
+    }
 }
 
 # dvodb needs to be an absolute path, or it must start with file://, path://, or neb://
 if ($dvo_db) {
-    $dvo_db = &fixpath ($dvo_db);
+    # test if dvo_db is listed in the DVO.CATDIRS metadata block
+    my $catdir = $ipprc->dvo_catdir( $dvo_db ); # catdirs for DVO
+    unless (defined $catdir) { die "configuration error"; }
+    if ($catdir eq $dvo_db) {
+        # if $catdir matches $dvo_db, it must be a filename, not a DVO.CATDIRS entry
+        $dvo_db = &fixpath ($catdir);
+    }
 }