[open-ils-commits] r18264 - in trunk/Open-ILS/src: perlmods/OpenILS/Application perlmods/OpenILS/WWW sql/Pg sql/Pg/upgrade (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Oct 11 12:07:51 EDT 2010
Author: miker
Date: 2010-10-11 12:07:47 -0400 (Mon, 11 Oct 2010)
New Revision: 18264
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0434.data.merge_template_container_type.sql
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
trunk/Open-ILS/src/perlmods/OpenILS/WWW/TemplateBatchBibUpdate.pm
trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Working template-based batch bib updater!
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm 2010-10-11 16:07:44 UTC (rev 18263)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Cat.pm 2010-10-11 16:07:47 UTC (rev 18264)
@@ -248,25 +248,23 @@
my $items = $e->search_container_biblio_record_entry_bucket_item({ bucket => $container });
+ my $titem;
if (!$template) {
- my $titem = $e->retrieve_biblio_record_entry(
- map { $_->target_biblio_record_entry }
- grep { $_->target_biblio_record_entry < 0 } @$items
- );
-
+ ($titem) = grep { $_->target_biblio_record_entry < 0 } @$items;
if (!$titem) {
$e->rollback;
return undef;
}
+ $items = [grep { $_->target_biblio_record_entry > 0 } @$items];
- $template = $titem->marc;
- return $e->die_event unless ($e->delete_container_biblio_record_entry_bucket_item($titem));
+ $template = $e->retrieve_biblio_record_entry( $titem->target_biblio_record_entry )->marc;
}
my $responses = [];
+ my $some_failed = 0;
$self->respond_complete(
- $actor->request('open-ils.actor.anon_cache.set_value', $responses)->gather(1)
+ $actor->request('open-ils.actor.anon_cache.set_value', $auth, res_list => $responses)->gather(1)
) if ($actor);
for my $item ( @$items ) {
@@ -280,36 +278,44 @@
)->[0]->{'vandelay.template_overlay_bib_record'};
}
+ $some_failed++ if ($success eq 'f');
+
if ($actor) {
push @$responses, { record => $rec->id, success => $success };
- $actor->request('open-ils.actor.anon_cache.set_value', $responses);
+ $actor->request('open-ils.actor.anon_cache.set_value', $auth, res_list => $responses);
} else {
$conn->respond({ record => $rec->id, success => $success });
}
- unless ($e->delete_container_biblio_record_entry_bucket_item($item)) {
- $e->rollback;
- if ($actor) {
- push @$responses, { complete => 1, success => 'f' };
- $actor->request('open-ils.actor.anon_cache.set_value', $responses);
- return undef;
- } else {
- return { complete => 1, success => 'f' };
+ if ($success eq 't') {
+ unless ($e->delete_container_biblio_record_entry_bucket_item($item)) {
+ $e->rollback;
+ if ($actor) {
+ push @$responses, { complete => 1, success => 'f' };
+ $actor->request('open-ils.actor.anon_cache.set_value', $auth, res_list => $responses);
+ return undef;
+ } else {
+ return { complete => 1, success => 'f' };
+ }
}
}
}
+ if ($titem && !$some_failed) {
+ return $e->die_event unless ($e->delete_container_biblio_record_entry_bucket_item($titem));
+ }
+
if ($e->commit) {
if ($actor) {
push @$responses, { complete => 1, success => 't' };
- $actor->request('open-ils.actor.anon_cache.set_value', $responses);
+ $actor->request('open-ils.actor.anon_cache.set_value', $auth, res_list => $responses);
} else {
return { complete => 1, success => 't' };
}
} else {
if ($actor) {
push @$responses, { complete => 1, success => 'f' };
- $actor->request('open-ils.actor.anon_cache.set_value', $responses);
+ $actor->request('open-ils.actor.anon_cache.set_value', $auth, res_list => $responses);
} else {
return { complete => 1, success => 'f' };
}
Modified: trunk/Open-ILS/src/perlmods/OpenILS/WWW/TemplateBatchBibUpdate.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/WWW/TemplateBatchBibUpdate.pm 2010-10-11 16:07:44 UTC (rev 18263)
+++ trunk/Open-ILS/src/perlmods/OpenILS/WWW/TemplateBatchBibUpdate.pm 2010-10-11 16:07:47 UTC (rev 18264)
@@ -138,8 +138,11 @@
# create the new container for the records and the template
my $bucket = Fieldmapper::container::biblio_record_entry_bucket->new;
$bucket->owner($usr->id);
- $bucket->name('Temporary Merge Bucket');
+ $bucket->btype('template_merge');
+ my $bname = $cgi->param('bname') || 'Temporary Merge Bucket '. localtime() . ' ' . $usr->id;
+ $bucket->name($bname);
+
$bucket = $e->request('open-ils.cstore.direct.container.biblio_record_entry_bucket.create', $bucket )->gather(1);
# create items in the bucket
@@ -159,8 +162,8 @@
# fire the background bucket processor
my $cache_key = OpenSRF::AppSession
- ->create('open-ils.actor')
- ->request('open-ils.cat.container.template_overlay.background', $bucket->id)
+ ->create('open-ils.cat')
+ ->request('open-ils.cat.container.template_overlay.background', $authid, $bucket->id)
->gather(1);
return show_processing_template($r, $bucket->id, \@records, $cache_key);
@@ -221,29 +224,29 @@
dojo.require('fieldmapper.dojoData');
dojo.require('openils.User');
dojo.require('openils.CGI');
- dojo.require('openils.widget.PogressDialog');
+ dojo.require('openils.widget.ProgressDialog');
var cgi = new openils.CGI();
var u = new openils.User({ authcookie : 'ses' });
- var rec_count = $rec_string;
- var cache_key = '$cache_key';
-
dojo.addOnLoad(function () {
progress_dialog.show(true);
- progress_dialog.update({maximum:rec_ids.length});
+ progress_dialog.update({maximum:$rec_string});
- setInterval( function() {
+ var interval;
+ interval = setInterval( function() {
fieldmapper.standardRequest(
['open-ils.actor','open-ils.actor.anon_cache.get_value'],
{ async : false,
- params: [ cache_key ],
+ params: [ u.authtoken, 'res_list' ],
+ onerror : function (r) { progress_dialog.hide(); },
onresponse : function (r) {
var counter = { success : 0, fail : 0, total : 0 };
dojo.forEach( openils.Util.readResponse(r), function(x) {
if (x.complete) {
+ clearInterval(interval);
progress_dialog.hide();
- if (x.success == 'f') dojo.byId('complete_msg').innerHTML = 'Overlay completed successfully';
+ if (x.success == 't') dojo.byId('complete_msg').innerHTML = 'Overlay completed successfully';
else dojo.byId('complete_msg').innerHTML = 'Overlay did not complet successfully';
} else {
counter.total++;
@@ -487,35 +490,50 @@
<div dojoType="dijit.form.Form" id="myForm" jsId="myForm" encType="multipart/form-data" action="" method="POST">
<script type='dojo/method' event='onSubmit'>
var rec = ruleset_to_record();
+
+ // no-op to force replace mode
+ rec.appendFields(
+ new MARC.Field ({
+ tag : '905',
+ ind1 : ' ',
+ ind2 : ' ',
+ subfields : [['r','901c']]
+ })
+ );
+
dojo.byId('template_value').value = rec.toXmlString();
return true;
</script>
<input type='hidden' id='template_value' name='template'/>
- <div>
- <label for='bucketList'>Batch update records in Bucket:</label>
- <div name='containerid' jsId='bucketList' dojoType='dijit.form.FilteringSelect' store='bucketStore' searchAttr='name' id='bucketList'>
- <script type='dojo/method' event='postCreate'>
- if (cgi.param('containerid')) this.attr('value',cgi.param('containerid'));
- </script>
- </div>
- </div>
-
- <div style='text-align: center; width: 50%;'>or</div>
-
- <div>
- <label for='idfile'>Batch update records from column <input style='width:75px;' type='text' dojoType='dijit.form.NumberSpinner' name='idcolumn' value='0' constraints='{min:0,max:100,places:0}' /> (starting from 0) in CSV file:</label>
- <input id='idfile' type="file" name="idfile"/>
- </div>
-
- <div style='text-align: center; width: 50%;'>or</div>
+ <table>
+ <tr>
+ <th>Optional merge queue name:</th>
+ <td><input id='bucketName' type='text' dojoType='dijit.form.TextBox' name='bname' value=''/></td>
+ </tr>
+ <tr>
+ <th>Batch update records in Bucket:</th>
+ <td>
+ <div name='containerid' jsId='bucketList' dojoType='dijit.form.FilteringSelect' store='bucketStore' searchAttr='name' id='bucketList'>
+ <script type='dojo/method' event='postCreate'>
+ if (cgi.param('containerid')) this.attr('value',cgi.param('containerid'));
+ </script>
+ </div>
+ </td>
+ </tr>
+ <tr><th colspan='2'><div style='text-align: center;'>or</div></hd></tr>
+ <tr>
+ <th>Batch update records from CSV file:</th>
+ <td><input id='idfile' type="file" name="idfile"/><br/>Column <input style='width:75px;' type='text' dojoType='dijit.form.NumberSpinner' name='idcolumn' value='0' constraints='{min:0,max:100,places:0}' /> starting from 0</td>
+ </tr>
+ <tr><th colspan='2'><div style='text-align: center;'>or</div></th></tr>
+ <tr>
+ <th>Test Ruleset by applying to one record:</th>
+ <td><input name='recid' style='width:75px;' type='text' dojoType='dijit.form.NumberTextBox' name='id' value='' constraints='{min:0}' /></td>
+ </tr>
+ </table>
- <label for='recid'>Test Ruleset by applying to one record:</label> <input name='recid' style='width:75px;' type='text' dojoType='dijit.form.NumberTextBox' name='id' value='' constraints='{min:0}' />
-
- <br/>
- <br/>
-
<button type="submit" dojoType='dijit.form.Button'>Apply Ruleset</button>
</div> <!-- end of the form -->
@@ -541,10 +559,9 @@
<th>Rule Type</th>
<td name='typeSelectContainer'>
<select name='typeSelect'>
+ <option value='r'>Replace</option>
<option value='a'>Add</option>
<option value='d'>Delete</option>
- <option value='r'>Replace</option>
- <option value='p'>Preserve</option>
</select>
</td>
</tr>
Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-10-11 16:07:44 UTC (rev 18263)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-10-11 16:07:47 UTC (rev 18264)
@@ -2345,6 +2345,7 @@
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('staff_client', oils_i18n_gettext('staff_client', 'General Staff Client container', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag', oils_i18n_gettext('bookbag', 'Book Bag', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('reading_list', oils_i18n_gettext('reading_list', 'Reading List', 'cbrebt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('template_merge',oils_i18n_gettext('template_merge','Template Merge Container', 'cbrebt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cubt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('folks', oils_i18n_gettext('folks', 'Friends', 'cubt', 'label'));
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0434.data.merge_template_container_type.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0434.data.merge_template_container_type.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0434.data.merge_template_container_type.sql 2010-10-11 16:07:47 UTC (rev 18264)
@@ -0,0 +1,9 @@
+
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0434');
+
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('template_merge','Template Merge Container');
+
+COMMIT;
+
More information about the open-ils-commits
mailing list