From 2cbc33c1c83b0cf244b43088d67c02ab77307444 Mon Sep 17 00:00:00 2001 From: erickson Date: Wed, 13 Jun 2007 14:11:35 +0000 Subject: [PATCH] Merging changes from trunk into the new-json branch to keep it in sync with trunk $ svn merge -r 7305:HEAD svn://svn.open-ils.org/ILS/trunk Changeset 7305 is the changeset where the new-json branch was created in the ILS tree This is the first sync merge git-svn-id: svn://svn.open-ils.org/ILS/branches/new-json@7421 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../javascript/backend/circ/circ_item_config.js | 4 +- .../javascript/backend/circ/circ_permit_hold.js | 7 +- Evergreen/staff_client/LICENSE | 0 Evergreen/staff_client/Makefile | 94 -- Evergreen/staff_client/README | 1 - Evergreen/staff_client/application.ini | 39 - Evergreen/staff_client/chrome/chrome.manifest | 3 - .../chrome/content/evergreen/Open-ILS/OpenILS.js | 55 - .../content/evergreen/Open-ILS/OpenILS_overlay.xul | 54 - .../evergreen/Open-ILS/OpenILS_scripts_overlay.xul | 33 - .../content/evergreen/OpenSRF/OpenSRF_overlay.xul | 23 - .../chrome/content/evergreen/auth/auth.js | 545 ------ .../chrome/content/evergreen/auth/auth.xul | 44 - .../chrome/content/evergreen/auth/auth_overlay.xul | 82 - .../chrome/content/evergreen/cat/brief.xul | 72 - .../chrome/content/evergreen/cat/browse_list.js | 709 -------- .../chrome/content/evergreen/cat/browse_list.xul | 43 - .../content/evergreen/cat/browse_list_overlay.xul | 94 -- .../chrome/content/evergreen/cat/cat.js | 58 - .../chrome/content/evergreen/cat/cat.xul | 40 - .../chrome/content/evergreen/cat/cat_overlay.xul | 179 -- .../chrome/content/evergreen/cat/copy.js | 359 ---- .../chrome/content/evergreen/cat/copy.xul | 42 - .../content/evergreen/cat/copy_add_wizard.xul | 36 - .../chrome/content/evergreen/cat/copy_display.xul | 48 - .../chrome/content/evergreen/cat/copy_edit.js | 119 -- .../chrome/content/evergreen/cat/copy_edit.xul | 40 - .../content/evergreen/cat/copy_edit_overlay.xul | 48 - .../chrome/content/evergreen/cat/copy_overlay.xul | 315 ---- .../chrome/content/evergreen/cat/details.xul | 112 -- .../chrome/content/evergreen/cat/marc.js | 915 ---------- .../chrome/content/evergreen/cat/marc.xul | 44 - .../chrome/content/evergreen/cat/marc_fixed.js | 149 -- .../chrome/content/evergreen/cat/marc_keys.js | 221 --- .../chrome/content/evergreen/cat/marc_overlay.xul | 930 ----------- .../chrome/content/evergreen/cat/marc_rules.js | 2 - .../chrome/content/evergreen/cat/marc_validate.js | 179 -- .../chrome/content/evergreen/cat/record_list.js | 215 --- .../chrome/content/evergreen/cat/record_list.xul | 43 - .../content/evergreen/cat/record_list_overlay.xul | 67 - .../content/evergreen/cat/spine_label_wizard.xul | 95 -- .../chrome/content/evergreen/cat/volume.js | 460 ----- .../evergreen/cat/volume_copy_add_overlay.xul | 87 - .../evergreen/cat/volume_copy_add_wizard.xul | 36 - .../content/evergreen/cat/volume_edit_overlay.xul | 35 - .../content/evergreen/cat/volume_edit_wizard.xul | 33 - .../chrome/content/evergreen/circ/checkin.js | 176 -- .../chrome/content/evergreen/circ/checkin.xul | 46 - .../chrome/content/evergreen/circ/checkin_items.js | 64 - .../content/evergreen/circ/checkin_overlay.xul | 79 - .../chrome/content/evergreen/circ/circ_utils.js | 491 ------ .../chrome/content/evergreen/circ/hold_capture.js | 164 -- .../chrome/content/evergreen/circ/hold_capture.xul | 46 - .../content/evergreen/circ/hold_capture_items.js | 64 - .../evergreen/circ/hold_capture_overlay.xul | 76 - .../evergreen/circ/receipt_template_editor.xul | 256 --- .../chrome/content/evergreen/contents.rdf | 32 - .../chrome/content/evergreen/main/about.xul | 23 - .../chrome/content/evergreen/main/app_shell.js | 205 --- .../chrome/content/evergreen/main/app_shell.xul | 42 - .../evergreen/main/app_shell_menus_overlay.xul | 143 -- .../content/evergreen/main/app_shell_overlay.xul | 224 --- .../chrome/content/evergreen/main/clam_shell.js | 92 - .../chrome/content/evergreen/main/clam_shell.xul | 39 - .../content/evergreen/main/clam_shell_overlay.xul | 26 - .../content/evergreen/main/clam_shell_vertical.xul | 40 - .../evergreen/main/clam_shell_vertical_overlay.xul | 26 - .../chrome/content/evergreen/main/grid_list.js | 82 - .../content/evergreen/main/grid_list_overlay.xul | 37 - .../chrome/content/evergreen/main/list_box.js | 74 - .../chrome/content/evergreen/main/paged_tree.js | 263 --- .../content/evergreen/main/paged_tree_overlay.xul | 63 - .../chrome/content/evergreen/opac/opac.js | 116 -- .../chrome/content/evergreen/opac/opac.xul | 25 - .../evergreen/patron/patron_barcode_entry.xul | 67 - .../evergreen/patron/patron_bill_details.xul | 82 - .../evergreen/patron/patron_bill_wizard.xul | 123 -- .../content/evergreen/patron/patron_bills.js | 462 ------ .../evergreen/patron/patron_checkout_items.js | 64 - .../content/evergreen/patron/patron_display.js | 719 -------- .../content/evergreen/patron/patron_display.xul | 51 - .../patron/patron_display_contact_overlay.xul | 164 -- .../evergreen/patron/patron_display_overlay.xul | 207 --- .../patron/patron_display_status_overlay.xul | 100 -- .../chrome/content/evergreen/patron/patron_edit.js | 171 -- .../content/evergreen/patron/patron_edit_legacy.js | 1754 -------------------- .../evergreen/patron/patron_edit_legacy.xul | 38 - .../evergreen/patron/patron_edit_overlay.xul | 259 --- .../content/evergreen/patron/patron_holds.js | 77 - .../content/evergreen/patron/patron_items.js | 64 - .../content/evergreen/patron/patron_new_legacy.xul | 45 - .../content/evergreen/patron/patron_search.js | 207 --- .../content/evergreen/patron/patron_search.xul | 41 - .../content/evergreen/patron/patron_search_form.js | 62 - .../patron/patron_search_form_overlay.xul | 97 -- .../evergreen/patron/patron_search_overlay.xul | 56 - .../evergreen/patron/patron_search_results.js | 87 - .../content/evergreen/patron/patron_utils.js | 547 ------ .../evergreen/stat_cat/copy_stat_cat_editor.xul | 31 - .../evergreen/stat_cat/patron_stat_cat_editor.xul | 31 - .../chrome/content/evergreen/stat_cat/stat_cat.js | 945 ----------- .../content/evergreen/stat_cat/stat_cat_bundle.xul | 12 - .../evergreen/stat_cat/stat_cat_overlay.xul | 45 - .../chrome/content/evergreen/survey/survey.js | 211 --- .../content/evergreen/survey/survey_bundle.xul | 12 - .../content/evergreen/survey/survey_overlay.xul | 105 -- .../content/evergreen/survey/survey_wizard.xul | 29 - .../content/evergreen/util/browser_overlay.js | 40 - .../content/evergreen/util/browser_overlay.xul | 25 - .../chrome/content/evergreen/util/datetime.js | 73 - .../chrome/content/evergreen/util/error.js | 207 --- .../chrome/content/evergreen/util/explode.js | 67 - .../chrome/content/evergreen/util/file.js | 90 - .../content/evergreen/util/filter_console.xul | 166 -- .../chrome/content/evergreen/util/fm_utils.js | 133 -- .../chrome/content/evergreen/util/fm_view.xul | 159 -- .../chrome/content/evergreen/util/functional.js | 113 -- .../content/evergreen/util/make_wiki_table.pl | 14 - .../chrome/content/evergreen/util/populate.js | 525 ------ .../chrome/content/evergreen/util/print.js | 303 ---- .../chrome/content/evergreen/util/ses.js | 151 -- .../chrome/content/evergreen/util/shell.html | 690 -------- .../chrome/content/evergreen/util/sound.js | 42 - .../chrome/content/evergreen/util/spawn_win.js | 297 ---- .../chrome/content/evergreen/util/util.js | 321 ---- .../chrome/content/evergreen/util/util_overlay.xul | 47 - .../chrome/content/evergreen/util/validate.js | 63 - .../chrome/content/evergreen/util/widgets.js | 515 ------ .../chrome/content/evergreen/util/win.js | 190 --- .../chrome/content/evergreen/util/xpcom.js | 24 - .../chrome/content/evergreen/util/xuledit.js | 65 - .../chrome/content/evergreen/util/xuledit.xul | 15 - .../chrome/content/evergreen/z39_50/z39_50.js | 7 - .../chrome/content/evergreen/z39_50/z39_50.xul | 24 - .../content/evergreen/z39_50/z39_50_bundle.xul | 12 - .../content/evergreen/z39_50/z39_50_overlay.xul | 21 - .../locale/en-US/evergreen/OpenILS.properties | 160 -- .../chrome/locale/en-US/evergreen/app_shell.dtd | 73 - .../locale/en-US/evergreen/app_shell.properties | 0 .../chrome/locale/en-US/evergreen/auth.dtd | 12 - .../chrome/locale/en-US/evergreen/auth.properties | 0 .../chrome/locale/en-US/evergreen/cat.dtd | 512 ------ .../chrome/locale/en-US/evergreen/checkin.dtd | 20 - .../chrome/locale/en-US/evergreen/circ_tree.dtd | 0 .../chrome/locale/en-US/evergreen/clam_shell.dtd | 0 .../locale/en-US/evergreen/clam_shell.properties | 0 .../chrome/locale/en-US/evergreen/contents.rdf | 24 - .../chrome/locale/en-US/evergreen/hold_capture.dtd | 20 - .../chrome/locale/en-US/evergreen/paged_tree.dtd | 7 - .../chrome/locale/en-US/evergreen/patron.dtd | 1 - .../locale/en-US/evergreen/patron.properties | 0 .../locale/en-US/evergreen/patron_display.dtd | 83 - .../locale/en-US/evergreen/patron_search.dtd | 1 - .../locale/en-US/evergreen/patron_search_form.dtd | 31 - .../chrome/locale/en-US/evergreen/stat_cat.dtd | 0 .../chrome/locale/en-US/evergreen/survey.dtd | 4 - .../chrome/locale/en-US/evergreen/z39_50.dtd | 0 .../chrome/skin/evergreen/app_shell.css | 2 - .../staff_client/chrome/skin/evergreen/auth.css | 3 - .../chrome/skin/evergreen/browse_list.css | 5 - .../staff_client/chrome/skin/evergreen/cat.css | 5 - .../staff_client/chrome/skin/evergreen/checkin.css | 3 - .../chrome/skin/evergreen/circ_tree.css | 3 - .../chrome/skin/evergreen/clam_shell.css | 2 - .../chrome/skin/evergreen/contents.rdf | 25 - .../chrome/skin/evergreen/evergreen.css | 23 - .../chrome/skin/evergreen/hold_capture.css | 3 - .../staff_client/chrome/skin/evergreen/marc.css | 47 - .../skin/evergreen/media/images/cooltext001.png | Bin 55424 -> 0 bytes .../skin/evergreen/media/images/main_logo.jpg | Bin 18309 -> 0 bytes .../chrome/skin/evergreen/media/sounds/clicked.wav | Bin 5478 -> 0 bytes .../chrome/skin/evergreen/media/sounds/cow.wav | Bin 18796 -> 0 bytes .../chrome/skin/evergreen/media/sounds/die.wav | Bin 14544 -> 0 bytes .../chrome/skin/evergreen/media/sounds/gong.wav | Bin 95668 -> 0 bytes .../skin/evergreen/media/sounds/redalert.wav | Bin 45400 -> 0 bytes .../chrome/skin/evergreen/media/sounds/turn.wav | Bin 28832 -> 0 bytes .../staff_client/chrome/skin/evergreen/opac.css | 2 - .../chrome/skin/evergreen/paged_tree.css | 3 - .../staff_client/chrome/skin/evergreen/patron.css | 7 - .../chrome/skin/evergreen/patron_display.css | 3 - .../skin/evergreen/patron_display_contact.css | 3 - .../skin/evergreen/patron_display_status.css | 3 - .../chrome/skin/evergreen/patron_search.css | 3 - .../chrome/skin/evergreen/patron_search_form.css | 3 - .../skin/evergreen/patron_search_results.css | 3 - .../chrome/skin/evergreen/stat_cat.css | 13 - .../staff_client/chrome/skin/evergreen/survey.css | 7 - .../staff_client/chrome/skin/evergreen/z39_50.css | 0 .../staff_client/defaults/preferences/evergreen.js | 21 - Evergreen/staff_client/install.js | 120 -- Evergreen/staff_client/install.rdf | 39 - Evergreen/xul/staff_client/server/patron/ue.js | 1 + Open-ILS/examples/fm_IDL.xml | 790 ++++----- Open-ILS/examples/fm_IDL.xsd | 109 ++ Open-ILS/examples/oils_obj.xsd | 34 + Open-ILS/examples/oils_persist.xsd | 37 + Open-ILS/examples/reporter.xsd | 36 + Open-ILS/src/Makefile | 5 +- Open-ILS/src/apachemods/mod_rest_gateway.c | 6 +- Open-ILS/src/c-apps/Makefile | 44 +- Open-ILS/src/c-apps/oils_auth.c | 4 +- Open-ILS/src/c-apps/oils_idl-core.c | 2 +- Open-ILS/src/extras/fieldmapper_IDL.pl | 2 +- Open-ILS/src/extras/import/marc2bre.pl | 17 +- Open-ILS/src/extras/oils_requestor.c | 38 +- {OpenSRF => Open-ILS}/src/java/Makefile | 21 +- Open-ILS/src/java/org/open_ils/idl/IDLField.java | 46 + Open-ILS/src/java/org/open_ils/idl/IDLLink.java | 46 + Open-ILS/src/java/org/open_ils/idl/IDLObject.java | 96 ++ Open-ILS/src/java/org/open_ils/idl/IDLParser.java | 178 ++ Open-ILS/src/java/org/open_ils/test/TestIDL.java | 11 + Open-ILS/src/perlmods/OpenILS/Application/Actor.pm | 2 +- Open-ILS/src/perlmods/OpenILS/Application/Circ.pm | 5 +- .../perlmods/OpenILS/Application/Circ/Transit.pm | 45 +- .../perlmods/OpenILS/Application/Search/Z3950.pm | 13 +- .../src/perlmods/OpenILS/Application/SuperCat.pm | 2 + Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm | 134 ++ Open-ILS/src/python/oils/const.py | 2 +- Open-ILS/src/python/oils/utils/idl.py | 178 +- Open-ILS/src/sql/Pg/020.schema.functions.sql | 18 + .../src/support-scripts/test-scripts/container.pl | 6 +- Open-ILS/web/opac/common/js/RemoteRequest.js | 79 +- Open-ILS/web/opac/images/eg_tiny_logo.jpg | Bin 0 -> 1722 bytes Open-ILS/web/opac/locale/en-US/common.dtd | 22 - Open-ILS/web/opac/locale/en-US/opac.dtd | 406 ++++- Open-ILS/web/opac/locale/en-US/opac_advanced.dtd | 23 - Open-ILS/web/opac/locale/en-US/opac_common.dtd | 69 - Open-ILS/web/opac/locale/en-US/opac_holds.dtd | 11 - Open-ILS/web/opac/locale/en-US/opac_rdetail.dtd | 19 - Open-ILS/web/opac/locale/en-US/opac_result.dtd | 0 Open-ILS/web/opac/skin/default/js/holds.js | 2 +- .../skin/default/xml/advanced/advanced_global.xml | 60 +- .../skin/default/xml/advanced/advanced_quick.xml | 12 +- .../web/opac/skin/default/xml/common/cn_browse.xml | 10 +- .../web/opac/skin/default/xml/common/fonts.xml | 8 +- .../web/opac/skin/default/xml/common/holds.xml | 84 +- .../web/opac/skin/default/xml/common/libselect.xml | 6 +- .../web/opac/skin/default/xml/common/login.xml | 36 +- .../web/opac/skin/default/xml/common/searchbar.xml | 2 +- .../web/opac/skin/default/xml/common/sidebar.xml | 36 +- .../web/opac/skin/default/xml/common/statusbar.xml | 2 +- Open-ILS/web/opac/skin/default/xml/common/tips.xml | 2 +- Open-ILS/web/opac/skin/default/xml/footer.xml | 20 +- .../web/opac/skin/default/xml/home/index_body.xml | 7 +- .../skin/default/xml/myopac/myopac_bookbags.xml | 68 +- .../opac/skin/default/xml/myopac/myopac_fines.xml | 54 +- .../opac/skin/default/xml/myopac/myopac_holds.xml | 28 +- .../opac/skin/default/xml/myopac/myopac_prefs.xml | 38 +- .../skin/default/xml/myopac/myopac_summary.xml | 93 +- Open-ILS/web/opac/skin/default/xml/page_myopac.xml | 14 +- .../web/opac/skin/default/xml/page_rdetail.xml | 29 +- .../default/xml/rdetail/rdetail_cn_details.xml | 50 +- .../skin/default/xml/rdetail/rdetail_copyinfo.xml | 10 +- .../skin/default/xml/rdetail/rdetail_extras.xml | 22 +- .../skin/default/xml/rdetail/rdetail_summary.xml | 20 +- .../opac/skin/default/xml/result/result_info.xml | 20 +- .../skin/default/xml/result/result_lowhits.xml | 28 +- .../opac/skin/default/xml/result/result_table.xml | 16 +- Open-ILS/web/reports/oils_rpt_editor.xhtml | 4 + Open-ILS/web/reports/oils_rpt_param_editor.js | 5 + Open-ILS/web/reports/oils_rpt_report_editor.js | 43 +- Open-ILS/web/reports/oils_rpt_tforms.js | 4 +- Open-ILS/web/reports/oils_rpt_vars.js | 4 +- Open-ILS/web/reports/oils_rpt_widget.js | 12 +- Open-ILS/web/reports/xul/source-setup.js | 2 +- Open-ILS/web/reports/xul/template-config.js | 31 +- Open-ILS/web/reports/xul/transforms.js | 24 +- Open-ILS/xul/staff_client/Makefile | 18 +- .../staff_client/chrome/content/OpenILS/data.js | 26 + .../chrome/content/OpenILS/global_util.js | 6 + .../xul/staff_client/chrome/content/util/date.js | 82 +- .../xul/staff_client/chrome/content/util/error.js | 4 +- .../xul/staff_client/chrome/content/util/list.js | 183 +- .../xul/staff_client/components/nsIOpenILS.xpt | Bin 131 -> 155 bytes Open-ILS/xul/staff_client/external/prune_dirs.sh | 1 + Open-ILS/xul/staff_client/server/admin/adminlib.js | 3 +- .../staff_client/server/admin/stat_cat_editor.js | 2 + .../xul/staff_client/server/admin/transit_list.js | 194 ++- .../xul/staff_client/server/admin/transit_list.xul | 103 +- .../xul/staff_client/server/cat/copy_browser.js | 11 +- .../xul/staff_client/server/cat/copy_browser.xul | 2 +- .../xul/staff_client/server/circ/copy_status.js | 135 +- .../xul/staff_client/server/circ/copy_status.xul | 1 + .../server/circ/copy_status_overlay.xul | 5 + .../server/main/gen_offline_widgets.xul | 3 +- Open-ILS/xul/staff_client/server/main/ws_info.xul | 5 + Open-ILS/xul/staff_client/server/patron/bills.js | 3 +- Open-ILS/xul/staff_client/server/patron/display.js | 14 +- Open-ILS/xul/staff_client/server/patron/items.js | 71 +- .../xul/staff_client/server/patron/search_form.js | 11 +- .../xul/staff_client/server/patron/search_form.xul | 5 +- OpenSRF/bin/osrf_ctl.sh | 180 -- OpenSRF/doc/Application-HOWTO.txt | 95 -- OpenSRF/doc/OpenSRF-Messaging-Protocol.html | 297 ---- OpenSRF/doc/Persist-API.html | 651 -------- OpenSRF/doc/Roadmap.txt | 51 - OpenSRF/doc/dokuwiki-doc-stubber.pl | 114 -- OpenSRF/examples/bootstrap.conf.example | 44 - OpenSRF/examples/fieldmapper2cdbi.xsl | 79 - OpenSRF/examples/fieldmapper2javascript.xsl | 297 ---- OpenSRF/examples/fieldmapper2perl.xsl | 225 --- OpenSRF/examples/gen-fieldmapper.xml | 327 ---- OpenSRF/examples/math_bench.pl | 77 - OpenSRF/examples/math_xul_client/Makefile | 19 - OpenSRF/examples/math_xul_client/install.js | 98 -- .../math/content/conf/client_config.xml | 53 - .../math_xul_client/math/content/contents.rdf | 17 - .../examples/math_xul_client/math/content/math.xul | 38 - .../math_xul_client/math/content/math_app.js | 50 - .../math_xul_client/math/content/math_overlay.xul | 32 - .../math_xul_client/math/locale/en-US/contents.rdf | 19 - .../math_xul_client/math/locale/en-US/math.dtd | 7 - .../math_xul_client/math/skin/contents.rdf | 23 - .../examples/math_xul_client/math/skin/math.css | 4 - OpenSRF/examples/multisession-test.pl | 80 - OpenSRF/examples/opensrf.xml.example | 208 --- OpenSRF/examples/opensrf_core.xml.example | 146 -- OpenSRF/examples/register.pl | 50 - OpenSRF/examples/srfsh.xml.example | 12 - OpenSRF/src/Makefile | 193 --- OpenSRF/src/c-apps/Makefile | 25 - OpenSRF/src/c-apps/osrf_dbmath.c | 82 - OpenSRF/src/c-apps/osrf_math.c | 109 -- OpenSRF/src/c-apps/osrf_version.c | 98 -- OpenSRF/src/extras/docgen.xsl | 384 ----- OpenSRF/src/gateway/Makefile | 25 - OpenSRF/src/gateway/apachetools.c | 206 --- OpenSRF/src/gateway/apachetools.h | 57 - OpenSRF/src/gateway/fieldmapper-c-xml-out.pl | 271 --- OpenSRF/src/gateway/osrf_json_gateway.c | 371 ----- OpenSRF/src/java/ext/stax-api-1.0.1.jar | Bin 26514 -> 0 bytes OpenSRF/src/java/ext/wstx-asl-3.2.1.jar | Bin 505816 -> 0 bytes OpenSRF/src/java/org/opensrf/ClientSession.java | 138 -- OpenSRF/src/java/org/opensrf/Message.java | 88 - OpenSRF/src/java/org/opensrf/Method.java | 78 - OpenSRF/src/java/org/opensrf/MethodException.java | 11 - OpenSRF/src/java/org/opensrf/Request.java | 123 -- OpenSRF/src/java/org/opensrf/Result.java | 106 -- OpenSRF/src/java/org/opensrf/ServerSession.java | 8 - OpenSRF/src/java/org/opensrf/Session.java | 141 -- OpenSRF/src/java/org/opensrf/Stack.java | 80 - .../java/org/opensrf/net/xmpp/XMPPException.java | 10 - .../src/java/org/opensrf/net/xmpp/XMPPMessage.java | 101 -- .../src/java/org/opensrf/net/xmpp/XMPPReader.java | 289 ---- .../src/java/org/opensrf/net/xmpp/XMPPSession.java | 197 --- OpenSRF/src/java/org/opensrf/test/TestClient.java | 63 - OpenSRF/src/java/org/opensrf/test/TestConfig.java | 16 - OpenSRF/src/java/org/opensrf/test/TestJSON.java | 51 - OpenSRF/src/java/org/opensrf/test/TestXMPP.java | 63 - OpenSRF/src/java/org/opensrf/util/Config.java | 117 -- .../src/java/org/opensrf/util/ConfigException.java | 11 - .../src/java/org/opensrf/util/JSONException.java | 9 - OpenSRF/src/java/org/opensrf/util/JSONReader.java | 176 -- OpenSRF/src/java/org/opensrf/util/JSONWriter.java | 172 -- OpenSRF/src/java/org/opensrf/util/OSRFObject.java | 53 - .../src/java/org/opensrf/util/OSRFRegistry.java | 107 -- .../java/org/opensrf/util/OSRFSerializable.java | 19 - OpenSRF/src/java/org/opensrf/util/Utils.java | 106 -- OpenSRF/src/javascript/JSON.js | 135 -- OpenSRF/src/javascript/md5.js | 256 --- OpenSRF/src/javascript/opensrf_app_session.js | 509 ------ OpenSRF/src/javascript/opensrf_config.js | 281 ---- OpenSRF/src/javascript/opensrf_dom_element.js | 263 --- OpenSRF/src/javascript/opensrf_domain_object.js | 627 ------- OpenSRF/src/javascript/opensrf_jabber_transport.js | 435 ----- OpenSRF/src/javascript/opensrf_msg_stack.js | 205 --- OpenSRF/src/javascript/opensrf_transport.js | 64 - OpenSRF/src/javascript/opensrf_utils.js | 117 -- OpenSRF/src/jserver/Makefile | 17 - OpenSRF/src/jserver/osrf_chat.c | 805 --------- OpenSRF/src/jserver/osrf_chat.h | 264 --- OpenSRF/src/jserver/osrf_chat_main.c | 69 - OpenSRF/src/libstack/Makefile | 71 - OpenSRF/src/libstack/Makefile.JSON | 46 - OpenSRF/src/libstack/legacy_json.c | 851 ---------- OpenSRF/src/libstack/legacy_json.h | 86 - OpenSRF/src/libstack/opensrf.c | 33 - OpenSRF/src/libstack/osrfConfig.c | 129 -- OpenSRF/src/libstack/osrfConfig.h | 103 -- OpenSRF/src/libstack/osrf_app_session.c | 659 -------- OpenSRF/src/libstack/osrf_app_session.h | 232 --- OpenSRF/src/libstack/osrf_application.c | 473 ------ OpenSRF/src/libstack/osrf_application.h | 233 --- OpenSRF/src/libstack/osrf_big_hash.c | 173 -- OpenSRF/src/libstack/osrf_big_hash.h | 87 - OpenSRF/src/libstack/osrf_big_list.c | 174 -- OpenSRF/src/libstack/osrf_big_list.h | 142 -- OpenSRF/src/libstack/osrf_cache.c | 99 -- OpenSRF/src/libstack/osrf_cache.h | 82 - OpenSRF/src/libstack/osrf_hash.c | 242 --- OpenSRF/src/libstack/osrf_hash.h | 115 -- OpenSRF/src/libstack/osrf_json.h | 364 ---- OpenSRF/src/libstack/osrf_json_object.c | 333 ---- OpenSRF/src/libstack/osrf_json_parser.c | 632 ------- OpenSRF/src/libstack/osrf_json_tools.c | 437 ----- OpenSRF/src/libstack/osrf_json_utils.h | 131 -- OpenSRF/src/libstack/osrf_list.c | 154 -- OpenSRF/src/libstack/osrf_list.h | 155 -- OpenSRF/src/libstack/osrf_message.c | 338 ---- OpenSRF/src/libstack/osrf_message.h | 120 -- OpenSRF/src/libstack/osrf_prefork.c | 765 --------- OpenSRF/src/libstack/osrf_prefork.h | 96 -- OpenSRF/src/libstack/osrf_settings.c | 70 - OpenSRF/src/libstack/osrf_settings.h | 30 - OpenSRF/src/libstack/osrf_stack.c | 263 --- OpenSRF/src/libstack/osrf_stack.h | 19 - OpenSRF/src/libstack/osrf_system.c | 267 --- OpenSRF/src/libstack/osrf_system.h | 59 - OpenSRF/src/libstack/osrf_transgroup.c | 244 --- OpenSRF/src/libstack/osrf_transgroup.h | 122 -- OpenSRF/src/libtransport/Makefile | 19 - OpenSRF/src/libtransport/basic_client.c | 81 - OpenSRF/src/libtransport/component.c | 52 - OpenSRF/src/libtransport/transport_client.c | 220 --- OpenSRF/src/libtransport/transport_client.h | 92 - OpenSRF/src/libtransport/transport_message.c | 357 ---- OpenSRF/src/libtransport/transport_message.h | 99 -- OpenSRF/src/libtransport/transport_session.c | 633 ------- OpenSRF/src/libtransport/transport_session.h | 234 --- OpenSRF/src/objson/Makefile | 71 - OpenSRF/src/objson/json2xml.c | 141 -- OpenSRF/src/objson/json2xml.h | 11 - OpenSRF/src/objson/json_parser.c | 745 --------- OpenSRF/src/objson/json_parser.h | 86 - OpenSRF/src/objson/object.c | 812 --------- OpenSRF/src/objson/object.h | 286 ---- OpenSRF/src/objson/objson_test.c | 209 --- OpenSRF/src/patch/README | 12 - OpenSRF/src/patch/mod_offline.c | 266 --- OpenSRF/src/patch/nad.c | 1155 ------------- OpenSRF/src/perlmods/JSON.pm | 902 ---------- OpenSRF/src/perlmods/OpenSRF.pm | 74 - OpenSRF/src/perlmods/OpenSRF/AppSession.pm | 1029 ------------ OpenSRF/src/perlmods/OpenSRF/Application.pm | 722 -------- OpenSRF/src/perlmods/OpenSRF/Application/Client.pm | 6 - .../src/perlmods/OpenSRF/Application/Demo/Math.pm | 92 - .../perlmods/OpenSRF/Application/Demo/MathDB.pm | 59 - .../src/perlmods/OpenSRF/Application/Persist.pm | 517 ------ .../src/perlmods/OpenSRF/Application/Settings.pm | 42 - OpenSRF/src/perlmods/OpenSRF/DOM.pm | 289 ---- .../perlmods/OpenSRF/DOM/Element/domainObject.pm | 118 -- .../OpenSRF/DOM/Element/domainObjectAttr.pm | 15 - .../OpenSRF/DOM/Element/domainObjectCollection.pm | 116 -- OpenSRF/src/perlmods/OpenSRF/DOM/Element/params.pm | 4 - OpenSRF/src/perlmods/OpenSRF/DomainObject.pm | 85 - .../perlmods/OpenSRF/DomainObject/oilsMessage.pm | 317 ---- .../perlmods/OpenSRF/DomainObject/oilsMethod.pm | 99 -- .../OpenSRF/DomainObject/oilsMultiSearch.pm | 186 --- .../perlmods/OpenSRF/DomainObject/oilsPrimitive.pm | 623 ------- .../perlmods/OpenSRF/DomainObject/oilsResponse.pm | 455 ----- .../perlmods/OpenSRF/DomainObject/oilsSearch.pm | 106 -- .../src/perlmods/OpenSRF/DomainObjectCollection.pm | 35 - OpenSRF/src/perlmods/OpenSRF/EX.pm | 251 --- OpenSRF/src/perlmods/OpenSRF/MultiSession.pm | 283 ---- OpenSRF/src/perlmods/OpenSRF/System.pm | 450 ----- OpenSRF/src/perlmods/OpenSRF/Transport.pm | 194 --- OpenSRF/src/perlmods/OpenSRF/Transport/Jabber.pm | 11 - .../perlmods/OpenSRF/Transport/Jabber/JInbound.pm | 101 -- .../OpenSRF/Transport/Jabber/JMessageWrapper.pm | 91 - .../OpenSRF/Transport/Jabber/JPeerConnection.pm | 80 - .../OpenSRF/Transport/Jabber/JabberClient.pm | 277 ---- OpenSRF/src/perlmods/OpenSRF/Transport/Listener.pm | 45 - .../src/perlmods/OpenSRF/Transport/PeerHandle.pm | 40 - .../src/perlmods/OpenSRF/Transport/SlimJabber.pm | 18 - .../OpenSRF/Transport/SlimJabber/Client.pm | 632 ------- .../OpenSRF/Transport/SlimJabber/Inbound.pm | 184 -- .../OpenSRF/Transport/SlimJabber/MessageWrapper.pm | 126 -- .../OpenSRF/Transport/SlimJabber/PeerConnection.pm | 120 -- OpenSRF/src/perlmods/OpenSRF/UnixServer.pm | 264 --- OpenSRF/src/perlmods/OpenSRF/Utils.pm | 464 ------ OpenSRF/src/perlmods/OpenSRF/Utils/Cache.pm | 230 --- OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm | 436 ----- OpenSRF/src/perlmods/OpenSRF/Utils/LogServer.pm | 149 -- OpenSRF/src/perlmods/OpenSRF/Utils/Logger.pm | 261 --- .../src/perlmods/OpenSRF/Utils/SettingsClient.pm | 123 -- .../src/perlmods/OpenSRF/Utils/SettingsParser.pm | 157 -- OpenSRF/src/python/osrf/__init__.py | 0 OpenSRF/src/python/osrf/conf.py | 48 - OpenSRF/src/python/osrf/const.py | 74 - OpenSRF/src/python/osrf/ex.py | 55 - OpenSRF/src/python/osrf/json.py | 241 --- OpenSRF/src/python/osrf/log.py | 88 - OpenSRF/src/python/osrf/net.py | 147 -- OpenSRF/src/python/osrf/ses.py | 307 ---- OpenSRF/src/python/osrf/set.py | 43 - OpenSRF/src/python/osrf/stack.py | 95 -- OpenSRF/src/python/osrf/system.py | 48 - OpenSRF/src/python/osrf/utils.py | 116 -- OpenSRF/src/python/srfsh.py | 373 ----- OpenSRF/src/router/Makefile | 23 - OpenSRF/src/router/osrf_router.c | 641 ------- OpenSRF/src/router/osrf_router.h | 222 --- OpenSRF/src/router/osrf_router_main.c | 123 -- OpenSRF/src/srfsh/Makefile | 15 - OpenSRF/src/srfsh/srfsh.c | 882 ---------- OpenSRF/src/srfsh/srfsh.h | 73 - OpenSRF/src/utils/Makefile | 21 - OpenSRF/src/utils/fieldmapper-c.pl | 228 --- OpenSRF/src/utils/log.c | 235 --- OpenSRF/src/utils/log.h | 81 - OpenSRF/src/utils/md5.c | 366 ---- OpenSRF/src/utils/md5.h | 35 - OpenSRF/src/utils/sha.c | 264 --- OpenSRF/src/utils/sha.h | 41 - OpenSRF/src/utils/socket_bundle.c | 683 -------- OpenSRF/src/utils/socket_bundle.h | 152 -- OpenSRF/src/utils/socket_test.c | 33 - OpenSRF/src/utils/string_array.c | 116 -- OpenSRF/src/utils/string_array.h | 41 - OpenSRF/src/utils/utils.c | 461 ----- OpenSRF/src/utils/utils.h | 238 --- OpenSRF/src/utils/xml_utils.c | 115 -- OpenSRF/src/utils/xml_utils.h | 37 - OpenSRF/src/xinclude/Makefile | 22 - OpenSRF/src/xinclude/mod_xinclude.c | 76 - config.sh | 10 +- install.conf.default | 20 +- install.sh | 36 +- 518 files changed, 2878 insertions(+), 67466 deletions(-) delete mode 100644 Evergreen/staff_client/LICENSE delete mode 100644 Evergreen/staff_client/Makefile delete mode 100644 Evergreen/staff_client/README delete mode 100644 Evergreen/staff_client/application.ini delete mode 100644 Evergreen/staff_client/chrome/chrome.manifest delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/OpenSRF/OpenSRF_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/auth/auth.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/brief.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/browse_list.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/browse_list_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/cat.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/cat.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/cat_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_add_wizard.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_display.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_edit_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/copy_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/details.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc_fixed.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc_keys.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc_rules.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/marc_validate.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/record_list.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/record_list.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/record_list_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/spine_label_wizard.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/volume.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/volume_copy_add_wizard.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/cat/volume_edit_wizard.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/circ/checkin_items.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/hold_capture.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/hold_capture.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/circ/hold_capture_items.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/hold_capture_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/circ/receipt_template_editor.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/contents.rdf delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/about.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/clam_shell.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_overlay.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/clam_shell_vertical_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/grid_list_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/list_box.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/paged_tree.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/main/paged_tree_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/opac/opac.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/opac/opac.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_barcode_entry.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_bill_details.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_bill_wizard.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_checkout_items.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_contact_overlay.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_status_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit_legacy.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit_legacy.xul delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_edit_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_holds.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_items.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_new_legacy.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_form_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_results.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/patron/patron_utils.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/stat_cat/copy_stat_cat_editor.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/stat_cat/patron_stat_cat_editor.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/stat_cat/stat_cat.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/stat_cat/stat_cat_bundle.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/stat_cat/stat_cat_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/survey/survey.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/survey/survey_bundle.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/survey/survey_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/survey/survey_wizard.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/browser_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/datetime.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/error.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/explode.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/file.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/filter_console.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/fm_view.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/functional.js delete mode 100755 Evergreen/staff_client/chrome/content/evergreen/util/make_wiki_table.pl delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/populate.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/print.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/ses.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/shell.html delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/sound.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/util.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/validate.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/widgets.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/win.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/xpcom.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/xuledit.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/xuledit.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/z39_50/z39_50.js delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/z39_50/z39_50.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/z39_50/z39_50_bundle.xul delete mode 100644 Evergreen/staff_client/chrome/content/evergreen/z39_50/z39_50_overlay.xul delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.properties delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/auth.properties delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/cat.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/checkin.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/circ_tree.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/clam_shell.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/clam_shell.properties delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/contents.rdf delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/hold_capture.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/paged_tree.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron.properties delete mode 100755 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_display.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search_form.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/stat_cat.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/survey.dtd delete mode 100644 Evergreen/staff_client/chrome/locale/en-US/evergreen/z39_50.dtd delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/app_shell.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/auth.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/browse_list.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/cat.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/checkin.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/circ_tree.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/clam_shell.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/contents.rdf delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/evergreen.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/hold_capture.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/marc.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/images/cooltext001.png delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/images/main_logo.jpg delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/clicked.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/cow.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/die.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/gong.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/redalert.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/media/sounds/turn.wav delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/opac.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/paged_tree.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/patron.css delete mode 100755 Evergreen/staff_client/chrome/skin/evergreen/patron_display.css delete mode 100755 Evergreen/staff_client/chrome/skin/evergreen/patron_display_contact.css delete mode 100755 Evergreen/staff_client/chrome/skin/evergreen/patron_display_status.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/patron_search.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/patron_search_form.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/patron_search_results.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/stat_cat.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/survey.css delete mode 100644 Evergreen/staff_client/chrome/skin/evergreen/z39_50.css delete mode 100644 Evergreen/staff_client/defaults/preferences/evergreen.js delete mode 100644 Evergreen/staff_client/install.js delete mode 100755 Evergreen/staff_client/install.rdf create mode 100644 Open-ILS/examples/fm_IDL.xsd create mode 100644 Open-ILS/examples/oils_obj.xsd create mode 100644 Open-ILS/examples/oils_persist.xsd create mode 100644 Open-ILS/examples/reporter.xsd rename {OpenSRF => Open-ILS}/src/java/Makefile (58%) create mode 100644 Open-ILS/src/java/org/open_ils/idl/IDLField.java create mode 100644 Open-ILS/src/java/org/open_ils/idl/IDLLink.java create mode 100644 Open-ILS/src/java/org/open_ils/idl/IDLObject.java create mode 100644 Open-ILS/src/java/org/open_ils/idl/IDLParser.java create mode 100644 Open-ILS/src/java/org/open_ils/test/TestIDL.java create mode 100644 Open-ILS/src/perlmods/OpenILS/Utils/ZClient.pm create mode 100644 Open-ILS/web/opac/images/eg_tiny_logo.jpg delete mode 100644 Open-ILS/web/opac/locale/en-US/common.dtd delete mode 100644 Open-ILS/web/opac/locale/en-US/opac_advanced.dtd delete mode 100644 Open-ILS/web/opac/locale/en-US/opac_common.dtd delete mode 100644 Open-ILS/web/opac/locale/en-US/opac_holds.dtd delete mode 100644 Open-ILS/web/opac/locale/en-US/opac_rdetail.dtd delete mode 100644 Open-ILS/web/opac/locale/en-US/opac_result.dtd delete mode 100755 OpenSRF/bin/osrf_ctl.sh delete mode 100644 OpenSRF/doc/Application-HOWTO.txt delete mode 100644 OpenSRF/doc/OpenSRF-Messaging-Protocol.html delete mode 100644 OpenSRF/doc/Persist-API.html delete mode 100644 OpenSRF/doc/Roadmap.txt delete mode 100755 OpenSRF/doc/dokuwiki-doc-stubber.pl delete mode 100644 OpenSRF/examples/bootstrap.conf.example delete mode 100644 OpenSRF/examples/fieldmapper2cdbi.xsl delete mode 100644 OpenSRF/examples/fieldmapper2javascript.xsl delete mode 100644 OpenSRF/examples/fieldmapper2perl.xsl delete mode 100644 OpenSRF/examples/gen-fieldmapper.xml delete mode 100755 OpenSRF/examples/math_bench.pl delete mode 100644 OpenSRF/examples/math_xul_client/Makefile delete mode 100644 OpenSRF/examples/math_xul_client/install.js delete mode 100644 OpenSRF/examples/math_xul_client/math/content/conf/client_config.xml delete mode 100644 OpenSRF/examples/math_xul_client/math/content/contents.rdf delete mode 100644 OpenSRF/examples/math_xul_client/math/content/math.xul delete mode 100644 OpenSRF/examples/math_xul_client/math/content/math_app.js delete mode 100644 OpenSRF/examples/math_xul_client/math/content/math_overlay.xul delete mode 100644 OpenSRF/examples/math_xul_client/math/locale/en-US/contents.rdf delete mode 100644 OpenSRF/examples/math_xul_client/math/locale/en-US/math.dtd delete mode 100644 OpenSRF/examples/math_xul_client/math/skin/contents.rdf delete mode 100644 OpenSRF/examples/math_xul_client/math/skin/math.css delete mode 100755 OpenSRF/examples/multisession-test.pl delete mode 100644 OpenSRF/examples/opensrf.xml.example delete mode 100644 OpenSRF/examples/opensrf_core.xml.example delete mode 100755 OpenSRF/examples/register.pl delete mode 100644 OpenSRF/examples/srfsh.xml.example delete mode 100644 OpenSRF/src/Makefile delete mode 100644 OpenSRF/src/c-apps/Makefile delete mode 100644 OpenSRF/src/c-apps/osrf_dbmath.c delete mode 100644 OpenSRF/src/c-apps/osrf_math.c delete mode 100644 OpenSRF/src/c-apps/osrf_version.c delete mode 100644 OpenSRF/src/extras/docgen.xsl delete mode 100644 OpenSRF/src/gateway/Makefile delete mode 100644 OpenSRF/src/gateway/apachetools.c delete mode 100644 OpenSRF/src/gateway/apachetools.h delete mode 100755 OpenSRF/src/gateway/fieldmapper-c-xml-out.pl delete mode 100644 OpenSRF/src/gateway/osrf_json_gateway.c delete mode 100644 OpenSRF/src/java/ext/stax-api-1.0.1.jar delete mode 100644 OpenSRF/src/java/ext/wstx-asl-3.2.1.jar delete mode 100644 OpenSRF/src/java/org/opensrf/ClientSession.java delete mode 100644 OpenSRF/src/java/org/opensrf/Message.java delete mode 100644 OpenSRF/src/java/org/opensrf/Method.java delete mode 100644 OpenSRF/src/java/org/opensrf/MethodException.java delete mode 100644 OpenSRF/src/java/org/opensrf/Request.java delete mode 100644 OpenSRF/src/java/org/opensrf/Result.java delete mode 100644 OpenSRF/src/java/org/opensrf/ServerSession.java delete mode 100644 OpenSRF/src/java/org/opensrf/Session.java delete mode 100644 OpenSRF/src/java/org/opensrf/Stack.java delete mode 100644 OpenSRF/src/java/org/opensrf/net/xmpp/XMPPException.java delete mode 100644 OpenSRF/src/java/org/opensrf/net/xmpp/XMPPMessage.java delete mode 100644 OpenSRF/src/java/org/opensrf/net/xmpp/XMPPReader.java delete mode 100644 OpenSRF/src/java/org/opensrf/net/xmpp/XMPPSession.java delete mode 100644 OpenSRF/src/java/org/opensrf/test/TestClient.java delete mode 100644 OpenSRF/src/java/org/opensrf/test/TestConfig.java delete mode 100644 OpenSRF/src/java/org/opensrf/test/TestJSON.java delete mode 100644 OpenSRF/src/java/org/opensrf/test/TestXMPP.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/Config.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/ConfigException.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/JSONException.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/JSONReader.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/JSONWriter.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/OSRFObject.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/OSRFRegistry.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/OSRFSerializable.java delete mode 100644 OpenSRF/src/java/org/opensrf/util/Utils.java delete mode 100644 OpenSRF/src/javascript/JSON.js delete mode 100644 OpenSRF/src/javascript/md5.js delete mode 100644 OpenSRF/src/javascript/opensrf_app_session.js delete mode 100644 OpenSRF/src/javascript/opensrf_config.js delete mode 100644 OpenSRF/src/javascript/opensrf_dom_element.js delete mode 100644 OpenSRF/src/javascript/opensrf_domain_object.js delete mode 100644 OpenSRF/src/javascript/opensrf_jabber_transport.js delete mode 100644 OpenSRF/src/javascript/opensrf_msg_stack.js delete mode 100644 OpenSRF/src/javascript/opensrf_transport.js delete mode 100644 OpenSRF/src/javascript/opensrf_utils.js delete mode 100644 OpenSRF/src/jserver/Makefile delete mode 100644 OpenSRF/src/jserver/osrf_chat.c delete mode 100644 OpenSRF/src/jserver/osrf_chat.h delete mode 100644 OpenSRF/src/jserver/osrf_chat_main.c delete mode 100644 OpenSRF/src/libstack/Makefile delete mode 100644 OpenSRF/src/libstack/Makefile.JSON delete mode 100644 OpenSRF/src/libstack/legacy_json.c delete mode 100644 OpenSRF/src/libstack/legacy_json.h delete mode 100644 OpenSRF/src/libstack/opensrf.c delete mode 100644 OpenSRF/src/libstack/osrfConfig.c delete mode 100644 OpenSRF/src/libstack/osrfConfig.h delete mode 100644 OpenSRF/src/libstack/osrf_app_session.c delete mode 100644 OpenSRF/src/libstack/osrf_app_session.h delete mode 100644 OpenSRF/src/libstack/osrf_application.c delete mode 100644 OpenSRF/src/libstack/osrf_application.h delete mode 100644 OpenSRF/src/libstack/osrf_big_hash.c delete mode 100644 OpenSRF/src/libstack/osrf_big_hash.h delete mode 100644 OpenSRF/src/libstack/osrf_big_list.c delete mode 100644 OpenSRF/src/libstack/osrf_big_list.h delete mode 100644 OpenSRF/src/libstack/osrf_cache.c delete mode 100644 OpenSRF/src/libstack/osrf_cache.h delete mode 100644 OpenSRF/src/libstack/osrf_hash.c delete mode 100644 OpenSRF/src/libstack/osrf_hash.h delete mode 100644 OpenSRF/src/libstack/osrf_json.h delete mode 100644 OpenSRF/src/libstack/osrf_json_object.c delete mode 100644 OpenSRF/src/libstack/osrf_json_parser.c delete mode 100644 OpenSRF/src/libstack/osrf_json_tools.c delete mode 100644 OpenSRF/src/libstack/osrf_json_utils.h delete mode 100644 OpenSRF/src/libstack/osrf_list.c delete mode 100644 OpenSRF/src/libstack/osrf_list.h delete mode 100644 OpenSRF/src/libstack/osrf_message.c delete mode 100644 OpenSRF/src/libstack/osrf_message.h delete mode 100644 OpenSRF/src/libstack/osrf_prefork.c delete mode 100644 OpenSRF/src/libstack/osrf_prefork.h delete mode 100644 OpenSRF/src/libstack/osrf_settings.c delete mode 100644 OpenSRF/src/libstack/osrf_settings.h delete mode 100644 OpenSRF/src/libstack/osrf_stack.c delete mode 100644 OpenSRF/src/libstack/osrf_stack.h delete mode 100644 OpenSRF/src/libstack/osrf_system.c delete mode 100644 OpenSRF/src/libstack/osrf_system.h delete mode 100644 OpenSRF/src/libstack/osrf_transgroup.c delete mode 100644 OpenSRF/src/libstack/osrf_transgroup.h delete mode 100644 OpenSRF/src/libtransport/Makefile delete mode 100644 OpenSRF/src/libtransport/basic_client.c delete mode 100644 OpenSRF/src/libtransport/component.c delete mode 100644 OpenSRF/src/libtransport/transport_client.c delete mode 100644 OpenSRF/src/libtransport/transport_client.h delete mode 100644 OpenSRF/src/libtransport/transport_message.c delete mode 100644 OpenSRF/src/libtransport/transport_message.h delete mode 100644 OpenSRF/src/libtransport/transport_session.c delete mode 100644 OpenSRF/src/libtransport/transport_session.h delete mode 100644 OpenSRF/src/objson/Makefile delete mode 100644 OpenSRF/src/objson/json2xml.c delete mode 100644 OpenSRF/src/objson/json2xml.h delete mode 100644 OpenSRF/src/objson/json_parser.c delete mode 100644 OpenSRF/src/objson/json_parser.h delete mode 100644 OpenSRF/src/objson/object.c delete mode 100644 OpenSRF/src/objson/object.h delete mode 100644 OpenSRF/src/objson/objson_test.c delete mode 100644 OpenSRF/src/patch/README delete mode 100644 OpenSRF/src/patch/mod_offline.c delete mode 100644 OpenSRF/src/patch/nad.c delete mode 100644 OpenSRF/src/perlmods/JSON.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/AppSession.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application/Client.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application/Demo/Math.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application/Demo/MathDB.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application/Persist.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Application/Settings.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DOM.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DOM/Element/domainObject.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DOM/Element/domainObjectAttr.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DOM/Element/domainObjectCollection.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DOM/Element/params.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMessage.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMethod.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsMultiSearch.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsPrimitive.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObject/oilsSearch.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/DomainObjectCollection.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/EX.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/MultiSession.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/System.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Jabber.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Jabber/JInbound.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Jabber/JMessageWrapper.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Jabber/JPeerConnection.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Jabber/JabberClient.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/Listener.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/PeerHandle.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/SlimJabber.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/SlimJabber/Client.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/SlimJabber/Inbound.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/SlimJabber/MessageWrapper.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Transport/SlimJabber/PeerConnection.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/UnixServer.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Utils.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Utils/Cache.pm delete mode 100755 OpenSRF/src/perlmods/OpenSRF/Utils/Config.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Utils/LogServer.pm delete mode 100644 OpenSRF/src/perlmods/OpenSRF/Utils/Logger.pm delete mode 100755 OpenSRF/src/perlmods/OpenSRF/Utils/SettingsClient.pm delete mode 100755 OpenSRF/src/perlmods/OpenSRF/Utils/SettingsParser.pm delete mode 100644 OpenSRF/src/python/osrf/__init__.py delete mode 100644 OpenSRF/src/python/osrf/conf.py delete mode 100644 OpenSRF/src/python/osrf/const.py delete mode 100644 OpenSRF/src/python/osrf/ex.py delete mode 100644 OpenSRF/src/python/osrf/json.py delete mode 100644 OpenSRF/src/python/osrf/log.py delete mode 100644 OpenSRF/src/python/osrf/net.py delete mode 100644 OpenSRF/src/python/osrf/ses.py delete mode 100644 OpenSRF/src/python/osrf/set.py delete mode 100644 OpenSRF/src/python/osrf/stack.py delete mode 100644 OpenSRF/src/python/osrf/system.py delete mode 100644 OpenSRF/src/python/osrf/utils.py delete mode 100755 OpenSRF/src/python/srfsh.py delete mode 100644 OpenSRF/src/router/Makefile delete mode 100644 OpenSRF/src/router/osrf_router.c delete mode 100644 OpenSRF/src/router/osrf_router.h delete mode 100644 OpenSRF/src/router/osrf_router_main.c delete mode 100644 OpenSRF/src/srfsh/Makefile delete mode 100644 OpenSRF/src/srfsh/srfsh.c delete mode 100644 OpenSRF/src/srfsh/srfsh.h delete mode 100644 OpenSRF/src/utils/Makefile delete mode 100755 OpenSRF/src/utils/fieldmapper-c.pl delete mode 100644 OpenSRF/src/utils/log.c delete mode 100644 OpenSRF/src/utils/log.h delete mode 100644 OpenSRF/src/utils/md5.c delete mode 100644 OpenSRF/src/utils/md5.h delete mode 100644 OpenSRF/src/utils/sha.c delete mode 100644 OpenSRF/src/utils/sha.h delete mode 100644 OpenSRF/src/utils/socket_bundle.c delete mode 100644 OpenSRF/src/utils/socket_bundle.h delete mode 100644 OpenSRF/src/utils/socket_test.c delete mode 100644 OpenSRF/src/utils/string_array.c delete mode 100644 OpenSRF/src/utils/string_array.h delete mode 100644 OpenSRF/src/utils/utils.c delete mode 100644 OpenSRF/src/utils/utils.h delete mode 100644 OpenSRF/src/utils/xml_utils.c delete mode 100644 OpenSRF/src/utils/xml_utils.h delete mode 100644 OpenSRF/src/xinclude/Makefile delete mode 100644 OpenSRF/src/xinclude/mod_xinclude.c diff --git a/Evergreen/src/javascript/backend/circ/circ_item_config.js b/Evergreen/src/javascript/backend/circ/circ_item_config.js index b36f014c1f..ec1f5186bc 100644 --- a/Evergreen/src/javascript/backend/circ/circ_item_config.js +++ b/Evergreen/src/javascript/backend/circ/circ_item_config.js @@ -451,8 +451,8 @@ function getItemConfig() { function setMaxFineByCircLocation() { - var max_libs = [ 'ARL', 'DTRL', 'SJRLS' ]; - var mid_libs = [ 'CHRL', 'ECGR', 'FRRLS', 'HCLS', 'OCRL', 'OHOOP', 'OKRL', 'PMRLS', 'PPL', 'STRL' ]; + var max_libs = [ 'DTRL', 'SJRLS' ]; + var mid_libs = [ 'ARL', 'CHRL', 'ECGR', 'FRRLS', 'HCLS', 'OCRL', 'OHOOP', 'OKRL', 'PMRLS', 'PPL', 'STRL' ]; var cl = (volume && volume.id != -1) ? volume.owning_lib : currentLocation.id; var max_fine = null; diff --git a/Evergreen/src/javascript/backend/circ/circ_permit_hold.js b/Evergreen/src/javascript/backend/circ/circ_permit_hold.js index 41e3374a72..80b36b8592 100644 --- a/Evergreen/src/javascript/backend/circ/circ_permit_hold.js +++ b/Evergreen/src/javascript/backend/circ/circ_permit_hold.js @@ -5,7 +5,7 @@ log_vars('circ_permit_hold'); /* is a staff member placing this hold? */ -var isStaffHold = isGroupDescendant('Staff', patronProfile); +var isStaffHold = isGroupDescendantId('Staff', requestor.profile); /* non-staff members are allowed 50 open holds at most */ @@ -14,7 +14,10 @@ if( ! isStaffHold ) { log_info("patron has " + count + " open holds"); if( count >= 50 ) result.events.push('MAX_HOLDS'); -} +} else { + log_info("This is a staff-placed hold"); +} + if( isTrue(patron.barred) ) diff --git a/Evergreen/staff_client/LICENSE b/Evergreen/staff_client/LICENSE deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile deleted file mode 100644 index dbd6209063..0000000000 --- a/Evergreen/staff_client/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -VERSION=0.1.0 -PACKAGE=Evergreen -DESCRIPTION=Evergreen Staff Client -BUILD=2005072719 - -RETRIEVE_FIELDMAPPER=wget -N http://dev.gapines.org/opac/common/js/util/fieldmapper.js -RETRIEVE_FM_ALL=wget -N http://dev.gapines.org/opac/common/js/fmall.js -RETRIEVE_ORG_TREE=wget -N http://dev.gapines.org/opac/common/js/OrgTree.js -RETRIEVE_CLIENT_CONFIG=cp ../../../../../../OpenSRF/examples/math_xul_client/math/content/conf/client_config.xml . - -all: build package - @echo - @echo How do makefiles work again? - @echo BUILD = ${BUILD} - touch application.ini - -build: generated open-ils patron circ - @echo - @echo Everything before packaging - -package: evergreen.xpi - @echo - @echo Packaging - -stamp: - sed -i s/^Version=.\*/Version=${VERSION}/ application.ini - sed -i s/^BuildID=.\*/BuildID=${BUILD}/ application.ini - sed -i s/^Name=.\*/Name=${PACKAGE}/ application.ini - sed -i 's/.*<\/em:version>/${VERSION}<\/em:version>/' install.rdf - sed -i 's/.*<\/em:name>/${PACKAGE}<\/em:name>/' install.rdf - sed -i 's/.*<\/em:description>/${DESCRIPTION}<\/em:description>/' install.rdf - sed -i "s/extVersion: '.\*'/extVersion: '${VERSION}'/" install.js - sed -i "s/extFullName: '.\*'/extFullName: '${DESCRIPTION}'/" install.js - sed -i 's/auth\.title ".*"/auth\.title "${DESCRIPTION}"/' chrome/locale/en-US/evergreen/auth.dtd - sed -i 's/auth\.version ".*"/auth\.version "${PACKAGE} ${VERSION} ${BUILD}"/' chrome/locale/en-US/evergreen/auth.dtd - -generated: - @echo - @echo These things are installation specific. The staff client is the last thing you should try to build. - #(cd chrome/content/evergreen/util ; ${RETRIEVE_FIELDMAPPER} ); - (cd chrome/content/evergreen/Open-ILS/util/ ; ${RETRIEVE_ORG_TREE} ); - (cd chrome/content/evergreen/conf ; ${RETRIEVE_CLIENT_CONFIG} ); - (cd chrome/content/evergreen/Open-ILS/util/ ; ${RETRIEVE_FM_ALL} ); - -open-ils: - cp ../../OpenSRF/src/javascript/*.js chrome/content/evergreen/OpenSRF/ - cp ../../Open-ILS/web/opac/common/js/*.js chrome/content/evergreen/Open-ILS/util/ - #cp ../../Open-ILS/src/javascript/widgets/*.js chrome/content/evergreen/Open-ILS/widgets/ - #cp ../../Open-ILS/src/javascript/widgets/menu/*.js chrome/content/evergreen/Open-ILS/widgets/menu/ - -patron: - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_items/g | sed s/PagedTree/PatronItems/g > chrome/content/evergreen/patron/patron_items_overlay.xul ) - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_search_results/g | sed s/PagedTree/PatronSearchResults/g > chrome/content/evergreen/patron/patron_search_results_overlay.xul ) - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_checkout_items/g | sed s/PagedTree/PatronCheckoutItems/g > chrome/content/evergreen/patron/patron_checkout_items_overlay.xul ) - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/patron_holds/g | sed s/PagedTree/PatronHolds/g > chrome/content/evergreen/patron/patron_holds_overlay.xul ) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_items.dtd) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_search_results.dtd) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_checkout_items.dtd) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_holds.dtd) - -circ: - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/checkin_items/g | sed s/PagedTree/CheckinItems/g > chrome/content/evergreen/circ/checkin_items_overlay.xul ) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/checkin_items.dtd) - (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/hold_capture_items/g | sed s/PagedTree/HoldCaptureItems/g > chrome/content/evergreen/circ/hold_capture_items_overlay.xul ) - (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/hold_capture_items.dtd) - -evergreen.xpi: evergreen.jar - @echo - @echo make the xpi file - zip -r evergreen.xpi chrome/ defaults/ install.js install.rdf application.ini Makefile LICENSE README -x \*CVS\* > /dev/null - -evergreen.jar: build - @echo - @echo make the jar file - (cd chrome; zip -r evergreen.jar content/ locale/ skin/ -x \*CVS\* > /dev/null ) - -clean: - @echo - @echo delete derived files - rm -f evergreen.xpi - rm -f chrome/evergreen.jar - rm -f chrome/content/evergreen/patron/patron_items_overlay.xul chrome/locale/en-US/evergreen/patron_items.dtd - rm -f chrome/content/evergreen/patron/patron_search_results_overlay.xul chrome/locale/en-US/evergreen/patron_search_results.dtd - rm -f chrome/content/evergreen/patron/patron_checkout_items_overlay.xul chrome/locale/en-US/evergreen/patron_checkout_items.dtd - rm -f chrome/content/evergreen/patron/patron_holds_overlay.xul chrome/locale/en-US/evergreen/patron_holds.dtd - rm -f chrome/content/evergreen/circ/checkin_items_overlay.xul chrome/locale/en-US/evergreen/checkin_items.dtd - rm -f chrome/content/evergreen/circ/hold_capture_items_overlay.xul chrome/locale/en-US/evergreen/hold_capture_items.dtd - rm -f chrome/content/evergreen/conf/client_config.xml - rm -f chrome/content/evergreen/util/fieldmapper.js - rm -f chrome/content/evergreen/util/OrgTree.js - rm -f chrome/content/evergreen/OpenSRF/*js - rm -f chrome/content/evergreen/Open-ILS/util/*js - rm -f chrome/content/evergreen/Open-ILS/widgets/*js - rm -f chrome/content/evergreen/Open-ILS/widgets/menu/*js diff --git a/Evergreen/staff_client/README b/Evergreen/staff_client/README deleted file mode 100644 index e79cef86a1..0000000000 --- a/Evergreen/staff_client/README +++ /dev/null @@ -1 +0,0 @@ -This part of the tree is deprecated.. it was a previous incarnation of the staff client now at ILS/Open-ILS/xul/staff_client/ diff --git a/Evergreen/staff_client/application.ini b/Evergreen/staff_client/application.ini deleted file mode 100644 index 88a62273d9..0000000000 --- a/Evergreen/staff_client/application.ini +++ /dev/null @@ -1,39 +0,0 @@ -[App] -; Modified by Jason for Evergreen -; This file is used by XUL Runner like so: xulrunner ./application.ini -; -; This field specifies your organization's name. This field is recommended, -; but optional. -Vendor=PINES -; -; This field specifies your application's name. This field is required. -Name=Evergreen -; -; This field specifies your application's version. This field is optional. -Version=0.1.0 -; -; This field specifies your application's build ID (timestamp). This field is -; required. -BuildID=2005072719 -; -; This field specifies a compact copyright notice for your application. This -; field is optional. -Copyright=Copyright (c) 2005 GPLS/PINES -; -; This ID is just an example. Every XUL app ought to have it's own unique ID. -; You can use the microsoft "guidgen" or "uuidgen" tools, or go on -; irc.mozilla.org and /msg botbot uuid. This field is optional. -ID={c3dd711b-c9b4-4785-b8f8-6157149c8905} - -[Gecko] -; -; This field is required. It specifies the minimum Gecko version that this -; application requires. Specifying 1.8 matches all releases with a version -; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2). -MinVersion=1.8 -; -; This field is optional. It specifies the maximum Gecko version that this -; application requires. It should be specified if your application uses -; unfrozen interfaces. Specifying 1.8 matches all releases with a version -; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2). -MaxVersion=1.9 diff --git a/Evergreen/staff_client/chrome/chrome.manifest b/Evergreen/staff_client/chrome/chrome.manifest deleted file mode 100644 index 4179af3129..0000000000 --- a/Evergreen/staff_client/chrome/chrome.manifest +++ /dev/null @@ -1,3 +0,0 @@ -content evergreen jar:evergreen.jar!/content/evergreen/ -locale evergreen en-US jar:evergreen.jar!/locale/en-US/evergreen/ -skin evergreen evergreen jar:evergreen.jar!/skin/evergreen/ diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js deleted file mode 100644 index 2f4a13c072..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js +++ /dev/null @@ -1,55 +0,0 @@ -function OpenILS_init(params) { - sdump( 'D_TRACE', arg_dump( arguments, { '0':'js2JSON( map_object( arg,function(i,o){try{return [i,o.toString()];}catch(E){return [i,o];}}))' })); - - try { - - switch(params.app) { - case 'Auth' : auth_init(params); break; - case 'AppShell' : app_shell_init(params); register_AppShell(params.w); break; - case 'Opac' : opac_init(params); break; - case 'PatronSearch' : patron_search_init(params); break; - case 'PatronDisplay' : patron_display_init(params); break; - case 'Checkin' : checkin_init(params); break; - case 'HoldCapture' : hold_capture_init(params); break; - } - - } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } - - try { - - //register_document(params.w.document); - register_window(params.w); - - } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } - sdump('D_TRACE_EXIT',arg_dump(arguments)); -} - -function OpenILS_exit(params) { - sdump( 'D_TRACE', arg_dump( arguments, { '0':'js2JSON( map_object( arg,function(i,o){try{return [i,o.toString()];}catch(E){return [i,o];}}))' })); - - /* - try { - - switch(params.app) { - case 'Auth' : auth_exit(params); break; - case 'AppShell' : app_shell_exit(params); unregister_AppShell(params.w); break; - case 'Opac' : opac_exit(params); break; - case 'PatronSearch' : patron_search_exit(params); break; - case 'PatronDisplay' : patron_display_exit(params); break; - case 'Checkin' : checkin_exit(params); break; - case 'HoldCapture' : hold_capture_exit(params); break; - } - - } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } - */ - - try { - - // buggy for now - //unregister_document(params.w.document); - unregister_window(params.w); - - } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } - - sdump('D_TRACE','Exiting OpenILS_exit\n'); -} diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul deleted file mode 100644 index 7acee43058..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul deleted file mode 100644 index 870c137e22..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js deleted file mode 100644 index 4083dedd00..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js +++ /dev/null @@ -1,545 +0,0 @@ -// the master Global variable -var G = { -///////////////////////////////////////////////////////////////////////////////////// - - // pointer to the auth window - 'main_window' : self, - - // list of open window references, used for debugging in shell - 'win_list' : [], - - // list of Top Level menu interface window references - 'appshell_list' : [], - - // list of documents for debugging. BROKEN - 'doc_list' : [], - - // Windows need unique names. This number helps. - 'window_name_increment' : 0, - - // This number gets put into the title bar for Top Level menu interface windows - 'appshell_name_increment' : 0, - - // I was using this to make sure I could shove references into new windows - // correctly. However, it's JSON that tends to behave weirdly when crossing - // window boundaries. [ 'a', 'b', 'c' ] could turn into { '1' : 'a', '2' : 'b', - 'main_test_variable' : 'Hello World', - -///////////////////////////////////////////////////////////////////////////////////// - - // Flag for whether the staff client should act as if it were offline or not - 'offline' : false, - - // Array of Session Keys. This is an array mostly by accident, we usually - // only deal with one session. But this could be useful for implementing - // overrides with other logins. - 'auth_ses' : [], - - // Org Unit for the login user - 'user_ou' : '', - - // The related org units for the login user - 'my_orgs' : [], 'my_orgs_hash' : {}, - -///////////////////////////////////////////////////////////////////////////////////// - - // The Org Unit tree - 'org_tree' : '', 'org_tree_hash' : {}, - -///////////////////////////////////////////////////////////////////////////////////// - - // Historically, was the list of actor::profile's, but now it's user groups. - 'ap_list' : [], 'ap_hash' : {}, - - // config::identification_type - 'cit_list' : [], 'cit_hash' : {}, - - // config::standing - 'cst_list' : [], 'cst_hash' : {}, - - // assett::copy_location, and for my_orgs - 'acpl_list' : [], 'acpl_hash' : {}, - 'acpl_my_orgs' : [], 'acpl_my_orgs_hash' : {}, - - // actor::org_unit_type - 'aout_list' : [], 'aout_hash' : {}, - - // config::copy_status - 'ccs_list' : [], 'ccs_hash' : {}, - - // asset::stat_cat. WHERE IS THIS POPULATED AGAIN? - 'asc_list' : [], - - // actor::stat_cat - 'actsc_list' : [], 'actsc_hash' : {}, - -///////////////////////////////////////////////////////////////////////////////////// - - 'itemsout_header' : 'Welcome %PATRON_FIRSTNAME%, to %LIBRARY%!\r\nYou have the following items:
    ', - 'itemsout_line_item' : '
  1. %TITLE: 50%\r\nBarcode: %COPY_BARCODE% Due: %DUE_D%\r\n', - 'itemsout_footer' : '
