[OPEN-ILS-DEV] Schema typo patch
Dan Scott
denials at gmail.com
Sun May 20 23:43:11 EDT 2007
While waiting for some bib records to load (yay -- another past
another milestone), I was browsing through the schemas for Evergreen
and noticed some typos. I have to submit this patch once, and if it's
not applied I understand given the potential pain for schema migration
at PINES, but there's something in my English major /
newspaper-editing / tech writer past that needs to get this out. And
it would be nice for the rest of us to start with a schema that
doesn't suffer from minor typos...
Testing consisted of applying the patch to CVS HEAD, loading the
Gutenberg records, and browsing through the records in the staff
client. Given that this touches "recuring_fines" and "persistant",
this level of testing wouldn't flush anything out. However, the patch
was created by running "find /ILS -exec grep -Hi recuring {} \;" for
the affected words through the source tree, so I'm sure that any
in-tree code relying on the old spellings has been cleaned up.
The DCO is probably overkill for a typo patch, but whatever :)
Developer's Certificate of Origin 1.1 By making a contribution to this
project, I certify that:
(a) The contribution was created in whole or in part by me and I have
the right to submit it under the open source license indicated in the
file; or
(b) The contribution is based upon previous work that, to the best of
my knowledge, is covered under an appropriate open source license and
I have the right under that license to submit that work with
modifications, whether created in whole or in part by me, under the
same open source license (unless I am permitted to submit under a
different license), as indicated in the file; or
(c) The contribution was provided directly to me by some other person
who certified (a), (b) or (c) and I have not modified it; and
(d) In the case of each of (a), (b), or (c), I understand and agree
that this project and the contribution are public and that a record of
the contribution (including all personal information I submit with it,
including my sign-off) is maintained indefinitely and may be
redistributed consistent with this project or the open source license
indicated in the file.
--
Dan Scott
Laurentian University
-------------- next part --------------
Index: Evergreen/src/extras/import/legacy_circ.sql
===================================================================
RCS file: /cvs/ILS/Evergreen/src/extras/import/legacy_circ.sql,v
retrieving revision 1.3
diff -r1.3 legacy_circ.sql
20,21c20,21
< CREATE TABLE legacy_type_circ_map (item_type text, recuring_fine numeric(6,2), renewals int);
< COPY legacy_type_circ_map (item_type, recuring_fine, renewals) FROM STDIN;
---
> CREATE TABLE legacy_type_circ_map (item_type text, recurring_fine numeric(6,2), renewals int);
> COPY legacy_type_circ_map (item_type, recurring_fine, renewals) FROM STDIN;
90c90
< recuring_fine,
---
> recurring_fine,
94c94
< recuring_fine_rule,
---
> recurring_fine_rule,
110c110
< tm.recuring_fine AS recuring_fine,
---
> tm.recurring_fine AS recurring_fine,
114c114
< 'IMPORT'::TEXT AS recuring_fine_rule,
---
> 'IMPORT'::TEXT AS recurring_fine_rule,
Index: Evergreen/src/extras/import/sparkle.replicate.slonik
===================================================================
RCS file: /cvs/ILS/Evergreen/src/extras/import/sparkle.replicate.slonik,v
retrieving revision 1.1
diff -r1.1 sparkle.replicate.slonik
55c55
< set add table (set id=1, origin=1, id=10, fully qualified name = 'config.rule_recuring_fine', comment = '');
---
> set add table (set id=1, origin=1, id=10, fully qualified name = 'config.rule_recurring_fine', comment = '');
Index: Open-ILS/admin/ils_admin/setup/ils_data/models.py
===================================================================
RCS file: /cvs/ILS/Open-ILS/admin/ils_admin/setup/ils_data/models.py,v
retrieving revision 1.3
diff -r1.3 models.py
236c236
< db_table = 'rule_recuring_fine'
---
> db_table = 'rule_recurring_fine'
Index: Open-ILS/examples/fm_IDL.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/examples/fm_IDL.xml,v
retrieving revision 1.91
diff -r1.91 fm_IDL.xml
256c256
< <field reporter:label="Is Persistent? (unused)" name="persistant_transfer" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="bool"/>
---
> <field reporter:label="Is Persistent? (unused)" name="persistent_transfer" oils_obj:array_position="7" oils_persist:virtual="false" reporter:datatype="bool"/>
994,995c994,995
< <field reporter:label="Recurring Fine Amount" name="recuring_fine" oils_obj:array_position="18" oils_persist:virtual="false" reporter:datatype="money" />
< <field reporter:label="Recurring Fine Rule" name="recuring_fine_rule" oils_obj:array_position="19" oils_persist:virtual="false" />
---
> <field reporter:label="Recurring Fine Amount" name="recurring_fine" oils_obj:array_position="18" oils_persist:virtual="false" reporter:datatype="money" />
> <field reporter:label="Recurring Fine Rule" name="recurring_fine_rule" oils_obj:array_position="19" oils_persist:virtual="false" />
1022c1022
< <link field="recuring_fine_rule" reltype="has_a" key="name" map="" class="crrf"/>
---
> <link field="recurring_fine_rule" reltype="has_a" key="name" map="" class="crrf"/>
1640,1641c1640,1641
< <field name="recuring_fine" oils_obj:array_position="18" oils_persist:virtual="false" reporter:datatype="money" />
< <field name="recuring_fine_rule" oils_obj:array_position="19" oils_persist:virtual="false" />
---
> <field name="recurring_fine" oils_obj:array_position="18" oils_persist:virtual="false" reporter:datatype="money" />
> <field name="recurring_fine_rule" oils_obj:array_position="19" oils_persist:virtual="false" />
1655c1655
< <link field="recuring_fine_rule" reltype="has_a" key="name" map="" class="crrf"/>
---
> <link field="recurring_fine_rule" reltype="has_a" key="name" map="" class="crrf"/>
1673,1674c1673,1674
< <class id="crrf" controller="open-ils.cstore" oils_obj:fieldmapper="config::rules::recuring_fine" oils_persist:tablename="config.rule_recuring_fine">
< <fields oils_persist:primary="id" oils_persist:sequence="config.rule_recuring_fine_id_seq">
---
> <class id="crrf" controller="open-ils.cstore" oils_obj:fieldmapper="config::rules::recurring_fine" oils_persist:tablename="config.rule_recurring_fine">
> <fields oils_persist:primary="id" oils_persist:sequence="config.rule_recurring_fine_id_seq">
1683c1683
< <field name="recurance_interval" oils_obj:array_position="8" oils_persist:virtual="false" />
---
> <field name="recurrance_interval" oils_obj:array_position="8" oils_persist:virtual="false" />
2108c2108
< <field reporter:label="Is Persistent?" name="persistant_transfer" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="bool"/>
---
> <field reporter:label="Is Persistent?" name="persistent_transfer" oils_obj:array_position="8" oils_persist:virtual="false" reporter:datatype="bool"/>
2259c2259
< <field name="recurance" oils_obj:array_position="10" oils_persist:virtual="false" />
---
> <field name="recurrance" oils_obj:array_position="10" oils_persist:virtual="false" />
Index: Open-ILS/src/cgi-bin/circ-rules.cgi
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/cgi-bin/circ-rules.cgi,v
retrieving revision 1.11
diff -r1.11 circ-rules.cgi
81c81
< recurance_interval => "Interval",
---
> recurrance_interval => "Interval",
84c84
< my @fine_display_order = ( qw/name recurance_interval normal high low/ );
---
> my @fine_display_order = ( qw/name recurrance_interval normal high low/ );
119c119
< } elsif ($form eq 'recuring_fine') {
---
> } elsif ($form eq 'recurring_fine') {
122c122
< config::rules::recuring_fine->retrieve($id)->delete;
---
> config::rules::recurring_fine->retrieve($id)->delete;
125c125
< config::rules::recuring_fine->create(
---
> config::rules::recurring_fine->create(
195c195
< # Recuring Fine form
---
> # Recurring Fine form
198,199c198,199
< "<input type='hidden' name='rules_form' value='recuring_fine'>".
< "<h2>Recuring Fine Levels</h2>".
---
> "<input type='hidden' name='rules_form' value='recurring_fine'>".
> "<h2>Recurring Fine Levels</h2>".
208c208
< for my $row ( config::rules::recuring_fine->retrieve_all ) {
---
> for my $row ( config::rules::recurring_fine->retrieve_all ) {
Index: Open-ILS/src/extras/ils_events.xml
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/extras/ils_events.xml,v
retrieving revision 1.83
diff -r1.83 ils_events.xml
455,456c455,456
< <event code='1609' textcode='CONFIG_RULES_RECURING_FINE_NOT_FOUND'>
< <desc xml:lang='en-US'>The requested config_rules_recuring_fine was not found</desc>
---
> <event code='1609' textcode='CONFIG_RULES_RECURRING_FINE_NOT_FOUND'>
> <desc xml:lang='en-US'>The requested config_rules_recurring_fine was not found</desc>
Index: Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm,v
retrieving revision 1.95
diff -r1.95 AppUtils.pm
809c809
< 'open-ils.cstore.direct.config.rules.recuring_fine.search.atomic', { name => $name } );
---
> 'open-ils.cstore.direct.config.rules.recurring_fine.search.atomic', { name => $name } );
811c811
< $evt = OpenILS::Event->new('CONFIG_RULES_RECURING_FINE_NOT_FOUND') unless $obj;
---
> $evt = OpenILS::Event->new('CONFIG_RULES_RECURRING_FINE_NOT_FOUND') unless $obj;
Index: Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm,v
retrieving revision 1.141
diff -r1.141 Circulate.pm
1069c1069
< $circ->recuring_fine( $recurring->low )
---
> $circ->recurring_fine( $recurring->low )
1071c1071
< $circ->recuring_fine( $recurring->normal )
---
> $circ->recurring_fine( $recurring->normal )
1073c1073
< $circ->recuring_fine( $recurring->high )
---
> $circ->recurring_fine( $recurring->high )
1077c1077
< $circ->recuring_fine_rule( $recurring->name );
---
> $circ->recurring_fine_rule( $recurring->name );
1081c1081
< $circ->fine_interval($recurring->recurance_interval);
---
> $circ->fine_interval($recurring->recurrance_interval);
1088c1088
< $circ->recuring_fine_rule(OILS_UNLIMITED_CIRC_DURATION);
---
> $circ->recurring_fine_rule(OILS_UNLIMITED_CIRC_DURATION);
Index: Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm,v
retrieving revision 1.23
diff -r1.23 action.pm
67c67
< recuring_fine_rule recuring_fine stop_fines
---
> recurring_fine_rule recurring_fine stop_fines
82c82
< recuring_fine_rule recuring_fine stop_fines
---
> recurring_fine_rule recurring_fine stop_fines
124c124
< __PACKAGE__->columns(Essential => qw/source dest persistant_transfer target_copy
---
> __PACKAGE__->columns(Essential => qw/source dest persistent_transfer target_copy
134c134
< __PACKAGE__->columns(Essential => qw/source dest persistant_transfer target_copy
---
> __PACKAGE__->columns(Essential => qw/source dest persistent_transfer target_copy
Index: Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/config.pm,v
retrieving revision 1.21
diff -r1.21 config.pm
58c58
< package config::rules::recuring_fine;
---
> package config::rules::recurring_fine;
60c60
< __PACKAGE__->table('config_rule_recuring_fine');
---
> __PACKAGE__->table('config_rule_recurring_fine');
62c62
< __PACKAGE__->columns(Essential => qw/name high normal low recurance_interval/);
---
> __PACKAGE__->columns(Essential => qw/name high normal low recurrance_interval/);
Index: Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/Storage/Driver/Pg/dbi.pm,v
retrieving revision 1.47
diff -r1.47 dbi.pm
235c235
< package config::rules::recuring_fine;
---
> package config::rules::recurring_fine;
237,238c237,238
< config::rules::recuring_fine->table( 'config.rule_recuring_fine' );
< config::rules::recuring_fine->sequence( 'config.rule_recuring_fine_id_seq' );
---
> config::rules::recurring_fine->table( 'config.rule_recurring_fine' );
> config::rules::recurring_fine->sequence( 'config.rule_recurring_fine_id_seq' );
Index: Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm,v
retrieving revision 1.87
diff -r1.87 action.pm
601c601
< my $recuring_fine = int($c->recuring_fine * 100);
---
> my $recurring_fine = int($c->recurring_fine * 100);
634,635c634,635
< $current_fine_total += $recuring_fine;
< $latest_amount += $recuring_fine;
---
> $current_fine_total += $recurring_fine;
> $latest_amount += $recurring_fine;
642c642
< amount => sprintf('%0.2f', $recuring_fine/100),
---
> amount => sprintf('%0.2f', $recurring_fine/100),
Index: Open-ILS/src/reporter/clark-kent.pl
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/reporter/clark-kent.pl,v
retrieving revision 1.25
diff -r1.25 clark-kent.pl
230c230
< $r->{report}->{recurance},
---
> $r->{report}->{recurrance},
Index: Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/002.schema.config.sql,v
retrieving revision 1.23
diff -r1.23 002.schema.config.sql
80c80
< * that for translation, as the ID column is currently a "magic
---
> * than for translation, as the ID column is currently a "magic
318c318
< CREATE TABLE config.rule_recuring_fine (
---
> CREATE TABLE config.rule_recurring_fine (
324c324
< recurance_interval INTERVAL NOT NULL DEFAULT '1 day'::INTERVAL
---
> recurrance_interval INTERVAL NOT NULL DEFAULT '1 day'::INTERVAL
326c326
< COMMENT ON TABLE config.rule_recuring_fine IS $$
---
> COMMENT ON TABLE config.rule_recurring_fine IS $$
331c331
< * Circulation Recuring Fine rules
---
> * Circulation Recurring Fine rules
333,334c333,334
< * Each circulation is given a recuring fine amount based on one of
< * these rules. The recurance_interval should not be any shorter
---
> * Each circulation is given a recurring fine amount based on one of
> * these rules. The recurrance_interval should not be any shorter
353,355c353,355
< INSERT INTO config.rule_recuring_fine VALUES (DEFAULT, 'default', 0.50, 0.10, 0.05, '1 day');
< INSERT INTO config.rule_recuring_fine VALUES (DEFAULT, '10_cent_per_day', 0.50, 0.10, 0.10, '1 day');
< INSERT INTO config.rule_recuring_fine VALUES (DEFAULT, '50_cent_per_day', 0.50, 0.50, 0.50, '1 day');
---
> INSERT INTO config.rule_recurring_fine VALUES (DEFAULT, 'default', 0.50, 0.10, 0.05, '1 day');
> INSERT INTO config.rule_recurring_fine VALUES (DEFAULT, '10_cent_per_day', 0.50, 0.10, 0.10, '1 day');
> INSERT INTO config.rule_recurring_fine VALUES (DEFAULT, '50_cent_per_day', 0.50, 0.50, 0.50, '1 day');
411c411
< * is available for imediate checkout, and is counted as available
---
> * is available for immediate checkout, and is counted as available
420c420
< * of the copy's values or it's location.
---
> * of the copy's values or its location.
494c494
< Unknown or unspecified The target audience for the item not known or not specified.
---
> Unknown or unspecified The target audience for the item is not known or not specified.
Index: Open-ILS/src/sql/Pg/005.schema.actors.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/005.schema.actors.sql,v
retrieving revision 1.21
diff -r1.21 005.schema.actors.sql
224c224
< * User Statistical Catagories
---
> * User Statistical Categories
227c227
< * Catagory. Here's where those catagories are defined.
---
> * Category. Here's where those categories are defined.
256c256
< * User Statistical Catagory Entries
---
> * User Statistical Category Entries
259,260c259,260
< * Catagory. Each library can create entries into any of it's own
< * stat_cats, it's anscestors stat_cats, or it's descendants' stat_cats.
---
> * Category. Each library can create entries into any of its own
> * stat_cats, its ancestors' stat_cats, or its descendants' stat_cats.
290c290
< * Statistical Catagory Entry to User map
---
> * Statistical Category Entry to User map
Index: Open-ILS/src/sql/Pg/040.schema.asset.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/040.schema.asset.sql,v
retrieving revision 1.18
diff -r1.18 040.schema.asset.sql
69c69
< CREATE TABLE asset.copy_tranparency_map (
---
> CREATE TABLE asset.copy_transparency_map (
71c71
< tansparency INT NOT NULL REFERENCES asset.copy_transparency (id),
---
> transparency INT NOT NULL REFERENCES asset.copy_transparency (id),
74c74
< CREATE INDEX cp_tr_cp_idx ON asset.copy_tranparency_map (tansparency);
---
> CREATE INDEX cp_tr_cp_idx ON asset.copy_transparency_map (transparency);
Index: Open-ILS/src/sql/Pg/090.schema.action.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/090.schema.action.sql,v
retrieving revision 1.24
diff -r1.24 090.schema.action.sql
94c94
< recuring_fine NUMERIC(6,2), -- derived from "circ fine" rule
---
> recurring_fine NUMERIC(6,2), -- derived from "circ fine" rule
100c100
< recuring_fine_rule TEXT NOT NULL, -- name of "circ fine" rule
---
> recurring_fine_rule TEXT NOT NULL, -- name of "circ fine" rule
219c219
< persistant_transfer BOOL NOT NULL DEFAULT FALSE
---
> persistent_transfer BOOL NOT NULL DEFAULT FALSE
Index: Open-ILS/src/sql/Pg/reporter-schema.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/reporter-schema.sql,v
retrieving revision 1.13
diff -r1.13 reporter-schema.sql
70c70
< recurance INTERVAL
---
> recurrence INTERVAL
Index: Open-ILS/src/sql/Pg/stats/circ_stats.sql
===================================================================
RCS file: /cvs/ILS/Open-ILS/src/sql/Pg/stats/circ_stats.sql,v
retrieving revision 1.6
diff -r1.6 circ_stats.sql
23c23
< recuring_fine NUMERIC(6,2) NOT NULL,
---
> recurring_fine NUMERIC(6,2) NOT NULL,
29c29
< recuring_fine_rule TEXT NOT NULL,
---
> recurring_fine_rule TEXT NOT NULL,
104c104
< circ_recuring_fine NUMERIC(6,2) NOT NULL,
---
> circ_recurring_fine NUMERIC(6,2) NOT NULL,
110c110
< circ_recuring_fine_rule TEXT NOT NULL,
---
> circ_recurring_fine_rule TEXT NOT NULL,
197c197
< circ_recuring_fine,
---
> circ_recurring_fine,
203c203
< circ_recuring_fine_rule,
---
> circ_recurring_fine_rule,
253c253
< circ_recuring_fine,
---
> circ_recurring_fine,
259c259
< circ_recuring_fine_rule,
---
> circ_recurring_fine_rule,
309c309
< circ_recuring_fine,
---
> circ_recurring_fine,
315c315
< circ_recuring_fine_rule,
---
> circ_recurring_fine_rule,
Index: Open-ILS/web/opac/common/js/fm_table_conf.js
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/opac/common/js/fm_table_conf.js,v
retrieving revision 1.8
diff -r1.8 fm_table_conf.js
87c87
< 'recurance',
---
> 'recurrance',
Index: Open-ILS/web/reports/oils_rpt_report_editor.js
===================================================================
RCS file: /cvs/ILS/Open-ILS/web/reports/oils_rpt_report_editor.js,v
retrieving revision 1.21
diff -r1.21 oils_rpt_report_editor.js
81c81
< report.recurance(this.paramEditor.recurInterval());
---
> report.recurrance(this.paramEditor.recurInterval());
Index: Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
===================================================================
RCS file: /cvs/ILS/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js,v
retrieving revision 1.48
diff -r1.48 data.js
49c49
< // This should be invoked only once per application, in a persistant window
---
> // This should be invoked only once per application, in a persistent window
More information about the Open-ils-dev
mailing list