fixed a regression of the Apache v1.1 that I introduced wieh the MPL v2

4 files changed, 6 insertions, 3 deletions

diff --git a/filter/criticalword.dict b/filter/criticalword.dict
index a966f55..a2228bf 100755
--- a/filter/criticalword.dict
+++ b/filter/criticalword.dict
@@ -128,4 +128,3 @@ suitability
 computer program whose purpose
 disclaims copyright
 software is covered
-2
diff --git a/matcher/rules.dict b/matcher/rules.dict
index 7d557d1..0fdb044 100644
--- a/matcher/rules.dict
+++ b/matcher/rules.dict
@@ -136,6 +136,7 @@ openSSLvar3:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,O
 Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdv,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,OpenSSLAck,BSDasIs,BSDWarr
 Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart1,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,BSDasIs,BSDWarr
 Apachev1.1:BSDpre,BSDcondSource,BSDcondBinary,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,BSDasIs,BSDWarr
+Apachev1.1:BSDpre,BSDcondSourceExtrict,BSDcondBinary,BSDcondAdvPart2,OpenSSLendorse,OpenSSLwritCond,OpenSSLName,BSDasIs,BSDWarr
 
 SleepyCat:BSDpre,BSDcondSource,BSDcondBinary,SleepyCatObtain,SleepyCatSourceIncluded,SleepyCatSourceComplete,SleepyCatDoesNotInclude,SleepyCatAsIs,BSDWarr
 
@@ -167,7 +168,7 @@ MPLv1_0:MPLv1_0
 NPLv1_0:NPLv1_0
 
 # version 2.0
-MPLv2:MPLv2part1,MPLv2part1a,MPLv2part2
+MPLv2:MPLv2part1,MPLv2part2
 
 #----------------------------------------------------------------------
 MITold:MITperm,MITnorep,MITasis
diff --git a/senttok/licensesentence.dict b/senttok/licensesentence.dict
index a84c944..887360c 100644
--- a/senttok/licensesentence.dict
+++ b/senttok/licensesentence.dict
@@ -373,7 +373,7 @@ MPL_LGPLsee:52:0:See the LGPL or the MPL for the specific language governing rig
 MPLandGPLnoDelete:52:0:If you do not delete the provisions above, a recipient can use your version of this file under either the MPL or the GPL:
 MPLandGPLv2:52:0:Alternatively, the contents of this file can be used under the terms of the GNU General Public License version 2 \(the <quotes>GPL<quotes>\), in which case the provisions of the GPL are applicable instead of the above:
 MPLcopy:52:0:You may obtain a copy of the License at http<color>//www.mozilla.org/MPL/:
-MPLv2part1:10:0:This Source Code Form is subject to the terms of the Mozilla Public License, v:
+MPLv2part1:10:0:^This Source Code Form is subject to the terms of the Mozilla Public License, v<dot> 2<dot>$0:
 # rather than trying to fight the splitter, then just just do as it wants
 MPLv2part1a:10:0:^2.0$:
 MPLv2part2:10:0:If a copy of the MPL was not distributed with this file, You can obtain one at http<colon>//mozilla.org/MPL/2.0/:
diff --git a/splitter/splitter.pl b/splitter/splitter.pl
index 67b1f08..a51b2f4 100755
--- a/splitter/splitter.pl
+++ b/splitter/splitter.pl
@@ -125,6 +125,9 @@ $text =~ s/\n(?!\n)/\t/g;
 $text =~ s/\n\n+/\n/g;
 $text .= "\n";
 
+# this gets us in big trouble... licenses that have numeric abbreviations
+$text =~ s/v\.\s+2\.0/v<dot> 2<dot>0/g;
+
 while ($text =~ /^([^\n]*)\n/gsm ) {
     my $curr = $1;
 #    print "<<$curr\n<<\n";