Changeset 31083 for branches/eam_branches/ipp-20110213/ippScripts/scripts/register_imfile.pl

Timestamp:

Mar 30, 2011, 9:36:02 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20110213/ippScripts/scripts/register_imfile.pl (modified) (2 diffs)

branches/eam_branches/ipp-20110213/ippScripts/scripts/register_imfile.pl

@@ -267 +267 @@
 
 if ((abs($burntoolStateCurrent) != $burntoolStateTarget)&&
-    (!is_daytime($dateobs,$sunrise,$sunset))) {
+    (!is_daytime($dateobs,$sunrise,$sunset))&&
+    (!is_ccim($tmp_exp_name,$exp_type))) {
     my $mdcParser  = PS::IPP::Metadata::Config->new;
 
@@ -389 +390 @@
     my $exp_name = shift;
     my $exp_type = shift;
- 
+    $exp_type =~ s/'//g;
     # needs to match regtool.c checks for "is_ccim".
     if ($exp_name =~ /c/) {