name => $name,
extensions => \@extensions
};
- warn("Adding file association for $shortname\n");
+ warn("Adding file association for $shortname (".join(",",@extensions).")\n");
}
}
close(IN);
my $extensions = $a->{extensions};
my @extensions = @$extensions;
- for my $ext (@extensions) {
- $num++;
- }
+
+ # multiple extensions now all dealt with together since i4j 8.0.1
+ #for my $ext (@extensions) {
+ # $num++;
+ #}
+ $num++
+
#delete $all_associations{$shortname};
#print "NUM: $num\n";
}
$i4jentry =~ s/\$\$MIMETYPE\$\$/$xmimetype/g;
$i4jentry =~ s/\$\$ICONFILE\$\$/$xiconfile/g;
- my $unixext;
- for my $ext (sort @extensions) {
- if (not defined($unixext)) {
- $unixext = $ext;
- next;
- }
- if (length($ext) < length($unixext)) {
- $unixext = $ext;
- next;
- }
- }
+# multiple extensions now all dealt with together since i4j 8.0.1
+# my $unixext;
+# for my $ext (sort @extensions) {
+# if (not defined($unixext)) {
+# $unixext = $ext;
+# next;
+# }
+# if (length($ext) < length($unixext)) {
+# $unixext = $ext;
+# next;
+# }
+# }
+# for my $ext (@extensions) {
+# $i4jcount++;
+# #print "COUNT: $i4jcount\n";
+# my $progresspercent = int(($i4jcount/$num)*100);
+# #print "PC: $progresspercent\n";
+# $progresspercent = 100 if $progresspercent > 100;
+# my $xext = xml_escape($ext);
+# my $addunixextension = ($ext eq $unixext)?"true":"false";
+#
+# my $i4jextentry = $i4jentry;
+# $i4jextentry =~ s/\$\$ADDUNIXEXTENSION\$\$/$addunixextension/g;
+# $i4jextentry =~ s/\$\$EXTENSION\$\$/$xext/g;
+# $i4jextentry =~ s/\$\$PROGRESSPERCENT\$\$/$progresspercent/g;
+# $i4jextentry =~ s/\$\$ID\$\$/$id/g;
+# $id++;
+# $i4jextentry =~ s/\$\$ID1\$\$/$id/g;
+# $id++;
+# $i4jextentry =~ s/\$\$ID2\$\$/$id/g;
+# $id++;
+#
+# print IA $i4jextentry;
+# }
+
+ my $ext = join(",",sort(@extensions));
+ my $xdisplayext = xml_escape(join(", ", map(".$_",sort(@extensions))));
+ $i4jcount++;
+#print "COUNT: $i4jcount\n";
+ my $progresspercent = int(($i4jcount/$num)*100);
+#print "PC: $progresspercent\n";
+ $progresspercent = 100 if $progresspercent > 100;
+ my $xext = xml_escape($ext);
+ #my $addunixextension = ($ext eq $unixext)?"true":"false";
+ my $addunixextension = "true";
+
+ my $i4jextentry = $i4jentry;
+ $i4jextentry =~ s/\$\$ADDUNIXEXTENSION\$\$/$addunixextension/g;
+ $i4jextentry =~ s/\$\$EXTENSION\$\$/$xext/g;
+ $i4jextentry =~ s/\$\$DISPLAYEXTENSION\$\$/$xdisplayext/g;
+ $i4jextentry =~ s/\$\$PROGRESSPERCENT\$\$/$progresspercent/g;
+ $i4jextentry =~ s/\$\$ID\$\$/$id/g;
+ $id++;
+ $i4jextentry =~ s/\$\$ID1\$\$/$id/g;
+ $id++;
+ $i4jextentry =~ s/\$\$ID2\$\$/$id/g;
+ $id++;
+
+ print IA $i4jextentry;
- for my $ext (@extensions) {
- $i4jcount++;
- #print "COUNT: $i4jcount\n";
- my $progresspercent = int(($i4jcount/$num)*100);
- #print "PC: $progresspercent\n";
- $progresspercent = 100 if $progresspercent > 100;
- my $xext = xml_escape($ext);
- my $addunixextension = ($ext eq $unixext)?"true":"false";
-
- my $i4jextentry = $i4jentry;
- $i4jextentry =~ s/\$\$ADDUNIXEXTENSION\$\$/$addunixextension/g;
- $i4jextentry =~ s/\$\$EXTENSION\$\$/$xext/g;
- $i4jextentry =~ s/\$\$PROGRESSPERCENT\$\$/$progresspercent/g;
- $i4jextentry =~ s/\$\$ID\$\$/$id/g;
- $id++;
- $i4jextentry =~ s/\$\$ID1\$\$/$id/g;
- $id++;
- $i4jextentry =~ s/\$\$ID2\$\$/$id/g;
- $id++;
-
- print IA $i4jextentry;
- }
delete $all_associations{$shortname};
}