From 554bbe1bda098b104adaa5869e560a26a815b6d9 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Tue, 1 Jan 2008 13:56:14 -0500 Subject: [PATCH] s/Waited/Expected/ for serials statuses reformating rebuild_nozebra.pl indexes Signed-off-by: Joshua Ferraro --- .../data/mysql/en/mandatory/sysprefs.sql | 4 ++-- .../prog/en/modules/catalogue/detail.tmpl | 2 +- .../en/modules/help/bull/statecollection.tmpl | 4 ++-- .../en/modules/help/serials/serials-edit.tmpl | 2 +- .../prog/en/modules/serials/claims.tmpl | 4 ++-- .../modules/serials/serial-issues-full.tmpl | 4 ++-- .../modules/serials/serials-collection.tmpl | 2 +- .../prog/en/modules/serials/serials-edit.tmpl | 4 ++-- .../en/modules/serials/serials-recieve.tmpl | 6 ++--- .../modules/serials/subscription-detail.tmpl | 2 +- misc/migration_tools/rebuild_nozebra.pl | 22 ++++++++++--------- 11 files changed, 29 insertions(+), 27 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index d33b8774e9..755e19289a 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -63,8 +63,8 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NotifyBorrowerDeparture',30,'Define number of days before expiry where circulation is warned about patron account expiry',NULL,'Integer'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacAuthorities',1,'If ON, enables the search authorities link on OPAC',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbag',1,'If ON, enables display of biblio basket (book bag)','','YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacBrowser',1,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/build_browser.pl)',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud',1,'If ON, enables subject cloud on OPAC',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacBrowser',0,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/build_browser.pl)',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacCloud',0,'If ON, enables subject cloud on OPAC',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccolorstylesheet','colors.css','Define the color stylesheet to use in the OPAC','','free'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opaccredits','','Define HTML Credits at the bottom of the OPAC page','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacheader','','Add HTML to be included as a custom header in the OPAC','30|10','Textarea'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index 788f1d7e3b..d7f2943b65 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -326,7 +326,7 @@ NAME="biblionumber" -->"> by - Awaited + Expected Arrived diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl index 9b7e73e469..c5819f59f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/statecollection.tmpl @@ -10,7 +10,7 @@

The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:

The left part

@@ -24,7 +24,7 @@
  • opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.

    • Subscription renewals

    -

    Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.

    +

    Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "expected number" (as it's not expected in fact). To be able to "recieve" this number, you must renew your subscription.

    Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).

    Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tmpl index caf601fe25..87d77ae9fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/serials-edit.tmpl @@ -1,5 +1,5 @@
    -

    Recieving Serials

    How do I receive an expected issue?

    The number for the next expected Issue should display in the top row. The status will default to waited. If the serial has arrived, then select "arrived" from the drop down. If SerialAddItems is turned on you will be prompted to add the item detail.

    Once you press save the new issue will be recorded in the subscription history.

    How do I receive an unexpected or supplemental issue?

    Uss the blank line under the expected issue line to add in the details for the unexpected or supplemental issue.  Select the appropriate status and save. 

    What happens if an Issue does not turn up?

    If an issue does not turn up or is late, then select that status from the Status drop down. The issue will now appear under "Claims" and can be managed from there.  

    +

    Recieving Serials

    How do I receive an expected issue?

    The number for the next expected Issue should display in the top row. The status will default to expected. If the serial has arrived, then select "arrived" from the drop down. If SerialAddItems is turned on you will be prompted to add the item detail.

    Once you press save the new issue will be recorded in the subscription history.

    How do I receive an unexpected or supplemental issue?

    Uss the blank line under the expected issue line to add in the details for the unexpected or supplemental issue.  Select the appropriate status and save. 

    What happens if an Issue does not turn up?

    If an issue does not turn up or is late, then select that status from the Status drop down. The issue will now appear under "Claims" and can be managed from there.  

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl index b881476b65..6dfa689d8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl @@ -90,7 +90,7 @@ - Waited + Expected Arrived Late Missing @@ -197,4 +197,4 @@ name="supplierid" -->,''); return false" class="button">Supplier Group Claim Let - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl index 27087da3c5..7500c009c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl @@ -68,7 +68,7 @@ function active(numlayer) Arrived - Waited + Expected Late Missing @@ -85,4 +85,4 @@ function active(numlayer) - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl index e15acadf34..32b79802d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl @@ -201,7 +201,7 @@ $(document).ready(function() { - WaitedArrivedLateMissingNot AvailableClaimed + ExpectedArrivedLateMissingNot AvailableClaimed diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl index 57e66bd64a..1fb4931b59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl @@ -210,7 +210,7 @@ Error : Barcode Not Unique For serialseq - + @@ -316,7 +316,7 @@ Error : Barcode Not Unique For serialseq " /> @@ -111,7 +111,7 @@ function barcode_check(){ " />

    Subscription has expired.

    -

    Waited last issue status can't be changed. Renew your subscription

    +

    Expected issue status can't be changed. Renew your subscription

    Note: Subscription is about to expire next issue.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index 77cac32b51..c8002544a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -329,7 +329,7 @@ function popup(subscriptionid) { - Waited + Expected Arrived diff --git a/misc/migration_tools/rebuild_nozebra.pl b/misc/migration_tools/rebuild_nozebra.pl index 93c868715e..1e53bfc835 100755 --- a/misc/migration_tools/rebuild_nozebra.pl +++ b/misc/migration_tools/rebuild_nozebra.pl @@ -23,14 +23,14 @@ my $biblios; my $authorities; my $sysprefs; GetOptions( - 'd:s' => \$directory, - 'reset' => \$reset, - 's' => \$skip_export, - 'k' => \$keep_export, - 'b' => \$biblios, - 'a' => \$authorities, - 's' => \$sysprefs, # rebuild 'NoZebraIndexes' syspref - ); + 'd:s' => \$directory, + 'reset' => \$reset, + 's' => \$skip_export, + 'k' => \$keep_export, + 'b' => \$biblios, + 'a' => \$authorities, + 's' => \$sysprefs, # rebuild 'NoZebraIndexes' syspref + ); $directory = "export" unless $directory; my $dbh=C4::Context->dbh; @@ -58,7 +58,8 @@ if (!%index || $sysprefs ) { 'host-item' => '995a,995c',\" where variable='NoZebraIndexes'"); %index = GetNoZebraIndexes(); } elsif (C4::Context->preference('marcflavour') eq 'MARC21') { - $dbh->do("UPDATE systempreferences SET value=\"'title' => '130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a', + $dbh->do("UPDATE systempreferences SET value=\" +'title' => '130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a', 'author' => '100a,100b,100c,100d,110a,111a,111b,111c,111d,245c,700a,710a,711a,800a,810a,811a', 'isbn' => '020a', 'issn' => '022a', @@ -73,7 +74,8 @@ if (!%index || $sysprefs ) { 'bc' => '952p', 'callnum' => '952o', 'an' => '6009,6109,6119', -'host-item' => '952a,952c',\" where variable='NoZebraIndexes'"); +'host-item' => '952a,952c', +\"WHERE variable='NoZebraIndexes'"); %index = GetNoZebraIndexes(); } -- 2.39.5