[open-ils-commits] [GIT] Evergreen ILS branch master updated. b525a29cb631bd0cc65298049535b86f45fb2b9e
Evergreen Git
git at git.evergreen-ils.org
Tue Aug 23 14:43:05 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via b525a29cb631bd0cc65298049535b86f45fb2b9e (commit)
via 3ef7e28ac8099c8918636f564e136d86865d16b4 (commit)
from b8ddd5fdd2cd05616f337a5b7ea9e57f015fe4e8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b525a29cb631bd0cc65298049535b86f45fb2b9e
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri Aug 12 10:02:57 2011 -0400
Vandelay: added some info to print/csv bib output
Added bib match count, import error, and error detail to print and CSV
queued record export.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 7f50cdb..44f0f21 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9122,6 +9122,9 @@ Complete? [% target.0.queue.complete %]
Publication Date | [% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) %]
Edition | [% helpers.get_queued_bib_attr('edition',vqbr.attributes) %]
Item Barcode | [% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) %]
+ Import Error | [% vqbr.import_error %]
+ Error Detail | [% vqbr.error_detail %]
+ Match Count | [% vqbr.matches.size %]
[% END %]
</pre>
@@ -9132,6 +9135,7 @@ $$
INSERT INTO action_trigger.environment ( event_def, path) VALUES (
39, 'attributes')
,( 39, 'queue')
+ ,( 39, 'matches')
;
INSERT INTO action_trigger.event_definition (
@@ -9157,8 +9161,8 @@ INSERT INTO action_trigger.event_definition (
'print-on-demand',
$$
[%- USE date -%]
-"Title of work","Author of work","Language of work","Pagination","ISBN","ISSN","Price","Accession Number","TCN Value","TCN Source","Internal ID","Publisher","Publication Date","Edition","Item Barcode"
-[% FOR vqbr IN target %]"[% helpers.get_queued_bib_attr('title',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('author',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('language',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pagination',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('issn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('price',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_att
r('publisher',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('edition',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) | replace('"', '""') %]"
+"Title of work","Author of work","Language of work","Pagination","ISBN","ISSN","Price","Accession Number","TCN Value","TCN Source","Internal ID","Publisher","Publication Date","Edition","Item Barcode","Import Error","Error Detail","Match Count"
+[% FOR vqbr IN target %]"[% helpers.get_queued_bib_attr('title',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('author',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('language',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pagination',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('issn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('price',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_att
r('publisher',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('edition',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) | replace('"', '""') %]","[% vqbr.import_error | replace('"', '""') %]","[% vqbr.error_detail | replace('"', '""') %]","[% vqbr.matches.size %]"
[% END %]
$$
)
@@ -9167,6 +9171,7 @@ $$
INSERT INTO action_trigger.environment ( event_def, path) VALUES (
40, 'attributes')
,( 40, 'queue')
+ ,( 40, 'matches')
;
INSERT INTO action_trigger.event_definition (
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-export-error-match-info.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-export-error-match-info.sql
new file mode 100644
index 0000000..e62d9f8
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-export-error-match-info.sql
@@ -0,0 +1,62 @@
+-- Evergreen DB patch XXXX.data.vandelay-export-error-match-info.sql
+--
+-- FIXME: insert description of change, if needed
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+-- Add vqbr.import_error, vqbr.error_detail, and vqbr.matches.size to queue print output
+
+UPDATE action_trigger.event_definition SET template = $$
+[%- USE date -%]
+<pre>
+Queue ID: [% target.0.queue.id %]
+Queue Name: [% target.0.queue.name %]
+Queue Type: [% target.0.queue.queue_type %]
+Complete? [% target.0.queue.complete %]
+
+ [% FOR vqbr IN target %]
+=-=-=
+ Title of work | [% helpers.get_queued_bib_attr('title',vqbr.attributes) %]
+ Author of work | [% helpers.get_queued_bib_attr('author',vqbr.attributes) %]
+ Language of work | [% helpers.get_queued_bib_attr('language',vqbr.attributes) %]
+ Pagination | [% helpers.get_queued_bib_attr('pagination',vqbr.attributes) %]
+ ISBN | [% helpers.get_queued_bib_attr('isbn',vqbr.attributes) %]
+ ISSN | [% helpers.get_queued_bib_attr('issn',vqbr.attributes) %]
+ Price | [% helpers.get_queued_bib_attr('price',vqbr.attributes) %]
+ Accession Number | [% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) %]
+ TCN Value | [% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) %]
+ TCN Source | [% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) %]
+ Internal ID | [% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) %]
+ Publisher | [% helpers.get_queued_bib_attr('publisher',vqbr.attributes) %]
+ Publication Date | [% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) %]
+ Edition | [% helpers.get_queued_bib_attr('edition',vqbr.attributes) %]
+ Item Barcode | [% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) %]
+ Import Error | [% vqbr.import_error %]
+ Error Detail | [% vqbr.error_detail %]
+ Match Count | [% vqbr.matches.size %]
+
+ [% END %]
+</pre>
+$$
+WHERE id = 39;
+
+
+-- Do the same for the CVS version
+
+UPDATE action_trigger.event_definition SET template = $$
+[%- USE date -%]
+"Title of work","Author of work","Language of work","Pagination","ISBN","ISSN","Price","Accession Number","TCN Value","TCN Source","Internal ID","Publisher","Publication Date","Edition","Item Barcode","Import Error","Error Detail","Match Count"
+[% FOR vqbr IN target %]"[% helpers.get_queued_bib_attr('title',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('author',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('language',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pagination',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('isbn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('issn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('price',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('rec_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_tcn_source',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('eg_identifier',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_att
r('publisher',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('pubdate',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('edition',vqbr.attributes) | replace('"', '""') %]","[% helpers.get_queued_bib_attr('item_barcode',vqbr.attributes) | replace('"', '""') %]","[% vqbr.import_error | replace('"', '""') %]","[% vqbr.error_detail | replace('"', '""') %]","[% vqbr.matches.size %]"
+[% END %]
+$$
+WHERE id = 40;
+
+-- Add matches to the env for both
+INSERT INTO action_trigger.environment (event_def, path) VALUES (39, 'matches');
+INSERT INTO action_trigger.environment (event_def, path) VALUES (40, 'matches');
+
+COMMIT;
commit 3ef7e28ac8099c8918636f564e136d86865d16b4
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri Aug 12 09:07:35 2011 -0400
Vandelay: show record match counts in record queue UI
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 48423c5..75da815 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -682,14 +682,17 @@ function vlGetViewMatches(rowIdx, item) {
var id = this.grid.store.getValue(item, 'id');
var rec = queuedRecordsMap[id];
if(rec.matches().length > 0)
- return id;
+ return id + ':' + rec.matches().length;
}
return -1
}
function vlFormatViewMatches(id) {
if(id == -1) return '';
- return '<a href="javascript:void(0);" onclick="vlLoadMatchUI(' + id + ');">' + this.name + '</a>';
+ var chunks = id.split(':');
+ id = chunks[0];
+ count = chunks[1];
+ return '<a href="javascript:void(0);" onclick="vlLoadMatchUI(' + id + ');">' + this.name + ' (' + count + ')</a>';
}
function vlGetViewErrors(rowIdx, item) {
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 9 ++-
.../XXXX.data.vandelay-export-error-match-info.sql | 62 ++++++++++++++++++++
Open-ILS/web/js/ui/default/vandelay/vandelay.js | 7 ++-
3 files changed, 74 insertions(+), 4 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.vandelay-export-error-match-info.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list