[subversion-commit] SVN tetex-base commit + diffs: r1434 - tetex-base/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-06-16 10:24:14 +0000 (Fri, 16 Jun 2006)
New Revision: 1434

Modified:
   tetex-base/trunk/debian/searchbase35
Log:
searchbase35 is now generalizable and can be fed with all information
about origins/usefullness we have gathered so far

Modified: tetex-base/trunk/debian/searchbase35
===================================================================
--- tetex-base/trunk/debian/searchbase35	2006-06-15 18:30:52 UTC (rev 1433)
+++ tetex-base/trunk/debian/searchbase35	2006-06-16 10:24:14 UTC (rev 1434)
@@ -24,7 +24,7 @@
   Title => "%% Required PSNFSS fonts",
   Pattern => "urw/base35|lw35nfs|freenfss|charter/bch",
   Filename =>"psnfss-required.txt",
-  ListName => "",
+  ListName => "required",
   Comment => 
 "% These files are required for psnfss
 % according to its file 00readme.txt"
@@ -98,9 +98,9 @@
 my %CTANbyname = map { basename($_), $_ } @CTANbyname;
 
 
-my %AllFilesList; # a hash containing references to the lists
-my %SortedFilesList;
-my %RestFileList;
+my %AllFilesList; # a hash containing references to the lists, by font
+my %SortedFilesList; # a hash containing references to files sorted by origin (and font)
+my %RestFileList; # by font
 
 # functions
 sub getLicensePerArchive {
@@ -202,15 +202,15 @@
   my $font = $_[0];
 
   @{$RestFileList{$font}} = @{$AllFilesList{$font}};
-  foreach $category (@categories) {
+  foreach my $category (@categories) {
     # push each matching line onto the category's list
     foreach (@{$RestFileList{$font}}) {
-      push @{$RequiredFilesList{$font}},$_ if ( m($psnfssRequired{Pattern}) );
+      push @{$SortedFilesList{${$category}{ListName}}{$font}},$_ if ( m(${$category}{Pattern}) );
     }
     
     # now note which lines are in both lists
     my %HowOftenHash = ();
-    foreach my $line ( @{$RestFileList{$font}}, @{$RequiredFilesList{$font}} ) { 
+    foreach my $line ( @{$RestFileList{$font}}, @{$SortedFilesList{${$category}{ListName}}{$font}} ) { 
       $HowOftenHash{$line}++ 
     };
 
@@ -237,7 +237,7 @@
   print OUTLIST "\n" . ${$category}{Comment} . "\n";
   foreach my $font ( @fontlist) {
     print OUTLIST "\n% files from $font:\n";
-    print OUTLIST @{$RequiredFilesList{$font}};
+    print OUTLIST @{$SortedFilesList{${$category}{ListName}}{$font}};
   };
   close OUTLIST;
   print "Wrote ${$category}{Filename}.\n"