%PINES_CODE% %TODAY%\r\nYou were helped by %STAFF_FIRSTNAME% %STAFF_LASTNAME%', - - 'checkout_header' : 'Welcome %PATRON_FIRSTNAME%, to %LIBRARY%!\r\nYou checked out the following items:
    ', - 'checkout_line_item' : '
  1. %TITLE%\r\nBarcode: %COPY_BARCODE% Due: %DUE_D%\r\n', - 'checkout_footer' : '
%PINES_CODE% %TODAY%\r\nYou were helped by %STAFF_FIRSTNAME% %STAFF_LASTNAME%' - -///////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////// -}; - -var debug_ignore_auth_failures = false; - -var mw = G['main_window']; -var auth_meter_incr = 10; - -///////////////////////////////////////////////////////////////////////////////////// - -function auth_init() { - sdump('D_AUTH','TESTING: auth.js: ' + mw.G['main_test_variable'] + '\n'); - sdump('D_AUTH',arg_dump(arguments)); - - var np = document.getElementById('name_prompt'); - np.addEventListener("keypress",handle_keypress,false); - np.focus(); - var pp = document.getElementById('password_prompt'); - pp.addEventListener("keypress",handle_keypress,false); - self.addEventListener("unload",nice_shutdown,false); - - G['sound'] = xp_sound_init(); snd_logon(); - var pref = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); - if (pref) { - pref.setCharPref("capability.principal.codebase.p0.granted", "UniversalXPConnect UniversalPreferencesWrite UniversalBrowserWrite UniversalPreferencesRead UniversalBrowserRead"); - pref.setCharPref("capability.principal.codebase.p0.id", "http://dev.gapines.org"); - } -} - -function handle_keypress(ev) { - if (ev.keyCode && ev.keyCode == 13) { - switch(this) { - case document.getElementById('name_prompt') : - ev.preventDefault(); - var pp = document.getElementById('password_prompt'); - pp.focus(); pp.select(); - break; - case document.getElementById('password_prompt') : - ev.preventDefault(); - var sb = document.getElementById('submit_button'); - sb.focus(); - authenticate(); - break; - default: - break; - } - } -} - -function disable_login_prompts() { - sdump('D_AUTH',arg_dump(arguments)); - disable_widgets(document,'password_prompt','name_prompt','submit_button'); - G.sound.beep(); -} - -function enable_login_prompts() { - sdump('D_AUTH',arg_dump(arguments)); - enable_widgets(document,'password_prompt','name_prompt','submit_button'); - document.getElementById('password_prompt').value = ''; - var np = document.getElementById('name_prompt'); - np.focus(); np.select(); - document.getElementById('auth_meter').value = 0; - document.getElementById('auth_meter').setAttribute('real', '0.0'); - G.sound.beep(); -} - -///////////////////////////////////////////////////////////////////////////////////// - -function authenticate() { - sdump('D_AUTH',arg_dump(arguments)); - timer_init('cat'); - var name = document.getElementById('name_prompt').value; - if (name.length == 0) { enable_login_prompts(); return; } - // Talk to the system and authenticate the user. - user_async_request( - 'open-ils.auth', - 'open-ils.auth.authenticate.init', - [ name ], - auth_init_callback - ); -} - -function auth_init_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var auth_init; - try { - auth_init = request.getResultObject(); - if (!auth_init) { throw('null result'); } - } catch(E) { - G.offline = true; - sdump('D_ERROR','Error trying to communicate with the server. Entering OFFLINE mode.\n' + js2JSON(E) + '\n'); - s_alert('Error trying to communicate with the server. Entering OFFLINE mode.\n' + js2JSON(E) + '\n'); - } - - sdump( 'D_AUTH', 'D_AUTH_INIT: ' + typeof(auth_init) + ' : ' + auth_init + '\n'); - var name = document.getElementById('name_prompt').value; - var pw = document.getElementById('password_prompt').value; - G.name = name; G.pw = pw; - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.auth', - 'open-ils.auth.authenticate.complete', - [ name, hex_md5(auth_init + hex_md5(pw)) ], - auth_ses_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function auth_ses_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var auth_ses; - try { - auth_ses = request.getResultObject(); - if (!auth_ses) { if (!G.offline) { throw('null result'); } } - if (auth_ses == 0) { throw('0 result'); } - if (instanceOf(auth_ses,ex)) { - throw(auth_ses.err_msg()); - } - } catch(E) { - alert('Login failed on auth_ses: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - mw.G.auth_ses = [ auth_ses ]; - sdump( 'D_AUTH', 'D_AUTH_SES: ' + typeof(mw.G['auth_ses'][0]) + ' : ' + mw.G['auth_ses'][0] + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - //'open-ils.actor.user.profiles.retrieve', - user_async_request( - 'open-ils.actor', - 'open-ils.actor.groups.retrieve', - [], - ap_list_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function ap_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - //var ap_file = get_file('ap_list'); - var ap_list; - try { - ap_list = request.getResultObject(); - if (!ap_list && G.offline) { - //ap_list = get_object_in_file('ap_list'); - } - if (!ap_list) { throw('null result'); } - if (ap_list.length == 0) { throw('zero length result'); } - } catch(E) { - handle_error('Login failed on ap_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('ap_list',ap_list); } catch(E) { handle_error(E); } - mw.G.ap_list = ap_list; - mw.G.ap_hash = convert_object_list_to_hash( ap_list ); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.actor', - 'open-ils.actor.user.ident_types.retrieve', - [], - cit_list_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function cit_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var cit_list; - try { - cit_list = request.getResultObject(); - //if (!cit_list && G.offline) { cit_list = get_object_in_file('cit_list'); } - if (!cit_list) { throw('null result'); } - if (cit_list.length == 0) { throw('zero length result'); } - } catch(E) { - alert('Login failed on cit_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('cit_list',cit_list); } catch(E) { handle_error(E); } - mw.G.cit_list = cit_list; - mw.G.cit_hash = convert_object_list_to_hash( cit_list ); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.actor', - 'open-ils.actor.standings.retrieve', - [], - cst_list_callback - ); - - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function cst_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var cst_list; - try { - cst_list = request.getResultObject(); - //if (!cst_list && G.offline) { cst_list = get_object_in_file('cst_list'); } - if (!cst_list) { throw('null result'); } - if (cst_list.length == 0) { throw('zero length result'); } - } catch(E) { - alert('Login failed on cst_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('cst_list',cst_list); } catch(E) { handle_error(E); } - mw.G.cst_list = cst_list; - mw.G.cst_hash = convert_object_list_to_hash( cst_list ); - sdump('D_AUTH', 'cst_list = ' + js2JSON(cst_list) + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.search', - 'open-ils.search.config.copy_location.retrieve.all', - [], - acpl_list_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); - -} - -function acpl_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var acpl_list; - try { - acpl_list = request.getResultObject(); - //if (!acpl_list && G.offline) { acpl_list = get_object_in_file('acpl_list'); } - if (!acpl_list) { throw('null result'); } - if (acpl_list.length == 0) { throw('zero length result'); } - } catch(E) { - alert('Login failed on acpl_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('acpl_list',acpl_list); } catch(E) { handle_error(E); } - mw.G.acpl_list = acpl_list; - mw.G.acpl_hash = convert_object_list_to_hash( acpl_list ); - sdump('D_AUTH', 'acpl_list = ' + js2JSON(acpl_list) + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.search', - 'open-ils.search.config.copy_status.retrieve.all', - [], - ccs_list_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function ccs_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var ccs_list; - try { - ccs_list = request.getResultObject(); - //if (!ccs_list && G.offline) { ccs_list = get_object_in_file('ccs_list'); } - if (!ccs_list) { throw('null result'); } - if (ccs_list.length == 0) { throw('zero length result'); } - } catch(E) { - alert('Login failed on ccs_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('ccs_list',ccs_list); } catch(E) { handle_error(E); } - mw.G.ccs_list = ccs_list; - mw.G.ccs_hash = convert_object_list_to_hash( ccs_list ); - sdump('D_AUTH', 'ccs_list = ' + js2JSON(ccs_list) + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.search', - 'open-ils.search.actor.user.session', - [ mw.G['auth_ses'][0] ], - user_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function user_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var user; - var user_ou; - try { - user = request.getResultObject(); - if (!user && G.offline) { - //user = new au(); - //user.home_ou( get_object_in_file('user_ou') ); - } - if (!user) { throw('null result'); } - if (typeof(user) != 'object') { throw('result not an object' + user); } - } catch(E) { - alert('Login failed on user: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('user_ou',user.home_ou()); } catch(E) { handle_error(E); } - mw.G.user = user; - mw.G.user_ou = user.home_ou(); - sdump('D_AUTH', "user: " + js2JSON(mw.G['user']) + '\n'); - sdump('D_AUTH', "user_ou: " + js2JSON(mw.G['user_ou']) + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.actor', - 'open-ils.actor.org_tree.retrieve', - [], - org_tree_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function org_tree_callback(request) { - var org_tree; - try { - org_tree = request.getResultObject(); - //if (!org_tree && G.offline) { org_tree = get_object_in_file('org_tree'); } - if (!org_tree) { throw('null result'); } - if (typeof(org_tree) != 'object') { throw('result not an object' + org_tree); } - } catch(E) { - alert('Login failed on org_tree: ' + js2JSON(E)); enable_login_prompts(); return; - } - - //mw.G.org_tree = globalOrgTree; - //try { set_object_in_file('org_tree',org_tree); } catch(E) { handle_error(E); } - mw.G.org_tree = org_tree; - mw.G.org_tree_hash = convert_object_list_to_hash( flatten_ou_branch( mw.G.org_tree ) ); - mw.G.user_ou = find_ou( mw.G.org_tree, mw.G.user_ou ); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - /*user_async_request( - 'open-ils.actor', - 'open-ils.actor.org_types.retrieve', - [ mw.G.auth_ses[0] ], - org_type_callback - );*/ - org_type_callback(); -} - -function org_type_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var aout_list = globalOrgTypes; - /*try { - aout_list = request.getResultObject(); - if (!aout_list) { throw('null result'); } - if (typeof(aout_list) != 'object') { throw('result not an object' + aout_list); } - if (aout_list.length == 0) { throw('empty aout_list'); } - } catch(E) { - alert('Login failed on aout_list: ' + js2JSON(E)); enable_login_prompts(); return; - }*/ - mw.G.aout_list = aout_list; - mw.G.aout_hash = convert_object_list_to_hash( aout_list ); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.actor', - 'open-ils.actor.org_unit.full_path.retrieve', - [ mw.G.auth_ses[0] ], - my_orgs_callback - ); - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function my_orgs_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var my_orgs; - try { - my_orgs = request.getResultObject(); - //if (!my_orgs && G.offline) { my_orgs = get_object_in_file('my_orgs'); } - if (!my_orgs) { throw('null result'); } - if (typeof(my_orgs) != 'object') { throw('result not an object' + my_orgs); } - if (my_orgs.length == 0) { throw('empty my_orgs'); } - } catch(E) { - alert('Login failed on my_orgs: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - - //try { set_object_in_file('my_orgs',my_orgs); } catch(E) { handle_error(E); } - mw.G.my_orgs = my_orgs; - mw.G.my_orgs_hash = convert_object_list_to_hash( my_orgs ); - sdump('D_AUTH','my_orgs = ' + js2JSON(my_orgs) + '\n'); - mw.G.acpl_my_orgs = filter_list( - mw.G.acpl_list, - function (obj) { - if ( typeof obj != 'object' ) return null; - if ( mw.G.my_orgs_hash[ obj.owning_lib() ] ) return obj; - } - ); - mw.G.acpl_my_orgs_hash = convert_object_list_to_hash( mw.G.acpl_my_orgs ); - //sdump('D_AUTH', 'my_orgs.length = ' + mw.G.my_orgs.length + ' other_orgs.length = ' + mw.G.other_orgs.length + '\n'); - - ///////////////////////////////////////////////////////////////////////////////////////////////////// - user_async_request( - 'open-ils.circ', - 'open-ils.circ.stat_cat.actor.retrieve.all', - [ mw.G.auth_ses[0], mw.G.user_ou.id() ], - my_actsc_list_callback - ); - - incr_progressmeter(document,'auth_meter',auth_meter_incr); -} - -function my_actsc_list_callback(request) { - sdump('D_AUTH',arg_dump(arguments)); - var actsc_list; - try { - actsc_list = request.getResultObject(); - //if (!actsc_list && G.offline) { actsc_list = get_object_in_file('actsc_list'); } - if (!actsc_list) { throw('null result'); } - //if (actsc_list.length == 0) { throw('zero length result'); } - } catch(E) { - alert('Login failed on actsc_list: ' + js2JSON(E)); - if (!debug_ignore_auth_failures) { - enable_login_prompts(); return; - } - } - //try { set_object_in_file('actsc_list',actsc_list); } catch(E) { handle_error(E); } - mw.G.actsc_list = actsc_list; - mw.G.actsc_hash = convert_object_list_to_hash( actsc_list ); - sdump('D_AUTH', 'actsc_list = ' + js2JSON(actsc_list) + '\n'); - - incr_progressmeter(document,'auth_meter',auth_meter_incr); - - spawn_main(); - - mw.minimize(); - -} - - -function logoff() { - sdump('D_AUTH',arg_dump(arguments)); - mw.G['auth_ses'] = ''; - close_all_windows(); - enable_login_prompts(); - incr_progressmeter(document,'auth_meter',-100); - snd_logoff(); -} - -function nice_shutdown() { - sdump('D_AUTH',arg_dump(arguments)); - if (ses) { logoff(); ses.disconnect(); } - snd_exit; - close_all_windows(); - window.close(); -} - diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul deleted file mode 100644 index 736185ab87..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul deleted file mode 100644 index b949fe6fdf..0000000000 --- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth_overlay.xul +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -