X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=perl%2Flib%2FIDZebra.pm;h=1d2afaf81d07cf98ba313c92248d16542afa7cb5;hb=e505b6cf2a7f6821264d82cd2e8869b2be38d0b2;hp=08538421b17f543f4b262ab186c45e76936c2b9e;hpb=62aeae27f2897b54a14c6fe60da004f2f23bd2e8;p=idzebra-moved-to-github.git

diff --git a/perl/lib/IDZebra.pm b/perl/lib/IDZebra.pm
index 0853842..1d2afaf 100644
--- a/perl/lib/IDZebra.pm
+++ b/perl/lib/IDZebra.pm
@@ -23,6 +23,18 @@ sub FIRSTKEY { }
 
 sub NEXTKEY { }
 
+sub FETCH {
+    my ($self,$field) = @_;
+    my $member_func = "swig_${field}_get";
+    $self->$member_func();
+}
+
+sub STORE {
+    my ($self,$field,$newval) = @_;
+    my $member_func = "swig_${field}_set";
+    $self->$member_func($newval);
+}
+
 sub this {
     my $ptr = shift;
     return tied(%$ptr);
@@ -37,6 +49,8 @@ package IDZebra;
 *logLevel = *IDZebrac::logLevel;
 *logFile = *IDZebrac::logFile;
 *logMsg = *IDZebrac::logMsg;
+*logPrefix = *IDZebrac::logPrefix;
+*logPrefix2 = *IDZebrac::logPrefix2;
 *odr_createmem = *IDZebrac::odr_createmem;
 *odr_reset = *IDZebrac::odr_reset;
 *odr_destroy = *IDZebrac::odr_destroy;
@@ -48,17 +62,13 @@ package IDZebra;
 *errCode = *IDZebrac::errCode;
 *errString = *IDZebrac::errString;
 *errAdd = *IDZebrac::errAdd;
-*init_recordGroup = *IDZebrac::init_recordGroup;
-*res_get_recordGroup = *IDZebrac::res_get_recordGroup;
-*set_group = *IDZebrac::set_group;
+*set_resource = *IDZebrac::set_resource;
+*get_resource = *IDZebrac::get_resource;
 *select_database = *IDZebrac::select_database;
 *select_databases = *IDZebrac::select_databases;
 *begin_trans = *IDZebrac::begin_trans;
 *end_trans = *IDZebrac::end_trans;
 *trans_no = *IDZebrac::trans_no;
-*begin_read = *IDZebrac::begin_read;
-*zts_test = *IDZebrac::zts_test;
-*end_read = *IDZebrac::end_read;
 *commit = *IDZebrac::commit;
 *get_shadow_enable = *IDZebrac::get_shadow_enable;
 *set_shadow_enable = *IDZebrac::set_shadow_enable;
@@ -67,6 +77,7 @@ package IDZebra;
 *repository_update = *IDZebrac::repository_update;
 *repository_delete = *IDZebrac::repository_delete;
 *repository_show = *IDZebrac::repository_show;
+*insert_record = *IDZebrac::insert_record;
 *update_record = *IDZebrac::update_record;
 *delete_record = *IDZebrac::delete_record;
 *search_PQF = *IDZebrac::search_PQF;
@@ -79,14 +90,7 @@ package IDZebra;
 *deleteResultSet = *IDZebrac::deleteResultSet;
 *sort = *IDZebrac::sort;
 *scan_PQF = *IDZebrac::scan_PQF;
-sub getScanEntry {
-    my @args = @_;
-    my $result = IDZebrac::getScanEntry(@args);
-    return undef if (!defined($result));
-    my %resulthash;
-    tie %resulthash, ref($result), $result;
-    return bless \%resulthash, ref($result);
-}
+*getScanEntry = *IDZebrac::getScanEntry;
 *nmem_create = *IDZebrac::nmem_create;
 *nmem_destroy = *IDZebrac::nmem_destroy;
 *data1_create = *IDZebrac::data1_create;
@@ -173,105 +177,11 @@ sub getScanEntry {
 *grs_perl_get_mem = *IDZebrac::grs_perl_get_mem;
 *grs_perl_set_res = *IDZebrac::grs_perl_set_res;
 
-############# Class : IDZebra::recordGroup ##############
-
-package IDZebra::recordGroup;
-@ISA = qw( IDZebra );
-%OWNER = ();
-%BLESSEDMEMBERS = (
-);
-
-%ITERATORS = ();
-*swig_groupName_get = *IDZebrac::recordGroup_groupName_get;
-*swig_groupName_set = *IDZebrac::recordGroup_groupName_set;
-*swig_databaseName_get = *IDZebrac::recordGroup_databaseName_get;
-*swig_databaseName_set = *IDZebrac::recordGroup_databaseName_set;
-*swig_path_get = *IDZebrac::recordGroup_path_get;
-*swig_path_set = *IDZebrac::recordGroup_path_set;
-*swig_recordId_get = *IDZebrac::recordGroup_recordId_get;
-*swig_recordId_set = *IDZebrac::recordGroup_recordId_set;
-*swig_recordType_get = *IDZebrac::recordGroup_recordType_get;
-*swig_recordType_set = *IDZebrac::recordGroup_recordType_set;
-*swig_flagStoreData_get = *IDZebrac::recordGroup_flagStoreData_get;
-*swig_flagStoreData_set = *IDZebrac::recordGroup_flagStoreData_set;
-*swig_flagStoreKeys_get = *IDZebrac::recordGroup_flagStoreKeys_get;
-*swig_flagStoreKeys_set = *IDZebrac::recordGroup_flagStoreKeys_set;
-*swig_flagRw_get = *IDZebrac::recordGroup_flagRw_get;
-*swig_flagRw_set = *IDZebrac::recordGroup_flagRw_set;
-*swig_fileVerboseLimit_get = *IDZebrac::recordGroup_fileVerboseLimit_get;
-*swig_fileVerboseLimit_set = *IDZebrac::recordGroup_fileVerboseLimit_set;
-*swig_databaseNamePath_get = *IDZebrac::recordGroup_databaseNamePath_get;
-*swig_databaseNamePath_set = *IDZebrac::recordGroup_databaseNamePath_set;
-*swig_explainDatabase_get = *IDZebrac::recordGroup_explainDatabase_get;
-*swig_explainDatabase_set = *IDZebrac::recordGroup_explainDatabase_set;
-*swig_followLinks_get = *IDZebrac::recordGroup_followLinks_get;
-*swig_followLinks_set = *IDZebrac::recordGroup_followLinks_set;
-sub new {
-    my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_recordGroup(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::recordGroup", $self;
-    return bless \%retval, $pkg;
-}
-
-sub DESTROY {
-    return unless $_[0]->isa('HASH');
-    my $self = tied(%{$_[0]});
-    return unless defined $self;
-    delete $ITERATORS{$self};
-    if (exists $OWNER{$self}) {
-        IDZebrac::delete_recordGroup($self);
-        delete $OWNER{$self};
-    }
-}
-
-sub DISOWN {
-    my $self = shift;
-    my $ptr = tied(%$self);
-    delete $OWNER{$ptr};
-    };
-
-sub ACQUIRE {
-    my $self = shift;
-    my $ptr = tied(%$self);
-    $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
-}
-
-
 ############# Class : IDZebra::RetrievalObj ##############
 
 package IDZebra::RetrievalObj;
 @ISA = qw( IDZebra );
 %OWNER = ();
-%BLESSEDMEMBERS = (
-);
-
 %ITERATORS = ();
 *swig_noOfRecords_get = *IDZebrac::RetrievalObj_noOfRecords_get;
 *swig_noOfRecords_set = *IDZebrac::RetrievalObj_noOfRecords_set;
@@ -279,13 +189,8 @@ package IDZebra::RetrievalObj;
 *swig_records_set = *IDZebrac::RetrievalObj_records_set;
 sub new {
     my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_RetrievalObj(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::RetrievalObj", $self;
-    return bless \%retval, $pkg;
+    my $self = IDZebrac::new_RetrievalObj(@_);
+    bless $self, $pkg if defined($self);
 }
 
 sub DESTROY {
@@ -303,35 +208,12 @@ sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
     delete $OWNER{$ptr};
-    };
+}
 
 sub ACQUIRE {
     my $self = shift;
     my $ptr = tied(%$self);
     $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
 }
 
 
@@ -340,9 +222,6 @@ sub STORE {
 package IDZebra::RetrievalRecord;
 @ISA = qw( IDZebra );
 %OWNER = ();
-%BLESSEDMEMBERS = (
-);
-
 %ITERATORS = ();
 *swig_errCode_get = *IDZebrac::RetrievalRecord_errCode_get;
 *swig_errCode_set = *IDZebrac::RetrievalRecord_errCode_set;
@@ -362,13 +241,8 @@ package IDZebra::RetrievalRecord;
 *swig_buf_set = *IDZebrac::RetrievalRecord_buf_set;
 sub new {
     my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_RetrievalRecord(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::RetrievalRecord", $self;
-    return bless \%retval, $pkg;
+    my $self = IDZebrac::new_RetrievalRecord(@_);
+    bless $self, $pkg if defined($self);
 }
 
 sub DESTROY {
@@ -386,60 +260,29 @@ sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
     delete $OWNER{$ptr};
-    };
+}
 
 sub ACQUIRE {
     my $self = shift;
     my $ptr = tied(%$self);
     $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
 }
 
 
-############# Class : IDZebra::ScanEntry ##############
+############# Class : IDZebra::scanEntry ##############
 
-package IDZebra::ScanEntry;
+package IDZebra::scanEntry;
 @ISA = qw( IDZebra );
 %OWNER = ();
-%BLESSEDMEMBERS = (
-);
-
 %ITERATORS = ();
-*swig_occurrences_get = *IDZebrac::ScanEntry_occurrences_get;
-*swig_occurrences_set = *IDZebrac::ScanEntry_occurrences_set;
-*swig_term_get = *IDZebrac::ScanEntry_term_get;
-*swig_term_set = *IDZebrac::ScanEntry_term_set;
+*swig_occurrences_get = *IDZebrac::scanEntry_occurrences_get;
+*swig_occurrences_set = *IDZebrac::scanEntry_occurrences_set;
+*swig_term_get = *IDZebrac::scanEntry_term_get;
+*swig_term_set = *IDZebrac::scanEntry_term_set;
 sub new {
     my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_ScanEntry(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::ScanEntry", $self;
-    return bless \%retval, $pkg;
+    my $self = IDZebrac::new_scanEntry(@_);
+    bless $self, $pkg if defined($self);
 }
 
 sub DESTROY {
@@ -448,7 +291,7 @@ sub DESTROY {
     return unless defined $self;
     delete $ITERATORS{$self};
     if (exists $OWNER{$self}) {
-        IDZebrac::delete_ScanEntry($self);
+        IDZebrac::delete_scanEntry($self);
         delete $OWNER{$self};
     }
 }
@@ -457,35 +300,12 @@ sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
     delete $OWNER{$ptr};
-    };
+}
 
 sub ACQUIRE {
     my $self = shift;
     my $ptr = tied(%$self);
     $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
 }
 
 
@@ -494,10 +314,6 @@ sub STORE {
 package IDZebra::ScanObj;
 @ISA = qw( IDZebra );
 %OWNER = ();
-%BLESSEDMEMBERS = (
-    entries => 'IDZebra::ScanEntry',
-);
-
 %ITERATORS = ();
 *swig_num_entries_get = *IDZebrac::ScanObj_num_entries_get;
 *swig_num_entries_set = *IDZebrac::ScanObj_num_entries_set;
@@ -509,13 +325,8 @@ package IDZebra::ScanObj;
 *swig_entries_set = *IDZebrac::ScanObj_entries_set;
 sub new {
     my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_ScanObj(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::ScanObj", $self;
-    return bless \%retval, $pkg;
+    my $self = IDZebrac::new_ScanObj(@_);
+    bless $self, $pkg if defined($self);
 }
 
 sub DESTROY {
@@ -533,35 +344,12 @@ sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
     delete $OWNER{$ptr};
-    };
+}
 
 sub ACQUIRE {
     my $self = shift;
     my $ptr = tied(%$self);
     $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
 }
 
 
@@ -570,9 +358,6 @@ sub STORE {
 package IDZebra::ZebraTransactionStatus;
 @ISA = qw( IDZebra );
 %OWNER = ();
-%BLESSEDMEMBERS = (
-);
-
 %ITERATORS = ();
 *swig_processed_get = *IDZebrac::ZebraTransactionStatus_processed_get;
 *swig_processed_set = *IDZebrac::ZebraTransactionStatus_processed_set;
@@ -588,13 +373,8 @@ package IDZebra::ZebraTransactionStatus;
 *swig_stime_set = *IDZebrac::ZebraTransactionStatus_stime_set;
 sub new {
     my $pkg = shift;
-    my @args = @_;
-    my $self = IDZebrac::new_ZebraTransactionStatus(@args);
-    return undef if (!defined($self));
-    $OWNER{$self} = 1;
-    my %retval;
-    tie %retval, "IDZebra::ZebraTransactionStatus", $self;
-    return bless \%retval, $pkg;
+    my $self = IDZebrac::new_ZebraTransactionStatus(@_);
+    bless $self, $pkg if defined($self);
 }
 
 sub DESTROY {
@@ -612,35 +392,12 @@ sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);
     delete $OWNER{$ptr};
-    };
+}
 
 sub ACQUIRE {
     my $self = shift;
     my $ptr = tied(%$self);
     $OWNER{$ptr} = 1;
-    };
-
-sub FETCH {
-    my ($self,$field) = @_;
-    my $member_func = "swig_${field}_get";
-    my $val = $self->$member_func();
-    if (exists $BLESSEDMEMBERS{$field}) {
-        return undef if (!defined($val));
-        my %retval;
-        tie %retval,$BLESSEDMEMBERS{$field},$val;
-        return bless \%retval, $BLESSEDMEMBERS{$field};
-    }
-    return $val;
-}
-
-sub STORE {
-    my ($self,$field,$newval) = @_;
-    my $member_func = "swig_${field}_set";
-    if (exists $BLESSEDMEMBERS{$field}) {
-        $self->$member_func(tied(%{$newval}));
-    } else {
-        $self->$member_func($newval);
-    }
 }