From 645faa44b912e754df0fe61cea3585ec072218bf Mon Sep 17 00:00:00 2001 From: pines Date: Fri, 22 Sep 2006 20:25:32 +0000 Subject: [PATCH] macros git-svn-id: svn://svn.open-ils.org/ILS/trunk@6197 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/cat/spine_labels.js | 14 ++++++++++---- Open-ILS/xul/staff_client/server/cat/spine_labels.xul | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js index 28317db4d0..d25a430443 100644 --- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js +++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js @@ -62,6 +62,11 @@ } } + function show_macros() { + JSAN.use('util.functional'); + alert( util.functional.map_list( g.cols, function(o) { return '%' + o.id + '%'; } ).join(" ") ); + } + function $(id) { return document.getElementById(id); } function generate() { @@ -200,8 +205,9 @@ } } - function expand_macros(text,copy) { - var my = { 'acp' : copy }; + function expand_macros(text,copy,volume,record) { + var my = { 'acp' : copy, 'acn' : volume, 'mvr' : record }; + var obj = { 'data' : g.data }; for (var i in g.col_map) { var re = g.col_map[i].regex; if (text.match(re)) { @@ -239,13 +245,13 @@ var nl2 = gb.getElementsByAttribute('name','spine'); for (var k = 0; k < nl2.length; k++) { for (var m = 0; m < lm; m++) html += ' '; - html += expand_macros( nl2[k].value, copy ).substr(0,lw); + html += expand_macros( nl2[k].value, copy, volume, volume.record() ).substr(0,lw); if ($('pl').checked) { var sib = nl2[k].nextSibling; if (sib) { for (var m = 0; m < lw - nl2[k].value.length; m++) html += ' '; for (var m = 0; m < mm; m++) html += ' '; - html += expand_macros( sib.value, copy ).substr(0,plw); + html += expand_macros( sib.value, copy, volume, volume.record() ).substr(0,plw); } } html += '\n'; diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul index a0b404d3cf..3c84ce754b 100644 --- a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul +++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul @@ -86,6 +86,7 @@ +