Jane Sandberg [Thu, 7 Apr 2022 22:40:47 +0000 (15:40 -0700)]
Stamp upgrade script for MADS update
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Jane Sandberg [Tue, 5 Jan 2021 21:27:05 +0000 (13:27 -0800)]
LP1800871: small correction to upgrade script
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Josh Stompro [Thu, 28 Feb 2019 14:39:54 +0000 (08:39 -0600)]
LP#
1800871 - MARC21slim2MADS 2.15 update
This update fixes an error when trying to process a 755 tag in
and authority record that has a source set.
See the discussion on the listserv at:
https://georgialibraries.markmail.org/thread/rmwcxkwjzv2qczmu
To test, try to import the sample authority record provided
by Linda Jansova (https://markmail.org/thread/2ay3j4wg7fecymhz)
in evergreen, and see the log files for the import errors.
It is also possible to test from the command line.
In /openils/var/xsl, copy the example autority marc xml file to
that directory, name it americ.xml, then run the command
xsltproc ./MARC21slim2MADS.xsl ./americ.xml
This will error out.
After patch has been applied, try importing the sample authority
record and see that it imports successfully.
Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Garry Collum [Thu, 23 Sep 2021 18:31:24 +0000 (14:31 -0400)]
LP#
1942240 Insufficient color contrast in boostrap forms
Overrides the bootstrap form-control border color. Also changes the
border_standard color in colors.tt2 which is used for the border
around some form elements.
After this patch is applied the color ratio is 3.54:1
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Jeff Davis [Mon, 28 Mar 2022 18:30:26 +0000 (11:30 -0700)]
LP#
1966802: add Matomo support to Bootstrap OPAC
Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Garry Collum [Mon, 17 Jan 2022 18:05:37 +0000 (13:05 -0500)]
LP1958163 Bootstrap Opac: the 'Request a Card' link.
This fixes the 'Request a Card' link which displays in the bootstrap opac
regardless of the 'Allow Patron Self-Registration' library setting in both
the login page and the login modal.
To Test:
1. Click on My Account in the Bootstrap Opac to open the login modal.
Notice the Request a Card link. Click Login without adding a barcode
or pin# to see the login page with its link.
2. Set the Allow Patron Self_Registration library setting to false for the
Consortium.
3. Repeat 1, and notice that the link still displays.
4. Apply the patch.
5. Now the link should not be visible in both forms.
6. Set the library setting to true, to verify that the link does display.
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Jane Sandberg [Thu, 7 Apr 2022 18:51:01 +0000 (11:51 -0700)]
LP1915816 follow-up: one more .gitignore addition
Suggestion from Shula Link. Thanks, Shula!
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Co-authored-by: Shula Link <slink@gchrl.org>
Jane Sandberg [Thu, 7 Apr 2022 18:50:06 +0000 (11:50 -0700)]
LP1915816 follow-up: update package-lock.json
Jason Boyer [Tue, 16 Feb 2021 13:25:29 +0000 (08:25 -0500)]
LP1915816: Bonus commit - Remove Old .gitignore Entries
There are a few things that were being ignored that could no longer
really exist anyway, so we may as well clear some out.
Signed-off-by: Jason Boyer <JBoyer@EquinoxInitiative.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Jason Boyer [Tue, 16 Feb 2021 12:43:43 +0000 (07:43 -0500)]
LP1915816: Add test output to .gitignore and track package-lock.json
Just what it says on the tin.
Signed-off-by: Jason Boyer <JBoyer@EquinoxInitiative.org>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
blake [Mon, 20 Sep 2021 17:32:26 +0000 (12:32 -0500)]
LP1944205 Advanced Authority Documentation
Added a new document authorities_advanced.adoc
Integrated to the nav
Signed-off-by: blake <blake@mobiusconsortium.org>
Signed-off-by: Lynn Floyd <alynn2671@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Josh Stompro [Thu, 28 Feb 2019 15:43:49 +0000 (09:43 -0600)]
LP#
1778783 - Circulate.pm fix log_me correct barcode var
The log_me sub wasn't using the correct variable for showing the entered
barcode. It should be $self->copy_barcode instead of $self->barcode.
Testing Notes:
Before fix:
1. Watch the logs with something like
tail -f osrfsys.log | fgrep 'circulator: do_permit()'
2. Perform a checkout of a non-existant barcode.
3. Notice that the entered barcode is missing after 'copy='
After fix:
1. Restart the circ openils service
osrf_control -l --service open-ils.circ --restart
2. Watch the logs.
3. Perform a checkout of a non-existant barcode.
4. Notice that the barcode is now shown after 'copy='
Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Bill Erickson [Wed, 16 Mar 2022 20:26:18 +0000 (16:26 -0400)]
LP1958265 Holds grid barcode print/csv fix
Tweak the barcode print/csv logic to populate the current_item and
requested_item values using the same logic as the grid.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Terran McCanna [Mon, 31 Jan 2022 19:29:16 +0000 (14:29 -0500)]
LP1958265 Angular Holds Grids Not Printing Barcode
This adds the ability to print (or download CSV) the Current Item
and Requested Item barcodes from the Holds Pull List and from the
Holds tab of the bib record.
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Jason Stephenson [Fri, 11 Feb 2022 14:44:55 +0000 (09:44 -0500)]
LP1959904: Fix Angular Profile Select Component
The Angular profile select component has a bug when permission group
tree display entries are used. It will loop forever if the grp and
parent have the same value in permission.grp_tree_display_entry
because it is comparing permission group tree entries to permission
group tree display entries in the groups filter of the grpLabel
function.
This patch adds a ternary operator to compare display entries to
display entries and group tree entries to group tree entries in a
manner identical to how the parent value is determined a few lines
above.
See the bug description for more information:
https://bugs.launchpad.net/evergreen/+bug/
1959904
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: John Amundson <jamundson@cwmars.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Wed, 16 Mar 2022 18:22:13 +0000 (14:22 -0400)]
LP1950826 Return error result on contact invalidation
If penalty creation fails, return the error/event response to the caller
instead of the editor's last event.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Jason Etheridge [Mon, 15 Nov 2021 22:30:17 +0000 (17:30 -0500)]
LP1950826 fix invalidate email action
and other invalidate contact actions
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Kyle Huckins [Sun, 13 Mar 2022 00:27:16 +0000 (00:27 +0000)]
lp1913340 - List All Courses in OPAC
- Removed handling preventing an empty query from providing results
- Strip * from query to ensure expected behavior
Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Chris Sharp [Wed, 15 Dec 2021 13:49:28 +0000 (08:49 -0500)]
LP#
1954923: Fix current date issue in Boostrap OPAC Circ History CSV export
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Garry Collum [Thu, 13 Jan 2022 20:02:34 +0000 (15:02 -0500)]
LP1920039-Bootstrap Opac: More Details button doesn't change on use.
The 'More Details' button in a bib record in the Bootstrap Opac should change
to say 'Less Details' when pressed. This patch fixes that behavior.
To Test.
1. Go to a bib record in the boostrap opac.
2. Press "More Details"
3. Notice the button still displays "More Details"
4. Apply the patch and repeat.
5. The button should now toggle between "More Details" and "Less Details"
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: John Amundson <jamundson@cwmars.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Galen Charlton [Tue, 5 Apr 2022 14:44:25 +0000 (10:44 -0400)]
LP#
1967770: Fix test for cover image upload
The cover image upload test assumes that it will be run from exactly one
location, but that's not necessarily true. This commit uses FindBin to
provide the right filesystem context for the test to find the files it
needs.
[Code by Galen, commit message by Mike]
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Tue, 5 Apr 2022 14:38:55 +0000 (10:38 -0400)]
LP#
1967770: Make sure cover image dirs exist
This commit teaches autogen.sh, which should be run after each upgrade,
how to check for and create the required locations for cover image
upload.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Thu, 23 Sep 2021 19:49:16 +0000 (15:49 -0400)]
LP1930747: Add MARC_NAMESPACE to Const.pm
Now that we have 3 separate $MARC_NAMESPACE definitions it's time
to just move it into Const.pm and call it done.
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
gmontimantis [Wed, 30 Mar 2022 19:10:26 +0000 (15:10 -0400)]
Update billing.adoc
updating link
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
gmontimantis [Wed, 23 Mar 2022 18:21:30 +0000 (14:21 -0400)]
Updating billing.adoc
for the 2022 DIG project
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Michele Morgan [Tue, 29 Mar 2022 17:04:55 +0000 (13:04 -0400)]
LP#
1919500 - Tweak to Checkout Staff display
Displays Checkout Staff's usrname instead of id and adds a link to the
record.
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Josh Stompro [Wed, 17 Mar 2021 19:24:34 +0000 (14:24 -0500)]
LP#
1919500 - Add Checkout Workstation and Checkout Staff to Item Status -> Circ History List
Add two more data fields to the Circ History List in Item Status, so that
it is possible to see them after an item is renewed.
Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Terran McCanna [Wed, 22 Sep 2021 18:34:59 +0000 (14:34 -0400)]
LP1865062 Add Credit Card Approval Code to Payment Receipt
Makes approval code available to Bill Payment print template (when relevant).
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Llewellyn Marshall <lbmarshallv.ncdcr@gmail.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jane Sandberg [Thu, 24 Mar 2022 02:09:28 +0000 (19:09 -0700)]
LP#
1965432: follow-up also update package-lock.json
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Chris Sharp [Thu, 17 Mar 2022 18:37:22 +0000 (14:37 -0400)]
LP#
1965432: Upgrade karma to latest version.
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Jason Stephenson [Tue, 15 Mar 2022 13:39:54 +0000 (09:39 -0400)]
LP
1964963: Improve Customization of BOOPAC topnav logo
Move the anchor for the topnav logo from topnav_links.tts to
topnav_logo.tt2. This minor change means that those who wish to move
or remove the topnav logo will have fewer files to change and those
changes will be less likely to conflict with future changes to BOOPAC.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jane Sandberg [Mon, 28 Mar 2022 12:53:32 +0000 (05:53 -0700)]
Fix ng lint errors
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Jane Sandberg [Mon, 28 Mar 2022 12:43:25 +0000 (05:43 -0700)]
Stamping upgrade script for localized notifications
Rogan Hamby [Wed, 23 Feb 2022 18:55:01 +0000 (13:55 -0500)]
This feature supplies the ability to create alternate templates for Action Triggers
that will generate locale specific out for Action Triggers. If you send notices in
multiple languages, we recommend putting some words to that effect in your notice
templates. The template, message and message title can all be localized. To use the
feature the following new UI elements have been added:
- When you double-click on an Event Definition under Notifications / Action Triggers
to edit it there will be a tab option for Edit Alternate Template if the reactor is
ProcessTemplate, SendEmail or SendSMS.
- In the Patron Registration and Patron Editor screens staff members may now select a
locale for a patron and edit it in the Patron Preferred Language field.
- Patrons may set their own locale in the My Account interface off the OPAC by going to
Preferences -> Personal Information and setting the Preferred Language field.
The templates used on the Edit Definition tab are the defaults that are used if there are
no alternate templates available that match the preferred language. If alternate templates
are available the system will use a locale that is an exact match and then if failing that
use one where the language code matches and then fall back to the default one.
For example, if a patron has a locale of fr-CA and there are templates for both fr-CA and
fr-FR it will use the fr-CA. If the fr-CA template was deleted it would fall back on using
the fr-FR for the patron since it at least shares the same base language.
Valid locales are the codes defined in the i18n_locale table in the config schema.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Jane Sandberg [Mon, 28 Mar 2022 03:09:54 +0000 (20:09 -0700)]
Stamping upgrade script for OAI-PMH
Mike Rylander [Wed, 23 Mar 2022 22:11:15 +0000 (18:11 -0400)]
LP#
1729620: Rebase and remove array_accum uses
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Mike Rylander [Wed, 26 Jan 2022 21:36:27 +0000 (16:36 -0500)]
LP#
1729620: Polish up sets and visibility tests
This commit improves the logic needed to control record inclusion in
OAI Sets. Sets for bib records are currently based on copy visibility,
Located URI visibility, or bib source. Generally useful combinations
are generated for item, Located URI, and transcendant [sic] bib sources.
Sets for authority records are based on the browse axis of the heading
for the record.
All generated Sets for bib records currently test for effective search
visibilty on the three described components.
In order to retrieve item data from a specific branch of the org tree,
a harvester must use a Set that contains COPIES:. The hierarchial
shortnames of the org units follow the colon, so in a freshly installed
system a Set with the setSpec of COPIES:CONS:SYS2:BR3 will retrieve all
bib records that have visible copies at BR3, and include only the item
data for that org unit.
To retrieve records with Located URIs, which behave in the heirarchical
reverse of copies by limiting display to those org units "inside" the
branch of the tree where the licensing "lives", a harvester should
supply a setSpec with an org unit shortname that would display the
Located URI. For example: LURIS:CONS:SYS2:BR3
Note: the LURI: org unit is also used to restrict any item data that may
be available for LURI-filtered records.
To retrive records are in a transcendant [sic] bib source, a harvester
can used a setSpec starting with SOURCES: followed by the source name.
To harvest all records, including deleted records, simply omit the
setSpec from the request. All item data will be included.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Jane Sandberg [Wed, 24 Nov 2021 18:26:27 +0000 (10:26 -0800)]
LP1729620: Enable org unit OAI sets
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jane Sandberg [Thu, 18 Nov 2021 03:24:50 +0000 (19:24 -0800)]
LP1729620: Fix opensrf.xml syntax
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 20:14:44 +0000 (16:14 -0400)]
LP#
1729620: (follow-up) do not suggest timestamp manipulation
The suggestion in the upgrade script and the release notes
to consider adding triggers to update biblio.record_entry.timestamp
upon updates of linked call numbers or items is not a good one:
[1] implementing it means that any workflows that require knowing
when a bib itself has changed become untrustworthy
[2] it would cause tremendous bloating of auditor.biblio_record_entry_history,
as every single change to an item -- including ones caused by
circulation activity -- would result in a new entry.
[3] item changes due to circulation activity aren't necessarily
going to want to trigger record updates by the harvester
Wanting the update timestamp for OAI harvest to reflect changes
to items is a perfectly valid use case, but this is not the way.
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 19:59:01 +0000 (15:59 -0400)]
LP#
1729620: update release notes with an upgrade note
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 19:50:39 +0000 (15:50 -0400)]
LP#
1729620: add HTTP::OAI to Debian Bullseye deps
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 16:47:58 +0000 (12:47 -0400)]
LP#
1729620: fix a tab consistency issue
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 19:54:53 +0000 (15:54 -0400)]
LP#
1729620: (follow-up) remove extra child_init that is no longer needed
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 16:45:10 +0000 (12:45 -0400)]
LP#
1729620: (follow-up) move OpenILS::WWW::OAI
Move the module to Open::WWW::SuperCat::OAI, matching other
record export and feed modules.
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Galen Charlton [Fri, 24 Sep 2021 16:40:20 +0000 (12:40 -0400)]
LP#
1729620: (follow-up) move OAI methods to open-ils.supercat
A new service isn't really necessary for the handful
of methods that OAI support needs. Since SuperCat is
where other record harvesting and export methods live, what
was open-ils.oai is moved to SuperCat via this patch.
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jane Sandberg [Sat, 11 Sep 2021 23:46:09 +0000 (16:46 -0700)]
LP#
1729620 enable the OAI service by default
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jane Sandberg [Wed, 25 Aug 2021 21:29:53 +0000 (14:29 -0700)]
LP#
1729620 Follow-up bugfixes
* Perl no longer allows the `keys` function to take scalar expressions
* Typo in service name in opensrf_core example config file
* Added oai schema script to the manifest file so that it is run as part of installation
* Unnecessary sigil
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jane Sandberg [Wed, 25 Aug 2021 19:35:08 +0000 (12:35 -0700)]
LP#
1729620 Updating modern dependencies to include OAI library
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Remington Steed [Thu, 2 Nov 2017 14:14:51 +0000 (15:14 +0100)]
LP#
1729620 Cleanup, fix bugs
- Rename DB schema file to follow convention
- Remove optional DB commands, and leave them in Release Notes (and
possibly add to Official Docs)
- Create DB upgrade script
- Print optional DB commands using \qecho
- Change variable "tcn" to "rec_id" everywhere
- Move perl API registration to be immediately after related function
- Remove unused parameter from sub oai_list_retrieve() in
Application/OAI.pm, and from API calls in WWW/OAI.pm
- Fix mislabeled parameter in API doc
- Add missing end-comment tags in opensrf.xml.example
- Add dependency to Ubuntu/Debian makefiles
- Add missing init handler in apache/eg.conf.in
- Fix reference to sysconfdir in apache/eg_startup.in
- Undo extraneous change to .gitignore
- Trim/rename release notes, since most of the install process is
handled via Evergreen install instructions.
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Lucien van Wouw [Thu, 2 Nov 2017 14:14:51 +0000 (15:14 +0100)]
LP#
1729620 New optional feature: an OAI2 provider service.
This module is an opensrf service that exposes bibliographic and authority records through the OAI2 protocol.
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.
(d) 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(s) involved.
Signed-off-by: Lucien van Wouw, IISG, Amsterdam.
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Thu, 15 Oct 2020 17:50:18 +0000 (13:50 -0400)]
LP1900005: Don't require a specific 'opensrf' user
There's no technical reason to require a specific user beyond our
instructions stating that it's the default. One thing that we should
do is not allow our network services to be run as root.
Additionally, autogen.sh is excluded from running as root because while
that would work, it may then have to *always* be run by root or
require you to change the file owner between runs.
NOTE: We check for the user by id rather than name, as there's no rule
saying user 0 must be called "root" on Linux.
NOTE: This also cleans up and unifies the the coding style and removes
some dead code in autogen.sh.
To test:
Pre-patch:
Use oils_ctl.sh to start SIP or z3950 as opensrf, Success.
Use oils_ctl.sh to start SIP or z3950 as yourself, Failure.
Use oils_ctl.sh to start SIP or z3950 as root, Failure.
Run autogen.sh as opensrf, Success.
Run autogen.sh as yourself, Failure.
Run autogen.sh as root, Failure.
Post patch:
Use oils_ctl.sh to start SIP or z3950 as opensrf, Success.
Use oils_ctl.sh to start SIP or z3950 as your normal user, Success.
Use oils_ctl.sh to start SIP or z3950 as root, Failure.
Run autogen.sh as opensrf, Success.
Run autogen.sh as yourself, potential Success - IF you're able to write to the correct directory / files.
Run autogen.sh as root, Failure.
Signed-off-by: Jason Boyer <JBoyer@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jane Sandberg <sandbergja@gmail.com>
Terran McCanna [Mon, 31 Jan 2022 22:26:15 +0000 (17:26 -0500)]
LP1956970 Sort Patron Notes - Most Recent First
This changes the default sort order of patron notes from oldest
first to most recent first.
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Terran McCanna [Wed, 2 Jun 2021 19:29:53 +0000 (15:29 -0400)]
LP1930614 Bootstrap OPAC Summary Block
This breaks out the summary (from the 520 field) from the rest
of the MARC data so that it displays above/outside of the More
Details button on the record page.
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
foo
Mike Rylander [Fri, 25 Mar 2022 21:03:06 +0000 (17:03 -0400)]
Stamping upgrade script for JQuery YAOUS
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Rogan Hamby [Mon, 21 Oct 2019 13:47:45 +0000 (09:47 -0400)]
adding query to opac by library setting
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Thu, 20 Jan 2022 22:13:08 +0000 (17:13 -0500)]
LP1958581 Copy to clipboard always available
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Thu, 20 Jan 2022 21:16:10 +0000 (16:16 -0500)]
LP1958581 Angular Grid Copy To Clipboard
To test, right click on a row in an Angular grid. A dialog should
appear which allows the user to click on a value to select the value
into the clipboard. Once selected, the dialog should close.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 24 Mar 2022 23:10:22 +0000 (19:10 -0400)]
Fixing merge conflict resolution from Simple Reporter merge
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Garry Collum [Thu, 3 Feb 2022 22:57:45 +0000 (17:57 -0500)]
LP#
1959405: hold status not looking for shelf delay status
This patch fixes the blank status display in the opac by treating that
status as a 'Waiting for Copy' status. This commit covers both the TPAC
and the Bootstrap OPAC.
To Test:
As stated by Erica in LP1959405
1. Administration->Local Administration->Library Settins Editor
set Hold Shelf Status Delay to 1 minute.
2. Place a hold for a patron
3. Capture the hold.
The opac will change from "Waiting for Copy" to a blank column.
4. Allow the delay interval to expire
The opac will change from a blank status to "Available"
5. Apply the patch
6. Repeat 2-3.
The opac will continue to display "Waiting for Copy"
7. Allow the delay interval to expire
The opac will change from "Waiting for Copy" to "Available"
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 24 Mar 2022 21:32:20 +0000 (17:32 -0400)]
Stamping upgrade script for inventory changes
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Thu, 30 Dec 2021 15:17:58 +0000 (10:17 -0500)]
LP1883171 & LP1940663: Add release notes
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Tue, 23 Nov 2021 03:09:26 +0000 (22:09 -0500)]
LP1883171 & LP1940663: Add Perl live test
Add live tests to test that invetory dates are added, or not, during
checkin and inventory update as appropriate. These tests cover the
basics for the backend Perl methods. The database tests are slightly
more thorough.
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Sun, 7 Nov 2021 21:00:34 +0000 (16:00 -0500)]
LP1883171 & LP1940663: Basic staff client modifications
Modify the Item Staus view to check the new return values of the
update copy inventory function.
Fix toast handling in the list view to properly report success and failure.
Add toast handling to the single copy Item Status view to report
success and failure.
NOTE: More work could be done on the toasts to report number of
successful updates, etc. I tried using the compileContent and trusted
HTML, but this lead to new errors that I couldn't decipher.
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Sun, 31 Oct 2021 20:14:10 +0000 (16:14 -0400)]
LP1883171 & LP1940663: Replace circ method to update latest inventory
Replace the open-ils.circ.circulation.update_latest_inventory method
with open-ils.circ.circulation.update_copy_inventory.
Beyond renaming the method and changing the tables it operates on, the
following changes are also made:
1. Use savepoints to allow some updates to succeed when others fail.
2. Modify the return value to include success and failure counts so that
these could potentially be used in client feedback.
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Sun, 31 Oct 2021 19:18:22 +0000 (15:18 -0400)]
LP1883171 & LP1940663: Modify do_checkin for asset.copy_inventory
Modify the do_chekin method of Circulate.pm to create a new
asset::copy_inventory object when the do inventory modifier is used.
This change necessitates moving the check for a floating copy up to
where the do inventory code is run and subsequent modifications to the
transit and noop checkin code.
Set checkin_changed to true when adding an asset.copy_inventory entry
during check-in so that even if there would otherwise be a NO_CHANGE
response, the row will still get created.
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Stephenson [Sun, 24 Oct 2021 16:54:31 +0000 (12:54 -0400)]
LP1883171 & LP1940663: Database & IDL updates for copy inventory table
Add new asset.copy_inventory table with constraints:
* Foreign Key on copy -> asset.copy.id
* Unique index on inventory_date and copy
* Require that copy is at home or may float to inventory_workstation org.
Add IDL entry for asset.copy_inventory table (aci).
Change asset.latest_inventory table into a view.
Mark the asset.latest_inventory IDL entry (alci) read-only.
Provide database upgrade script to make the database changes and move
entries from the asset.latest_inventory table to the
asset.copy_inventory table.
Add pgtap schema tests to validate that the above tables, views, and
constraints exist.
Add pgtap live tests to validate that the table and view constraints
work as intended.
MERGE NOTE: IDL permissions on the new real table were updated to
match previously modified permissions on the old real table.
This work was sponsored by NOBLE.
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michele Morgan [Tue, 2 Mar 2021 16:46:42 +0000 (11:46 -0500)]
LP1907123 Angular Catalog View Holds missing columns
Teaches the t_holds.tt2 TPAC file to save columns with the same names as
the Angular Catalog.
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Elaine Hardy <ehardy@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 24 Mar 2022 19:17:39 +0000 (15:17 -0400)]
Stamping upgrade script for Simple Reporter (permission ID adjusted)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Fri, 18 Mar 2022 16:14:06 +0000 (12:14 -0400)]
Make the "ignore this boolean" option more clear
Change Bool Either to Both
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Fri, 11 Mar 2022 17:45:33 +0000 (12:45 -0500)]
Update Promise instantiation to deal with TypeScript changes
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 21 Dec 2021 21:30:42 +0000 (16:30 -0500)]
Add release note
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 14 Dec 2021 19:15:13 +0000 (14:15 -0500)]
Wire up Simple Reporter into the Staff Client Interface
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 14 Dec 2021 19:14:35 +0000 (14:14 -0500)]
Simple Reporter Angular App
Simply put, it reports.
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 28 Oct 2021 17:22:06 +0000 (13:22 -0400)]
add component for general text multi-select
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Mike Rylander [Thu, 28 Oct 2021 17:21:30 +0000 (13:21 -0400)]
improve existing components for use in SR
Add onChange emitter to eg-org-family-select, and augment the output so we can reconstruct it
Add @sr:org_filter_field capability to eg-multi-select and eg-combobox
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Mike Rylander [Fri, 29 Oct 2021 14:26:41 +0000 (10:26 -0400)]
Make disused "= any" and "<> any" useful
Allow caller to supply a PG-encoded array string to test against a column value.
Also, repair relative week transform that has never worked.
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Jason Boyer [Tue, 14 Dec 2021 17:51:16 +0000 (12:51 -0500)]
Teach Current Reporter to Ignore Simple Reporter Folders
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 14 Dec 2021 17:48:32 +0000 (12:48 -0500)]
Validate IDL Against XSD
Largely field name typos.
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 14 Dec 2021 15:57:58 +0000 (10:57 -0500)]
Add Simple Reporter IDL definitions
Add SR IDL classes, update reporter.*, add xsl2js transforms,
and add sr namespace to fm_IDL.xsd. Overall IDL tidying to come.
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 14 Dec 2021 15:33:32 +0000 (10:33 -0500)]
Add Simple Reporter Schema Changes
New permission for Simple Reporter: RUN_SIMPLE_REPORTS
A simple_reporter field on reporter folder tables to maintain separation
between Simple Reporter and It's Complicated. Also adjust indexes to allow
duplicate names between reporters if for some reason you want to do that.
And a reporter.completed_reports view to compliment reporter.currently_running.
Sponsored-by: C/W MARS
Sponsored-by: Missouri Evergreen Consortium
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Mike Rylander [Thu, 24 Mar 2022 18:34:57 +0000 (14:34 -0400)]
Stamping upgrade script
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Bill Erickson [Fri, 3 Dec 2021 18:27:01 +0000 (13:27 -0500)]
LP1951162 Migrate copy templates setting
Rename the user setting "webstaff.cat.copy.templates" to
"cat.copy.templates" and migrate any existing values. This operation is
not performed for any databases where a "cat.copy.templates" user or
workstation setting type already exists.
Teach the Angular copy editor to avoid looking up templates in local
storage, since only XUL templates are stored there, which are not
compatible.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Dan Briem [Wed, 16 Mar 2022 20:45:37 +0000 (16:45 -0400)]
LP#
1746800 Exclude empty records on filtered staff searches
Excludes empty bibs on staff searches when filtering on location
or location group or when using the availability modifier.
Signed-off-by: Dan Briem <dbriem@wlsmail.org>
Signed-off-by: Jennifer Weston <jennifer.weston@equinoxoli.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Terran McCanna [Fri, 31 Dec 2021 18:37:09 +0000 (13:37 -0500)]
LP1909681 Open hold grid links in new tab
This updates the holds grid used by Hopeless Holds, the Holds Pull
List, and the staff catalog record View Holds tab.
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Tiffany Little [Fri, 18 Jun 2021 18:33:50 +0000 (14:33 -0400)]
LP1928003 Protect real copies from auto-deletion by cancelling acq line items
Signed-off-by: Tiffany Little <tlittle@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Wed, 2 Mar 2022 11:54:29 +0000 (06:54 -0500)]
Hide username and password in eg2 when screen is narrow
The Angular staff client navbar doesn't collapse when the screen is narrow
but currently the username and password can wrap, pushing the navbar over
the content. This patch doesn't add a collapsing navbar but hiding the user
information does at least stop the navbar from growing.
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jason Boyer [Tue, 1 Mar 2022 19:34:55 +0000 (14:34 -0500)]
LP1724008: Hide User@workstation when screen is narrow
As an intermediate step between the "full" navbar and the
collapsed navbar we hide the username and workstation of
the current user. This helps prevent the wrapping that can
cause the navbar to cover some of the page.
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: rfrasur <rfrasur@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Jeff Davis [Fri, 5 Nov 2021 23:41:55 +0000 (16:41 -0700)]
LP#
1951318: API call to retrieve (publicly-visible) carousel contents
Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Terran McCanna [Thu, 23 Sep 2021 16:53:54 +0000 (12:53 -0400)]
LP1944755 Add ability to embed carousels on external pages
This displays carousels on an otherwise blank page, allowing
libraries to very easily embed them on their web sites using iframes.
Example iframe code:
<iframe src="(my opac domain)/eg/opac/carousel?carousel_loc=4" title="Carousel"
width="80%" height="500px;" frameborder="0"></iframe>
The base_simple code could also be used by other future features
that are driven by Evergreen but that shouldn't display the headers and
footers.
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Michele Morgan [Thu, 24 Mar 2022 15:01:13 +0000 (11:01 -0400)]
lp1787968 Stamping upgrade script
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Michele Morgan [Thu, 24 Mar 2022 14:26:02 +0000 (10:26 -0400)]
lp1787968 Release Notes Addendum
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jason Etheridge [Mon, 11 Oct 2021 22:24:16 +0000 (18:24 -0400)]
lp1787968 jacket_upload: release notes
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jason Etheridge [Mon, 11 Oct 2021 21:52:00 +0000 (17:52 -0400)]
lp1787968 jacket_upload: tests
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jason Etheridge [Fri, 3 Sep 2021 15:25:14 +0000 (11:25 -0400)]
lp1787968 jacket_upload: UI
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jason Etheridge [Fri, 13 Aug 2021 16:23:49 +0000 (12:23 -0400)]
lp1787968 jacket_upload: server-side
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Jason Etheridge [Tue, 7 Sep 2021 01:54:50 +0000 (21:54 -0400)]
lp1787968 jacket_upload: schema
Changed permission id due to conflict.
Signed-off-by: Jason Etheridge <jason@EquinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Tiffany Little [Fri, 3 Dec 2021 18:53:40 +0000 (13:53 -0500)]
LP1953193 Add autofilter to funding sources
Adds an autofilter on the active column.
Signed-off-by: Tiffany Little <tlittle@georgialibraries.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Mary Llewellyn <mllewell@biblio.org>
Mike Rylander [Thu, 24 Mar 2022 13:01:34 +0000 (09:01 -0400)]
Stamping upgrade script
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Galen Charlton [Wed, 22 Dec 2021 21:54:22 +0000 (16:54 -0500)]
LP#
1938835: release notes for the customizable staff portal
To test
-------
[1] Apply the patch.
[2] Verify that the Angular staff portal is now the default
and that it displays the stock portal entries.
[3] In the new Staff Portal Page local administration interface,
make changes to add, subtract, or modify portal page entries.
[4] Verify that those changes appear on the staff portal page and
that they are sensitive to the workstation that the staff
user is logged in as.
Sponsored-by: Pioneer Library System
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Shula Link <slink@gchrl.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Dan Guarracino <dguarracino@pls-net.org>