[open-ils-commits] [GIT] Evergreen ILS branch master updated. cc375f60c2e7fdfdf3075916da2ff319799a0c64
Evergreen Git
git at git.evergreen-ils.org
Tue Jul 16 16:03:19 EDT 2013
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 cc375f60c2e7fdfdf3075916da2ff319799a0c64 (commit)
via 9d26b6e8d8012b0c584c97db16a76ca94d766917 (commit)
via 4e3fdd7ab78bdfec38f1858e1af2076010bfb757 (commit)
from be36c3c96f7b79b9c7109de0e9a6b04c18faf559 (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 cc375f60c2e7fdfdf3075916da2ff319799a0c64
Merge: 9d26b6e be36c3c
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Jul 16 16:02:31 2013 -0400
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into sticky-acq-fields-docs
commit 9d26b6e8d8012b0c584c97db16a76ca94d766917
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Jul 16 15:47:28 2013 -0400
Documentation for default values in Load Order Record form
Documentation for new default values and sticky fields in the acq Load
MARC Order Records form. I also moved up/modified 2.1 docs for this
interface and integrated them with the 2.2 acq/Vandelay integration docs.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/docs/acquisitions/vandelay_acquisitions_integration.txt b/docs/acquisitions/vandelay_acquisitions_integration.txt
index 2f02993..0381cb9 100644
--- a/docs/acquisitions/vandelay_acquisitions_integration.txt
+++ b/docs/acquisitions/vandelay_acquisitions_integration.txt
@@ -1,27 +1,149 @@
-Vandelay Integration into Acquisitions
---------------------------------------
-The Acquisitions Load MARC Order Record interface enables you to add MARC records to selection lists and purchase orders and upload the records into the catalog. The Vandelay interface enables you to create specific match points between incoming MARC records and exisiting catalog records. Combining these two features enables you to track on order MARC records through the Acquisitions interface and to utilize the record matching mechanisms available in Vandelay.
+Load MARC Order Records
+-----------------------
+The Acquisitions Load MARC Order Record interface enables you to add MARC
+records to selection lists and purchase orders and upload the records into the
+catalog. You can both create and activate purchase orders in one step from this
+interface. You can also load bibs and items into the catalog.
-The purpose of this documentation is to describe the interaction between Vandelay and the Acquisitions MARC Batch Upload interface. For detailed instructions on
- using the Acquisitions MARC Batch Upload interface, see the Evergreen Documentation Interest Group's Book of Evergreen, 2.1 documentation, Chapter 5, Load MARC
-Order Records. For detailed instructions on using the Vandelay functions for record matching and importing, see the Evergreen Documentation Interest Group's Book of Evergreen,
-2.2 documentation, Chapter 7, Batch Importing MARC Records.
+Leveraging the match sets available in the cataloging MARC batch Import
+interface, you can also utilize record matching mechanisms to prevent the
+creation of duplicate records.
-*Use Cases for Vandelay Integration into Acquisitions*
+For detailed instructions on record matching and importing, see
+<<batchimport, Batch Importing MARC Records>>.
-You can add items to a selection list or purchase order and ignore the Vandelay options, or you can use both acquisitions and cataloging functions. In these examples, you will use both functions.
+Basic Upload Options
+~~~~~~~~~~~~~~~~~~~~
+. Click *Acquisitions* -> *Load MARC Order Records*.
+. If you want to upload the MARC records to a new purchase order, then click
+the check box adjacent to Create Purchase Order.
+. If you want to activate the purchase order at the time of creation, then
+click the check box adjacent to _Activate Purchase Order_.
+. Enter the name of the *Provider*. The text will auto-complete.
+. Select an org unit from the drop down menu. The context org unit is the org
+unit responsible for placing and managing the order. It defines what org unit
+settings (eg copy locations) are in scope, what fiscal year to use, who is
+allowed to view/modify the PO, where the items should be delivered and the EDI
+SAN. In the case of a multi-branch system uploading records for multiple
+branches, choosing the system is probably best. Single branch libraries or
+branches responsible for their own orders should probably select the branch.
+. If you want to upload the records to a selection list, you can select a list
+from the drop down menu, or type in the name of the selection list that you
+want to create.
+. Select a *Fiscal Year* from the dropdown menu that matches the fiscal year
+of the funds that will be used for the order. If no fiscal year is selected, the
+system will use the organizational unit's default fiscal year stored in the
+database. If not fiscal year is set, the system will default to the current
+calendar year.
-Example 1: Using the Acquisitions MARC Batch Load interface, upload MARC records to a selection list and a Vandelay queue, and match queued records with existing catalog records.
+Record Matching Options
+~~~~~~~~~~~~~~~~~~~~~~~
+Use the options below the horizontal rule for the system to check for matching
+records before importing an order record.
-In this example, an acquisitions librarian has received a batch of MARC records from a vendor. She will add the records to a selection list and a Vandelay record queue.
-A cataloger will later view the queue, edit the records, and import them into the catalog.
+. Create a queue to which you can upload your records, or add you records to an existing queue
+. Select a *Record Match Set* from the drop-down menu.
+. Select a *Merge Profile.* Merge profiles enable you to specify which tags
+should be removed or preserved in incoming records.
+. Selet a *Record Source* from the drop-down menu.
+. If you want to automatically import records on upload, select one or more of
+the following options.
+ .. *Import Non-Matching Records* - import any records that don't have a match
+ in the system.
+ .. *Merge on Exact Match (901c)* - use only for records that will match on
+ the 901c field.
+ .. *Merge on Single Match* - import records that only have one match in the
+ system.
+ .. *Merge on Best Match* - If more than one match is found in the catalog for
+ a given record, Evergreen will attempt to perform the best match as defined
+ by the match score.
+. To only import records that has a quality equal to or greater than the
+existing record, enter a *Best/Single Match Minimum Quality Ratio*. Divide the
+incoming record quality score, as determined by the match set's quality
+metrics, by the record quality score of the best match that exists in the
+catalog. If you want to ensure that the inbound record is only imported when it
+has a higher quality than the best match, then you must enter a ratio that is
+higher than 1, such as 1.1. If you want to bypass all quality restraings, enter
+a 0 (zero) in this field.
+. Select an *Insufficient Quality Fall-Through Profile* if desired. This field
+enables you to indicate that if the inbound record doees not meet the
+configured quality standards, then you may still import the record using an
+alternate merge profile. This field is typically used for selecting a merge
+profile that allows the user to import holdings attached to a lower quality
+record without replacing the existing (target) record with the incoming record.
+This field is optional.
+. If your order records contain holdings information, by default, Evergreen
+will load them as acquisitions copies. Select *Load Items for Imported Records*
+to automatically load them as live copies that display in the catalog.
+
+Default Upload Settings
+~~~~~~~~~~~~~~~~~~~~~~~
+
+You can set default upload values by modifying the following settings in
+*Admin* -> *Local Administration* -> *Library Settings Editor*:
+
+- Upload Activate PO
+- Upload Create PO
+- Upload Default Insufficient Quality Fall-Thru Profile
+- Upload Default Match Set
+- Upload Default Merge Profile
+- Upload Upload Default Min. Quality Ratio
+- Upload Default Provider
+- Upload Import Non Matching by Default
+- Upload Load Items for Imported Records by Default
+- Upload Merge on Best Match by Default
+- Upload Merge on Exact Match by Default
+- Upload Merge on Single Match by Default
+
+Sticky Settings
+~~~~~~~~~~~~~~~
+
+If the above default settings are not implemented, the selections/values used
+in the following fields will be sticky and will automatically populate the
+fields the next time the *Load MARC Order Records* screen is pulled up:
+
+- Create Purchase Order
+- Activate Purchase Order
+- Context Org Unit
+- Record Match Set
+- Merge Profile
+- Import Non-Matching Records
+- Merge on Exact Match (901c)
+- Merge on Single Match
+- Merge on Best Match
+- Best/Single Match Minimum Quality Ratio
+- Insufficient Quality Fall-Through Profile
+- Load Items for Imported Records
+
+Use Cases for MARC Order Upload form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can add items to a selection list or purchase order and ignore the record
+matching options, or you can use both acquisitions and cataloging functions. In
+these examples, you will use both functions.
+
+*Example 1*
+Using the Acquisitions MARC Batch Load interface, upload MARC records to a
+selection list and import queue, and match queued records with existing catalog
+records.
+
+In this example, an acquisitions librarian has received a batch of MARC records
+from a vendor. She will add the records to a selection list and a Vandelay
+record queue.
+
+A cataloger will later view the queue, edit the records, and import them into
+the catalog.
. Click *Acquisitions -> Load MARC Order Records*
-. Add MARC order records to a *Selection list* and/or a *Purchase Order.* Check the box to create a purchase order if desired.
-. Select a *Provider* from the drop down menu, or begin typing the code for the provider, and the field will auto-fill.
-. Select a *Context Org Unit* from the drop down menu, or begin typing the code for the context org unit, and the field will auto-fill.
-. Select a *Selection List* from the drop down menu, or begin typing the name of the selection list. You can create a new list, or the field will auto-fill.
-. Create a new record queue in Vandelay, or upload the records to an existing queue.
+. Add MARC order records to a *Selection list* and/or a *Purchase Order.*
+Check the box to create a purchase order if desired.
+. Select a *Provider* from the drop-down menu, or begin typing the code for the provider, and the field will auto-fill.
+. Select a *Context Org Unit* from the drop down-menu, or begin typing the code
+for the context org unit, and the field will auto-fill.
+. Select a *Selection List* from the drop down menu, or begin typing the name
+of the selection list. You can create a new list, or the field will auto-fill.
+. Create a new record import queue, or upload the records to an existing
+queue.
. Select a *Record Match Set*.
. Browse your computer to find the MARC file, and click *Upload*.
+
@@ -30,32 +152,51 @@ image::media/Vandelay_Integration_into_Acquisitions1.jpg[Vandelay_Integration_in
. The processed items appear at the bottom of the screen.
+
image::media/Vandelay_Integration_into_Acquisitions2.jpg[Vandelay_Integration_into_Acquisitions2]
-. You can click the link(s) to access the selection list or the import queue. Click the link to *View Selection List*.
-. Look at the first line item. The line item has not yet been linked to the catalog, but it is linked to a Vandelay record queue. Click the link to the *queue* to examine the MARC record.
+. You can click the link(s) to access the selection list or the import queue.
+Click the link to *View Selection List*.
+. Look at the first line item. The line item has not yet been linked to the
+catalog, but it is linked to a record import queue. Click the link to the
+*queue* to examine the MARC record.
+
image::media/Vandelay_Integration_into_Acquisitions3.jpg[Vandelay_Integration_into_Acquisitions3]
-. The Vandelay interface opens in a new tab. The bibliographic records appear in the queue. Records that have matches are identified in the queue. You can edit these records and/or import them into the catalog, completing the process.
+. The batch import interface opens in a new tab. The bibliographic records
+appear in the queue. Records that have matches are identified in the queue. You
+can edit these records and/or import them into the catalog, completing the
+process.
image::media/Vandelay_Integration_into_Acquisitions4.jpg[Vandelay_Integration_into_Acquisitions4]
-Example 2: Using the Acquisitions MARC Batch Load interface, upload MARC records to a selection list, and use the Vandelay options to import the records directly into the catalog. The Vandelay options will enable you to match incoming records with existing catalog records.
+*Example 2*: Using the Acquisitions MARC Batch Load interface, upload MARC
+records to a selection list, and use the Vandelay options to import the records
+directly into the catalog. The Vandelay options will enable you to match
+incoming records with existing catalog records.
-In this example, a librarian will add MARC records to a selection list, create criteria for matching incoming and existing records, and import the matching and non-matching records into the catalog.
+In this example, a librarian will add MARC records to a selection list, create
+criteria for matching incoming and existing records, and import the matching
+and non-matching records into the catalog.
. Click *Acquisitions* -> *Load MARC Order Records*
-. Add MARC order records to a *Selection list* and/or a *Purchase Order.* Check the box to create a purchase order if desired.
-. Select a *Provider* from the drop down menu, or begin typing the code for the provider, and the field will auto-fill.
+. Add MARC order records to a *Selection list* and/or a *Purchase Order.*
+Check the box to create a purchase order if desired.
+. Select a *Provider* from the drop down menu, or begin typing the code for the
+provider, and the field will auto-fill.
. Select a *Context Org Unit* from the drop down menu, or begin typing the code for the context org unit, and the field will auto-fill.
-. Select a *Selection List* from the drop down menu, or begin typing the name of the selection list. You can create a new list, or the field will auto-fill.
-. Create a new record queue in Vandelay, or upload the records to an existing queue.
+. Select a *Selection List* from the drop down menu, or begin typing the name
+of the selection list. You can create a new list, or the field will auto-fill.
+. Create a new record import queue, or upload the records to an existing queue.
. Select a *Record Match Set*.
. Select *Merge Profile* -> *Match-Only Merge*.
-. Check the box adjacent to *Merge on Best Match*.
+. Check the boxes adjacent to *Import Non-Matching Records* and *Merge on Best
+Match*.
. Browse your computer to find the MARC file, and click *Upload*.
+
image::media/Vandelay_Integration_into_Acquisitions5.jpg[Vandelay_Integration_into_Acquisitions5]
+
-. Click the link to *View Selection List* Line items that do not match existing catalog records on title and ISBN contain the link, *link to catalog*. This link indicates that you could link the line item to a catalog record, but currently, no match exists between the line item and catalog records. Line items that do have matching records in the catalog contain the link, *catalog*.
+. Click the link to *View Selection List* Line items that do not match
+existing catalog records on title and ISBN contain the link, *link to catalog*.
+This link indicates that you could link the line item to a catalog record, but
+currently, no match exists between the line item and catalog records. Line
+items that do have matching records in the catalog contain the link, *catalog*.
+
image::media/Vandelay_Integration_into_Acquisitions6.jpg[Vandelay_Integration_into_Acquisitions6]
+
@@ -63,7 +204,12 @@ image::media/Vandelay_Integration_into_Acquisitions6.jpg[Vandelay_Integration_in
*Permissions to use this Feature*
-IMPORT_MARC - Using Vandelay to create new bib records now requres the IMPORT_MARC
-permission (same as open-ils.cat.biblio.record.xml.import). If the permission fails, the queued record will fail import and be stamped with a new "import.record.perm_failure" vandelay import error
+IMPORT_MARC - Using batch importer to create new bib records requires the
+IMPORT_MARC permission (same as open-ils.cat.biblio.record.xml.import). If the
+permission fails, the queued record will fail import and be stamped with a new
+"import.record.perm_failure" import error
-IMPORT_ACQ_LINEITEM_BIB_RECORD_UPLOAD - This allows interfaces leveraging Vandelay, such as Acquisitions, to create a higher barrier to entry. This permission prevents users from creating new bib records directly from the ACQ vendor MARC file upload interface.
+IMPORT_ACQ_LINEITEM_BIB_RECORD_UPLOAD - This allows interfaces leveraging
+the batch importer, such as Acquisitions, to create a higher barrier to entry.
+This permission prevents users from creating new bib records directly from the
+ACQ vendor MARC file upload interface.
diff --git a/docs/cataloging/batch_importing_MARC.txt b/docs/cataloging/batch_importing_MARC.txt
index d2c0c82..f6ddd4d 100644
--- a/docs/cataloging/batch_importing_MARC.txt
+++ b/docs/cataloging/batch_importing_MARC.txt
@@ -1,6 +1,6 @@
Batch Importing MARC Records
----------------------------
-
+[[batchimport]]
The cataloging module includes an enhanced MARC Batch Import interface for
loading MARC records. This interface allows you to specify match points
between incoming and existing records, to specify MARC fields that should be
@@ -25,6 +25,7 @@ This feature enables you to specify the tags and subfields that will display in
records that appear in the import queue.
+[[matchsets]]
Record Match Sets
~~~~~~~~~~~~~~~~~
diff --git a/docs/media/Vandelay_Integration_into_Acquisitions1.jpg b/docs/media/Vandelay_Integration_into_Acquisitions1.jpg
index 909e14e..5081a23 100644
Binary files a/docs/media/Vandelay_Integration_into_Acquisitions1.jpg and b/docs/media/Vandelay_Integration_into_Acquisitions1.jpg differ
diff --git a/docs/media/Vandelay_Integration_into_Acquisitions5.jpg b/docs/media/Vandelay_Integration_into_Acquisitions5.jpg
index fd072ca..fdeb99c 100644
Binary files a/docs/media/Vandelay_Integration_into_Acquisitions5.jpg and b/docs/media/Vandelay_Integration_into_Acquisitions5.jpg differ
commit 4e3fdd7ab78bdfec38f1858e1af2076010bfb757
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Oct 10 09:22:33 2012 -0400
Capture and log AuthProxy logins with no account
The current AuthProxy.pm code assumes that if the external auth
passes, the Evergreen account will be there. This protects
against cases where a user is in the external auth system but
has no matching account in Evergreen.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/AuthProxy.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/AuthProxy.pm
index be1d05b..a555be7 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/AuthProxy.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/AuthProxy.pm
@@ -257,6 +257,10 @@ sub _do_login {
"open-ils.cstore.direct.actor.user.search.atomic",
{ usrname => $args->{'username'} }
);
+ if (!$user->[0]) {
+ $logger->debug("Authenticated username '" . $args->{'username'} . "' has no Evergreen account, aborting");
+ return OpenILS::Event->new( 'LOGIN_FAILED' );
+ }
$args->{'password'} = md5_hex( $seed . $user->[0]->passwd );
} else {
$args->{'password'} = md5_hex( $seed . md5_hex($real_password) );
-----------------------------------------------------------------------
Summary of changes:
.../vandelay_acquisitions_integration.txt | 208 +++++++++++++++++---
docs/cataloging/batch_importing_MARC.txt | 3 +-
.../Vandelay_Integration_into_Acquisitions1.jpg | Bin 87987 -> 64895 bytes
.../Vandelay_Integration_into_Acquisitions5.jpg | Bin 81603 -> 64456 bytes
4 files changed, 179 insertions(+), 32 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list