Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Marcel de Rooy	ba5cd24553	Bug 17501: Move getCategories and httpheaders from Upload.pm Class method getCategories has no strict binding to Upload.pm. While Upload.pm is now restricted to the actual uploading process with CGI hook, this routine fits better in the UploadedFile package. Class method httpheaders can be moved as well for the same reason. Note that it actually is an instance method. The parameter $name is dropped. Test plan: [1] Run t/db_dependent/Upload.t. [2] Check the categories in the combo box of tools/upload. [3] Check a download via tools/upload and opac-retrieve-file. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Marcel de Rooy	158442eb9e	Bug 17501: Remove Koha::Upload::get from Koha::Upload The get routine actually returns records from uploaded_files. It should be possible to replace its calls by direct calls of Koha::UploadedFiles. This patch is the crux of this patch set. It deals with all scripts that use Koha::Upload. In the process we do: [1] Add a file_handle method to Koha::UploadedFile. This was previously arranged via the fh parameter of get. [2] Add a full_path method to UploadedFile. Previously returned in the path hash key of get. (Name is replaced by filename.) [3] Add a search_term method too (implementing get({ term => .. }). This logic came from _lookup. [4] Add a keep_file parameter to delete method. Only used in test now. Test plan: [1] Run t/db_dependent/Upload.t [2] Go to Tools/Upload. Add an upload, download and delete. [3] Add another public upload , search for it. Use the hashvalue to download via opac with URL: cgi-bin/koha/opac-retrieve-file.pl?id=[hashvalue] [4] Go to Tools/Stage MARC for import. Import a marc file. [5] Go to Tools/Upload local cover image. Import an image file. Enable OPACLocalCoverImages to see result. [6] Test uploading a offline circulation file: Enable AllowOfflineCirculation, and create a koc file (plain text): Line1: Version=1.0\tA=1\tB=2 Line2: 2016-11-23 16:00:00 345\treturn\t[barcode] Note: Replace tabs and barcode. The number of tabs is essential! Checkout the item with your barcode. Go to Circulation/Offline circulation file upload. Upload and click Apply directly. Checkout again. Repeat Offline circulation file upload. Now click Add to offline circulation queue. [7] Connect the upload plugin to field 856$u. Enable HTML5MediaEnabled. Upload a webm file via the plugin. Click Choose to save the URL, and put 'video/webm' into 856$q. Save the biblio record. Check if you see the media tab with player on staff detail. (See also: Bug 17673 about empty OPACBaseURL.) Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Marcel de Rooy	83ea49a009	Bug 14321: Integrate Upload.pm into Koha This patch makes the following changes to achieve that: [1] Use Upload.pm in stage-marc-import.pl, upload-cover-image.pl, offline_circ/process_koc.pl and enqueue_koc.pl. [2] A new file-upload.js replaces file-upload.inc in the associated template. We now use ajax to get progress figures instead of launching perl script upload-file-progress. The js changes now also allow for aborting a file upload. [3] Adds a tools/upload script and template. It allows to upload multiple files at once. [4] Makes upload-file return error messages in JSON. For a multiple upload, we could have some files with errors and others without errors. The upload is now marked as Failed only if there was no upload at all. [5] The upload plugin is converted to use tools/upload with plugin param. Deleting an upload is now presented via the search results form. NOTE: In editing the process_koc.tt I noticed that the form enqueuefile was hidden and no longer used (with associated code in process_koc.pl). When a file has been uploaded, I display the form again (with the Apply directly button). The code still works. NOTE: We fix an error in upload-file from one of the patches of bug 6874. The userid of the Koha admin user is passed to haspermission, but we should pick the userid from the session. NOTE: Bug 14686 will add a specific permission for tools/upload.pl, and will add the tools/upload script to the Tools menu. For now, you need edit_catalogue to start upload.pl and you will additionally need a permission like upload_local_cover_images to successfully upload a new file. Test plan: [1] Upload a marc file in stage-marc-import. (This is temp storage.) [2] Check new entry in table uploaded_files. Look for the file in your temporary directory (/tmp ?), subfolder koha_upload. Bonus: Remove permissions on this subfolder. Retry, check error and restore permissions again. [3] Upload another (larger) file and abort the upload. Check table and directory again. You should have a partial file, but no record. [4] Verify that Stage for import still works as expected. [5] Test Upload local cover image. (Enable OPACLocalCoverImages.) You can test an individual image or a zip file including images and a file called datalink.txt (with lines biblionumber,filename). [6] Test uploading a offline circulation file: Enable AllowOfflineCirculation, and create a koc file (plain text): Line1: Version=1.0\tA=1\tB=2 Line2: 2015-08-06 08:00:00 345\treturn\t[barcode] Note: Replace tabs and barcode. The number of tabs is essential! Checkout the item with your barcode. Go to Offline circulation file upload. Upload and click Apply directly. Checkout again. Upload again, click Add to offline circulation queue. [7] Upload three files via tools/upload.pl with a category and marked as public. Check the results in the table. Verify that you can download the file in OPAC without being logged in. [8] Pick one new file and one of the files of step 7. Upload them in the same category. One upload should succeed. Check for reported error. [9] Connect upload.pl to field 856$u. Goto Cataloguing editor. In an empty 856$u, click the tag editor. Upload a file and click Choose. Save the record. Open the record in the OPAC and click the link. Copy this link to your clipboard for next step. [A] Go back to editor. Click the tag editor on the same 856 field. Choose for Delete. Open the link in your clipboard again. Error message? [B] Check the process of upload, search, download and delete of an upload with some diacritical characters in the filename. (Bonus points for adding special chars in the category code.) Note: You can add categories via authorized values, UPLOAD key. Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Bug 14321: [QA Follow-up] Perltidy upload.pl Run perltidy -pro=xt/perltidyrc on tools/upload.pl. No other changes. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Marcel de Rooy	d7cdb6e15e	Bug 6874: [QA Follow-up] Adjustments for opac-retrieve Adds httpheaders sub to UploadedFiles; this will be extended on a new report. (Idea is to add configurable headers for file extensions.) Trivial unit test added. Small cosmetic changes to opac-retrieve-file. Test plan: Run test UploadedFiles.t Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	9 years ago
Mark Tompsett	98ccd548ee	Bug 6874: License Text Update This updates the license text for - C4/UploadedFiles.pm - cataloguing/value_builder/upload.pl - opac/opac-retrieve-file.pl to GPL v3 as per the http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence text. TEST PLAN --------- 1) Don't apply this patch as part of 6874. 2) Run the koha qa test tool. -- It will FAIL for those three file. 3) Apply this patch 4) Run the koha qa test tool. -- License problem is corrected, no FAILs. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	10 years ago
Paul Poulain	bfe5680186	Bug 6874: QA follow-up Squash of the following commits: return with explicit undef removed Follow-up for PBP fixes follow-up fix POD syntax follow-up jquery has moved Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Amended: removed POD changes in Biblio.pm while rebasing. Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>	11 years ago
Julian Maurice	2def11d678	Bug 6874: Attach files to bibliographic records New cataloging plugin upload.pl and new system preference 'uploadPath'. upload.pl provide a way to upload files on the server and store a link (url) to it in MARC uploadPath is the absolute path on the server where the files will be stored. It's possible to have a hierarchy of directories under this path and the plugin will allow to choose in which directory to store the file. Stored value in MARC subfield looks like this: <OPACBaseURL>/cgi-bin/koha/opac-retrieve-file.pl?id=<SHA-1 of the file> So both 'uploadPath' and 'OPACBaseURL' sysprefs have to be set for this plugin to work correctly Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Slightly amended/simplified the patch during QA: The changes to GetMarcUrls are not really needed, and would have needed some attention. Another link text can be supplied by the plugin too. This also reduces the need for changes in basket.pl, MARCdetail.pl, detail.pl, opac-basket.pl and opac-detail.pl. Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> Edit: more meaninfull commit subject	12 years ago
Kyle Hall	062f34c55d	Bug 13851: Replace waiting holds logic in circulation.pl with Koha Objects This is the original patch for bug 12892 and replaces the older style of fetching the holds data with Koha Objects. It will be used as a foundation for future features. Test Plan: 1) Apply this patch 2) Create a hold, set to waiting 3) Browse to circulation.pl for that patron 4) Note you see the list of waiting holds 5) Switch your logged in branch to a different branch 6) Note the "Waiting at" line is no longer emphasized. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us> Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	10 years ago
Kyle Hall	6f0316a8d2	Bug 13019 - Add base classes on which to build Koha objects The idea behind this is to have a pair of base classes on which to build our new generation of Koha objects. Koha::Object is a base class, which in it's most basic form, is to represent a row in a table. For example, Koha::Borrower inherits from Koha::Object. So too could Koha::Biblio and Koha::Item for example. Koha::Objects is to represent a way to fetch and manipulate sets of objects. For example, Koha::Borrowers has a method to get a Koha::Borrower object by id and a method to search for an get a list of Koha::Borrower objects. Right now Koha::Objects has only the essentials but can easily be extended and those enhancements will be passed down to all the child classes based on it. By using these classes as a base, we will add consistency to our code, allow us to keep our code DRY, reduce bugs, and encapsulate our database access among other benefits. Test Plan: 1) Apply this patch 2) prove t/Object.t t/db_dependent/Object.t t/db_dependent/Objects.t Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Chris Cormack	509d673f10	Bug 7941 : Fix version numbers in modules Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>	12 years ago
Andrew Elwell	9fa574f609	Bug 5385: POD Cleanups (part 1) working through the master branch to eliminate all podchecker warnings/errors Actual improvement to the quality of the POD will come later (hopefully with assistance of others) Signed-off-by: Andrew Elwell <Andrew.Elwell@gmail.com> Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>	14 years ago
Lars Wirzenius	7279f55b60	Fix FSF address in directory C4/ Signed-off-by: Galen Charlton <gmcharlt@gmail.com>	14 years ago
Galen Charlton	a670f1817e	bug 2509: fix file permissions Following suggestion by Vincent Danjean for Debian packaging, 0755 -> 0644 for non-executable files. Also removed shebang from a few modules in C4. Signed-off-by: Galen Charlton <galen.charlton@liblime.com>	16 years ago
Andrew Moore	a7d9851eb6	Bug 2400 [14/18]: fixing pod syntax in C4/Barcodes/incremental.pm Signed-off-by: Galen Charlton <galen.charlton@liblime.com>	16 years ago
Joe Atzberger	46a43c0a93	Barcodes - OO replacements, extensible module, tests. This code is intended to replace current value_builder code in 3.2, but it does not affect it directly (yet) and is safe to include in 3.0. This structure will be used to handle more complicated formats, like those with checkdigits. Please note that "incremental" format is still STRONGLY recommended because it will always perform the best, and most flexibly. The desire to include other information (like branchcode) should compel the proper use of the barcode generator to print the info ON the barcode, not IN the barcode. One of the nicer features of this structure is that you are able to create a new barcode (of the same type) based on any previous Barcodes object. That means you can create an array of 51 consecutive barcodes like: my $x = C4::Barcodes->new('annual'); # for example my @set = ($x); for (1..50) { push @set, $x=$x->new; } Importantly, this can happen without referencing the database after the first constructor. Signed-off-by: Joshua Ferraro <jmf@liblime.com>	16 years ago
Henri-Damien LAURENT	f6954b6536	Adding changelanguage feature to OPAC Signed-off-by: Chris Cormack <crc@liblime.com> Signed-off-by: Joshua Ferraro <jmf@liblime.com>	17 years ago
Joshua Ferraro	4559e0e0e0	Searching Patch 1: fixing searching in 3.0 Signed-off-by: Chris Cormack <crc@liblime.com> Signed-off-by: Joshua Ferraro <jmf@liblime.com>	17 years ago
tipaul	5ff7fcffa4	Bugfixes & improvements (various and minor) : - updating templates to have tmpl_process3.pl running without any errors - adding a drupal-like css for prog templates (with 3 small images) - fixing some bugs in circulation & other scripts - updating french translation - fixing some typos in templates	17 years ago
tipaul	fc1342f73d	rel_3_0 moved to HEAD	18 years ago
tipaul	b2d3fe1ccb	moving language chooser to the main page. moving the getalltemplates and getalllanguages subs out from Search.pm (that will be deprecated soon) to Koha.pm moving changelanguage.pl to OPAC scope	20 years ago
rangi	e70385696a	Little script that takes a language as an input, and sets a cookie	20 years ago

7 Commits (6bfd41eb0addf7e1d02c898696de31187320c30e)