[open-ils-commits] r1243 - conifer/branches/rel_1_6_1/circ (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2011-02-24 14:22:12 -0500 (Thu, 24 Feb 2011)
New Revision: 1243

Modified:
   conifer/branches/rel_1_6_1/circ/circ_duration_OSUL.js
Log:
Apply a consistent 1 week, 0 renew policy for VIDEO and SOUND

Also, whitespace normalization.


Modified: conifer/branches/rel_1_6_1/circ/circ_duration_OSUL.js
===================================================================
--- conifer/branches/rel_1_6_1/circ/circ_duration_OSUL.js	2011-02-23 19:57:12 UTC (rev 1242)
+++ conifer/branches/rel_1_6_1/circ/circ_duration_OSUL.js	2011-02-24 19:22:12 UTC (rev 1243)
@@ -9,28 +9,28 @@
 
 if (patronProfile == 'Faculty' || 
     patronProfile == 'Graduate') {
-	result.durationRule = '120_days_1_renew';
+    result.durationRule = '120_days_1_renew';
 }
 
 /* Distance education laptops */
 if (copy.circ_modifier == 'COMPUTER LONG') {
-        result.durationRule = 'OSUL_computer_long';
-        result.recurringFinesRule = 'OSUL_computer';
-        result.maxFine = 'overdue_equip_max';
+    result.durationRule = 'OSUL_computer_long';
+    result.recurringFinesRule = 'OSUL_computer';
+    result.maxFine = 'overdue_equip_max';
 }
 
 /* Short term laptops */
 if (copy.circ_modifier == 'COMPUTER SHORT') {
-        result.durationRule = '4_hours_0_renew';
-        result.recurringFinesRule = 'OSUL_computer';
-        result.maxFine = 'overdue_equip_max';
+    result.durationRule = '4_hours_0_renew';
+    result.recurringFinesRule = 'OSUL_computer';
+    result.maxFine = 'overdue_equip_max';
 }
 
 /* Study room keys */
 if (copy.circ_modifier == 'KEYS') {
-        result.durationRule = '3_hours_1_renew';
-        result.recurringFinesRule = 'OSUL_hourly';
-	result.maxFine = 'OSUL_hourly';
+    result.durationRule = '3_hours_1_renew';
+    result.recurringFinesRule = 'OSUL_hourly';
+    result.maxFine = 'OSUL_hourly';
 }
 
 /* Reserve items - let's use regular expressions to save some pain */
@@ -39,25 +39,25 @@
 res_day_match = res_day_re.exec(copy.circ_modifier);
 res_hour_match = res_hour_re.exec(copy.circ_modifier);
 if (res_day_match) {
-	result.durationRule = res_day_match[1] + '_days_0_renew';
-	result.recurringFinesRule = 'OSUL_reserves_daily';
-	result.maxFine = 'OSUL_reserves';
+    result.durationRule = res_day_match[1] + '_days_0_renew';
+    result.recurringFinesRule = 'OSUL_reserves_daily';
+    result.maxFine = 'OSUL_reserves';
 } else if (res_hour_match) {
-	result.durationRule = res_hour_match[1] + '_hours_0_renew';
-	result.recurringFinesRule = 'OSUL_hourly';
-	result.maxFine = 'OSUL_reserves';
+    result.durationRule = res_hour_match[1] + '_hours_0_renew';
+    result.recurringFinesRule = 'OSUL_hourly';
+    result.maxFine = 'OSUL_reserves';
 }
 
 /* RACER books */
 if (copy.circ_modifier == 'PEB-LIVRE') {
-        result.durationRule = '14_days_0_renew';
-        result.recurringFinesRule = '1_dollar_per_day';
-	result.maxFine = 'INFINITY_AND_BEYOND';
+    result.durationRule = '14_days_0_renew';
+    result.recurringFinesRule = '1_dollar_per_day';
+    result.maxFine = 'INFINITY_AND_BEYOND';
 }
 
-/* VIDEO recordings */
-if (copy.circ_modifier == 'VIDEO') {
-        result.durationRule = '3_days_0_renew';
-        result.recurringFinesRule = '1_dollar_per_day';
-	result.maxFine = 'OSUL_reserves';
+/* VIDEO and SOUND recordings */
+if (copy.circ_modifier == 'VIDEO' || copy.circ_modifier == 'SOUND') {
+    result.durationRule = '7_days_0_renew';
+    result.recurringFinesRule = '1_dollar_per_day';
+    result.maxFine = 'OSUL_reserves';
 }