record_marc is now merged into record_entry
authormiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 11 Apr 2005 18:54:37 +0000 (18:54 +0000)
committermiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 11 Apr 2005 18:54:37 +0000 (18:54 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@474 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/biblio.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/metabib.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg.pm
Open-ILS/src/perlmods/OpenILS/Application/Storage/WORM.pm
Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm

index bb6ea25..d67292f 100644 (file)
@@ -319,11 +319,8 @@ sub import {
        #-------------------------------------------------------------------------------
        biblio::record_note->has_a( record => 'biblio::record_entry' );
        #-------------------------------------------------------------------------------
-       biblio::record_marc->is_a( id => 'biblio::record_entry' );
-       #-------------------------------------------------------------------------------
        biblio::record_entry->has_a( creator => 'actor::user' );
        biblio::record_entry->has_a( editor => 'actor::user' );
-       biblio::record_entry->might_have( marc_entry => 'biblio::record_marc' => qw/marc/ );
        biblio::record_entry->has_many( record_descriptor => 'metabib::record_descriptor' );
        biblio::record_entry->has_many( notes => 'biblio::record_note' );
        biblio::record_entry->has_many( call_numbers => 'asset::call_number' );
index f40cc9a..185e9c1 100644 (file)
@@ -13,7 +13,7 @@ biblio::record_entry->table( 'biblio_record_entry' );
 biblio::record_entry->columns( Primary         => 'id' );
 biblio::record_entry->columns( Essential       => qw/tcn_source tcn_value creator editor
                                                      create_date edit_date source active
-                                                     deleted last_xact_id/ );
+                                                     deleted marc last_xact_id/ );
 biblio::record_entry->columns( Others          => qw/fingerprint/ );
 
 #-------------------------------------------------------------------------------
@@ -45,11 +45,11 @@ biblio::record_entry->columns( Others               => qw/fingerprint/ );
 
 
 #-------------------------------------------------------------------------------
-package biblio::record_marc;
-use base qw/biblio/;
+#package biblio::record_marc;
+#use base qw/biblio/;
 
-biblio::record_marc->table( 'biblio_record_marc' );
-biblio::record_marc->columns( All => qw/id marc last_xact_id/ );
+#biblio::record_marc->table( 'biblio_record_marc' );
+#biblio::record_marc->columns( All => qw/id marc last_xact_id/ );
 #biblio::record_marc->columns( Stringify => qw/marc/ );
 #biblio::record_marc->is_a( id => qw/biblio::record_entry/ );
 
index ecd78ee..67f20b6 100644 (file)
@@ -10,7 +10,7 @@ use base qw/metabib/;
 
 metabib::metarecord->table( 'metabib_metarecord' );
 metabib::metarecord->columns( Primary => qw/id/ );
-metabib::metarecord->columns( Others => qw/fingerprint master_record/ );
+metabib::metarecord->columns( Others => qw/fingerprint master_record mods/ );
 
 #-------------------------------------------------------------------------------
 package metabib::title_field_entry;
index f89b8cb..e74c8b6 100644 (file)
        biblio::record_entry->sequence( 'biblio.record_entry_id_seq' );
 
        #---------------------------------------------------------------------
-       package biblio::record_marc;
-       
-       biblio::record_marc->table( 'biblio.record_marc' );
-       biblio::record_marc->sequence( 'biblio.record_marc_id_seq' );
-
+       #package biblio::record_marc;
+       #
+       #biblio::record_marc->table( 'biblio.record_marc' );
+       #biblio::record_marc->sequence( 'biblio.record_marc_id_seq' );
+       #
        #---------------------------------------------------------------------
        package biblio::record_note;
        
index e0ff65a..4335472 100644 (file)
@@ -209,7 +209,7 @@ sub wormize {
                unless ($commit);
        $rollback = $self->method_lookup( 'open-ils.storage.transaction.rollback')
                unless ($rollback);
-       $lookup = $self->method_lookup('open-ils.storage.direct.biblio.record_marc.batch.retrieve')
+       $lookup = $self->method_lookup('open-ils.storage.direct.biblio.record_entry.batch.retrieve')
                unless ($lookup);
        $fetch_entry = $self->method_lookup('open-ils.storage.direct.biblio.record_entry.retrieve')
                unless ($update_entry);
index e0a13a5..160ac4d 100644 (file)
@@ -84,7 +84,10 @@ sub _init {
                                                                                           } },
                'Fieldmapper::biblio::record_entry'             => { hint               => 'bre',
                                                                     proto_fields       => { call_numbers => 1 } },
-               'Fieldmapper::biblio::record_marc'              => { hint => 'brx'  },
+               #'Fieldmapper::biblio::record_marc'             => { hint => 'brx'  }, # now it's inside record_entry
+
+               'Fieldmapper::money::cash_payment'              => { hint => 'mcp'  },
+               'Fieldmapper::money::billing'                   => { hint => 'mb'  },
 
                'Fieldmapper::config::identification_type'      => { hint => 'cit'  },
                'Fieldmapper::config::bib_source'               => { hint => 'cbs'  },