From 1f698b91dab8f7067becce5c968488dbeb832563 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 15 Jul 2005 15:38:10 +0000
Subject: [PATCH] fixed minor bug with using Fieldmapper to find class::dbi
 classes

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1206 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm | 8 ++++----
 Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm        | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
index de9b419cad..0aa6be59d9 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI.pm
@@ -68,11 +68,11 @@ sub fast_flesh_sth {
 
 	unless (defined $value) {
 		$value = $field;
-		$field = $class->primary_column;
+		($field) = $class->columns('Primary');
 	}
 
 	unless (defined $field) {
-		$field = $class->primary_column;
+		($field) = $class->columns('Primary');
 	}
 
 	unless ($order->{order_by}) {
@@ -134,7 +134,7 @@ sub retrieve {
 	my $self = shift;
 	my $arg = shift;
 	if (ref($arg) and UNIVERSAL::isa($arg => 'Fieldmapper')) {
-		my $col = $arg->primary_column;
+		my ($col) = $self->columns('Primary');
 		$arg = $arg->$col;
 	}
 	$log->debug("Retrieving $self with $arg", INTERNAL);
@@ -185,7 +185,7 @@ sub create_from_fieldmapper {
 	$log->debug("Creating node of type ".ref($fm), DEBUG);
 
 	my $class = ref($obj) || $obj;
-	my $primary = $class->primary_column;
+	my ($primary) = $class->columns('Primary');
 
 	if (ref $fm) {
 		my %hash = map { defined $fm->$_ ?
diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
index 051af15662..1d2b287f2a 100644
--- a/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Utils/Fieldmapper.pm
@@ -323,6 +323,11 @@ sub api_level {
 	return $fieldmap->{$self->class_name}->{api_level};
 }
 
+sub cdbi {
+	my $self = shift;
+	return $fieldmap->{$self->class_name}->{cdbi};
+}
+
 
 sub is_virtual {
 	my $self = shift;
-- 
2.11.0