store IDS data as text file instead of perl script.

[chise/perl.git] / Chise_utils / Chise_utils.pm

diff --git a/Chise_utils/Chise_utils.pm b/Chise_utils/Chise_utils.pm
index 257f27a..a044631 100644 (file)
--- a/Chise_utils/Chise_utils.pm
+++ b/Chise_utils/Chise_utils.pm
@@ -1,6 +1,6 @@
 package Chise_utils;
 
-require 5.005;
+require 5.008;
 use strict;
 use warnings;
 
@@ -8,10 +8,11 @@ require Exporter;
 
 use utf8;
 use BerkeleyDB;
-use vars qw(%db %chardb
-           %reverse_db %reverse_chardb
+use vars qw(%db %chardb %db_opened
+           %reverse_db %reverse_chardb %rdb_opened
            %er_alias $er_prefix_re
            $atr $idc
+           $omegadb_path
        );
 
 our @ISA = qw(Exporter);
@@ -28,6 +29,7 @@ our %EXPORT_TAGS = ( 'all' => [ qw(
                                   %reverse_db %reverse_chardb
                                   $idc
                                   %er_alias $er_prefix_re
+                                  $omegadb_path
                                   &get_db
                                   &get_reverse_db
                                   &get_char_attribute
@@ -42,14 +44,35 @@ our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 
 our @EXPORT = qw(
 );
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 
 # Preloaded methods go here.
 
+$omegadb_path="";
+unless($omegadb_path){
+    if(-w '/usr/local/share/chise/omega'){
+       $omegadb_path='/usr/local/share/chise/omega';
+    }elsif(-w '/usr/share/chise/omega'){
+       $omegadb_path='/usr/share/chise/omega';
+    }elsif(-w '/sw/share/chise/omega'){
+       $omegadb_path='/sw/share/chise/omega';
+    }elsif(-w '/usr/local/lib/chise/omega'){
+       $omegadb_path='/usr/local/lib/chise/omega';
+    }else{
+       $omegadb_path=".";
+    }
+}
+
 my $DB_HOME="";
 unless($DB_HOME){
-    if(-e '/usr/local/lib/chise/chise-db'){
+    if(-e '/usr/local/share/chise/0.3/db'){
+       $DB_HOME='/usr/local/share/chise/0.3/db';
+    }elsif(-e '/usr/share/chise/0.3/db'){
+       $DB_HOME='/usr/share/chise/0.3/db';
+    }elsif(-e '/sw/share/chise/0.3/db'){
+       $DB_HOME='/sw/share/chise/0.3/db';
+    }elsif(-e '/usr/local/lib/chise/chise-db'){
        $DB_HOME='/usr/local/lib/chise/chise-db';
     }elsif(-e '/usr/lib/chise/chise-db'){
        $DB_HOME='/usr/lib/chise/chise-db';
@@ -136,10 +159,15 @@ if(-d "$DB_HOME/character"){
 
 sub get_db{
     my($atr)=@_;
-    return 1 if(defined(%{$chardb{$atr}}));
+    return 1 if($db_opened{$atr});
     if(defined($db{$atr}) and -f $db{$atr}){
-       tie %{$chardb{$atr}}, "BerkeleyDB::Hash",
-       -Filename => $db{$atr};
+       if(tie %{$chardb{$atr}}, 'BerkeleyDB::Hash',
+          -Filename => $db{$atr},
+          -Flags => DB_RDONLY){
+           $db_opened{$atr}=1;
+       }else{
+           return undef;
+       }
     }else{
        return undef;
     }
@@ -147,10 +175,15 @@ sub get_db{
 
 sub get_reverse_db{
     my($atr)=@_;
-    return 1 if(defined(%{$reverse_chardb{$atr}}));
+    return 1 if($rdb_opened{$atr});
     if(defined($reverse_db{$atr}) and -f $reverse_db{$atr}){
-       tie %{$reverse_chardb{$atr}}, "BerkeleyDB::Hash",
-       -Filename => $reverse_db{$atr};
+       if(tie %{$reverse_chardb{$atr}}, "BerkeleyDB::Hash",
+          -Filename => $reverse_db{$atr},
+          -Flags => DB_RDONLY){
+           $rdb_opened{$atr}=1;
+       }else{
+           return undef;
+       }
     }else{
        return undef;
     }
@@ -159,9 +192,13 @@ sub get_reverse_db{
 
 sub get_char_attribute{
     my($char,$atr)=@_;
-    &get_db($atr) or return "";
-    if($chardb{$atr}->{"?$char"}){
-       return $chardb{$atr}->{"?$char"};
+    my($res);
+    unless($db_opened{$atr}){
+       &get_db($atr) or return "";
+    }
+    if($res=$chardb{$atr}->{"?$char"}){
+       utf8::decode($res);
+       return $res;
     }else{
        return "";
     }
@@ -170,13 +207,16 @@ sub get_char_attribute{
 sub get_chars_containing{
     my($atr,$value)=@_;
     my($char,@res);
-    if(&get_db($atr)){
-       foreach $char (keys %{$chardb{$atr}}){
-           if($chardb{$atr}->{$char}=~/$value/){
-               $char=~s/^\?//;
-               push @res,$char;
-           }
-       }
+    unless($db_opened{$atr}){
+       &get_db($atr) or return ();
+    }
+    utf8::encode($value);
+    foreach $char (keys %{$chardb{$atr}}){
+       if($chardb{$atr}->{$char}=~/$value/){
+           utf8::decode($char);
+             $char=~s/^\?//;
+             push @res,$char;
+         }
     }
     return @res;
 }
@@ -185,24 +225,29 @@ sub get_chars_matching{
     my($atr,$value)=@_;
     my($char,@res);
     if(defined($reverse_db{$atr})){
-       if(&get_reverse_db($atr)){
-           if($char=$reverse_chardb{$atr}->{$value}){
-               $char=~s/^\?//;
-               push @res,$char;
-           }
+       unless($rdb_opened{$atr}){
+           &get_reverse_db($atr) or return ();
        }
+       utf8::encode($value);
+       if($char=$reverse_chardb{$atr}->{$value}){
+           utf8::decode($char);
+             $char=~s/^\?//;
+             push @res,$char;
+         }
     }
     else{
 #   never fall back.
 #    unless(@res){
 #    # fall back if DB inconsistency exists.
-       if(&get_db($atr)){
-           foreach $char (keys %{$chardb{$atr}}){
-               if($chardb{$atr}->{$char} eq $value){
-                   $char=~s/^\?//;
-                   push @res,$char;
-               }
-           }
+       unless($db_opened{$atr}){
+           &get_db($atr) or return ();
+       }
+       foreach $char (keys %{$chardb{$atr}}){
+           if($chardb{$atr}->{$char} eq $value){
+               utf8::decode($char);
+                 $char=~s/^\?//;
+                 push @res,$char;
+             }
        }
     }
     return @res;