[open-ils-commits] r9851 - in branches/rel_1_2_2/Open-ILS/src: javascript/backend/circ perlmods/OpenILS/SIP

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-06-18 15:59:28 -0400 (Wed, 18 Jun 2008)
New Revision: 9851

Modified:
   branches/rel_1_2_2/Open-ILS/src/javascript/backend/circ/circ_item_config.js
   branches/rel_1_2_2/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm
Log:
copying the item-config into the result object.  fixed bug in capturing item config info in SIP msg

Modified: branches/rel_1_2_2/Open-ILS/src/javascript/backend/circ/circ_item_config.js
===================================================================
--- branches/rel_1_2_2/Open-ILS/src/javascript/backend/circ/circ_item_config.js	2008-06-18 19:58:18 UTC (rev 9850)
+++ branches/rel_1_2_2/Open-ILS/src/javascript/backend/circ/circ_item_config.js	2008-06-18 19:59:28 UTC (rev 9851)
@@ -50,7 +50,7 @@
 
 /* this will set defaults even if no one asked for them */
 log_debug("Calling getItemConfig() to force defaults..");
-getItemConfig();
+result.item_config = getItemConfig();
 
 
 function getItemConfig() {

Modified: branches/rel_1_2_2/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm
===================================================================
--- branches/rel_1_2_2/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm	2008-06-18 19:58:18 UTC (rev 9850)
+++ branches/rel_1_2_2/Open-ILS/src/perlmods/OpenILS/SIP/Item.pm	2008-06-18 19:59:28 UTC (rev 9851)
@@ -112,7 +112,7 @@
 sub magnetic {
     my $self = shift;
 	 return 0 unless $self->run_attr_script;
-	 my $mag = $self->{item_config_result}->{magneticMedia};
+	 my $mag = $self->{item_config_result}->{item_config}->{magneticMedia};
 	 syslog('LOG_DEBUG', "OILS: magnetic = $mag");
 	 return ($mag and $mag eq 't') ? 1 : 0;
 }
@@ -120,7 +120,7 @@
 sub sip_media_type {
     my $self = shift;
 	 return 0 unless $self->run_attr_script;
-	 my $media = $self->{item_config_result}->{SIPMediaType};
+	 my $media = $self->{item_config_result}->{item_config}->{SIPMediaType};
 	 syslog('LOG_DEBUG', "OILS: media type = $media");
 	 return ($media) ? $media : '001';
 }