Changeset 36784

Timestamp:

May 27, 2014, 10:26:50 AM (12 years ago)

Author:

bills

Message:

changes from production tag

Location:

trunk/pstamp/scripts

Files:

• pstamp_finish.pl (modified) (1 diff, 1 prop)
• pstampparse.pl (modified) (1 diff, 1 prop)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -211 +211 @@
                         chomp $line;
                         my ($img_name, $reported_size, $reported_sum, $filetype) = split '\|', $line;
-                        # ... instead let dsreg compute the paramters by leaving them blank
-                        print $rlf "$img_name|||$filetype|\n";
+                        my $use_supplied_size = 1;
+                        if ($use_supplied_size) {
+                            print $rlf "$img_name|$reported_size|$reported_sum|$filetype|\n";
+                        } else {
+                            # ... instead let dsreg compute the paramters by leaving them blank
+                            print $rlf "$img_name|||$filetype|\n";
+                        }
 
                         # add line to the table definition file

trunk/pstamp/scripts/pstampparse.pl

@@ -182 +182 @@
         $label = 'NCU';
         $label_changed = 1;
-    } elsif (($lcname =~ /mpe_/) or ($lcname =~ /sd_/)) {
+    } elsif (($lcname =~ /mpe_/) or ($lcname =~ /sd_/) or ($lcname =~ /^jk/)) {
         $label = 'MPE';
         $label_changed = 1;