--- db/prgsrc/makeauthors.pl	2001/12/05 00:56:57	1.1
+++ db/prgsrc/makeauthors.pl	2005/12/10 00:03:55	1.7
@@ -1,5 +1,4 @@
-
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 =head1 NAME
 
@@ -24,13 +23,16 @@ makeauthors.pl
 
 use dbchgk;
 
+my $DUMPDIR = $ENV{DUMPDIR} || "../dump";
+
 do "chgk.cnf";
 use locale;
 use POSIX qw (locale_h);
 open NICKS, "<$nicksfile" or die "Can not open nicks";
 open SSNICKS, "<$ssnicksfile" or die "Can not open ssnicks";
-open UNKNOWN, ">uauthors";
-open STDERR, ">errors";
+open UNKNOWN, ">$DUMPDIR/uauthors";
+open UNICKS, ">$DUMPDIR/unicks";
+open STDERR, ">$DUMPDIR/errors";
   my ($thislocale);
   if ($^O =~ /win/i) {
 	$thislocale = "Russian_Russia.20866";
@@ -74,6 +76,7 @@ while (<NICKS>)
    $name{$nick}= ucfirst lc $name;
    $surname=ucfirst lc $surname;
    $surname=~s/\-(.)/"-". uc $1/ge;
+   $surname=~s/\'(.)/"'". uc $1/ge;
    $surname{$nick}= $surname;
    
 }
@@ -112,7 +115,7 @@ while (<AUTHORS>)
       ($number,$descr)=m/^(\d+)\s+(.*)$/g;
       $nick='unknown';
    }
-   $nick=~s/\s*$//;
+#   if ($nick=~s/\s*$//)
    $descr=~s/([\.\,\:\!\?])/$1 /g;
    $descr=~s/\\n/ /g;
    $descr=~s/^\s+//g;
@@ -131,8 +134,8 @@ while (<AUTHORS>)
 
 foreach $as(keys %unknick)
 {
-    print "$as \n ", (join "\n ", (grep {$nick{$_}=~/$as/} keys %nick));
-    print "\n";
+    print UNICKS "$as \n ", (join "\n ", (grep {$nick{$_}=~/$as/} keys %nick));
+    print UNICKS "\n";
 }
 
 %forbidden=checktable('equalto')? getequalto : ();
@@ -150,7 +153,7 @@ while (($QuestionId, $author)=getrow,$Qu
    $author=~s/\s+$//mg;
    $author=~s/\s+/ /mg;
    $author=uc $author;
-
+   $author=~s/£/Å/mg;
    if ($nick = $nick{$author}) 
    { 
       my @a=split ' ',$nick;