From ed977e36e96da6263ecfe5346282d7cd065db7ef Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sat, 27 Oct 2007 14:14:51 -0500 Subject: [PATCH] completed removal of breeding.pl; fixed location of help for import.pl per 2006-02-24 comment, breeding.pl had been renamed to import.pl, but not all of the affected files were changed accordingly. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/includes/tools-menu.inc | 2 +- .../breeding.tmpl => tools/import.tmpl} | 0 .../prog/en/modules/tools/breeding.tmpl | 74 ------ .../prog/en/modules/tools/import.tmpl | 6 +- tools/breeding.pl | 229 ------------------ 5 files changed, 4 insertions(+), 307 deletions(-) rename koha-tmpl/intranet-tmpl/prog/en/modules/help/{import/breeding.tmpl => tools/import.tmpl} (100%) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl delete mode 100755 tools/breeding.pl diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index 0d049a518a..d8ad3fec3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -8,7 +8,7 @@
  • Import
  • Notices
  • Notice/status triggers
  • -
  • Reservoir
  • +
  • Reservoir
  • Labels
  • Log viewer
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/modules/help/import/breeding.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl deleted file mode 100644 index 7e4cc7729b..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/breeding.tmpl +++ /dev/null @@ -1,74 +0,0 @@ - -Koha › Tools › MARC Import - - - - - - - - -
    - -
    -
    -
    - -

    MARC acquisition system

    - - -

    Import results :

    -
      -
    • imported records
    • -
    • not imported because already in catalog
    • -
    • not imported because already in the reservoir
    • -
    • not imported because they seem not to be in MARC format (or ISBN/ISSN missing) !
    • -
    • records parsed
    • -
    • Back
    • -
    - -
      -
    • Select a file to import into the reservoir. It will be parsed, and for each ISBN found, a new baby will be created in the reservoir.
    • -
    • If an ISBN already exists in the reservoir, you can choose whether to ignore the new one or overwrite the old one.
    • -
    • You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!
    • -
    • Of course, if the ISBN already exists in the active DB, the biblio will be ignored.
    • -
    -
    " enctype="multipart/form-data"> -
    Import into the reservoir
      -
    1. - - - - -
    2. -
    3. - - - - -
    4. -
    5. - - - - -
    -
    - If ISBN is already in the reservoir: -
      -
    1. -
    2. -
    3. - -
    4. -
    -
    - - -
    -
    -
    - -
    -
    - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl index 062f3c5b90..f2363ad9b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import.tmpl @@ -1,12 +1,12 @@ -Koha › Cataloging › MARC Import +Koha › Tools › MARC Import - +
    @@ -24,7 +24,7 @@
  • not imported because already in the reservoir
  • not imported because they seem not to be in MARC format (or ISBN/ISSN missing) !
  • records parsed
  • -
  • Back
  • +
  • Back
    • diff --git a/tools/breeding.pl b/tools/breeding.pl deleted file mode 100755 index 26caa870c7..0000000000 --- a/tools/breeding.pl +++ /dev/null @@ -1,229 +0,0 @@ -#!/usr/bin/perl - - -# Script for handling import of MARC data into Koha db -# and Z39.50 lookups - -# Koha library project www.koha.org - -# Licensed under the GPL - - -# Copyright 2000-2002 Katipo Communications -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA - -use strict; - -# standard or CPAN modules used -use CGI; -use DBI; -use MARC::File::USMARC; - -# Koha modules used -use C4::Context; -use C4::Auth; -use C4::Input; -use C4::Output; -use C4::Biblio; -use C4::Breeding; - -#------------------ -# Constants - -my $includes = C4::Context->config('includes') || - "/usr/local/www/hdl/htdocs/includes"; - -# HTML colors for alternating lines -my $lc1='#dddddd'; -my $lc2='#ddaaaa'; - -#------------- -#------------- -# Initialize - -my $userid=$ENV{'REMOTE_USER'}; - -my $input = new CGI; -my $dbh = C4::Context->dbh; - -my $uploadmarc=$input->param('uploadmarc'); -my $overwrite_biblio = $input->param('overwrite_biblio'); -my $filename = $input->param('filename'); -my $syntax = $input->param('syntax'); -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "tools/breeding.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {tools => 1}, - debug => 1, - }); - -$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'}, - uploadmarc => $uploadmarc); -if ($uploadmarc && length($uploadmarc)>0) { - my $marcrecord=''; - while (<$uploadmarc>) { - $marcrecord.=$_; - } - my ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported) = ImportBreeding($marcrecord,$overwrite_biblio,$filename,$syntax,int(rand(99999))); - - $template->param(imported => $imported, - alreadyindb => $alreadyindb, - alreadyinfarm => $alreadyinfarm, - notmarcrecord => $notmarcrecord, - total => $imported+$alreadyindb+$alreadyinfarm+$notmarcrecord, - ); - -} - -output_html_with_http_headers $input, $cookie, $template->output; -my $menu; -my $file; - - -#--------------- -# log cleared, as marcimport is (almost) rewritten from scratch. -# Revision 1.3 2007/04/24 13:54:30 hdl -# functions that were in C4::Interface::CGI::Output are now in C4::Output. -# So this implies quite a change for files. -# Sorry about conflicts which will be caused. -# directory Interface::CGI should now be dropped. -# I noticed that many scripts (reports ones, but also some circ/stats.pl or opac-topissues) still use Date::Manip. -# -# Revision 1.2 2007/03/09 15:47:55 tipaul -# rel_3_0 moved to HEAD (introducing new files) -# -# Revision 1.1.2.3 2006/12/22 17:13:49 tipaul -# removing "management" permission, that is useless (replaced by tools & admin) -# -# Revision 1.1.2.2 2006/12/18 16:35:20 toins -# removing use HTML::Template from *.pl. -# -# Revision 1.1.2.1 2006/09/26 13:35:33 toins -# breeding.pl moving from import/ to tools/ -# -# Revision 1.5.2.1 2006/09/26 13:10:35 toins -# script was writed 2 times on the same file ! -# -# Revision 1.5 2006/07/04 14:36:52 toins -# Head & rel_2_2 merged -# -# Revision 1.4 2005/05/04 08:52:13 tipaul -# synch'ing 2.2 and head -# -# Revision 1.2.4.1 2005/04/07 10:10:52 tipaul -# copying processz3950queue from 2.0 branch. The 2.2 version misses an important fix -# -# Revision 1.2 2003/10/06 09:10:38 slef -# Removing config info from z3950*sh and using C4::Context in processz3950queue (Fixed bug 39) -# -# Revision 1.1 2003/06/04 13:46:25 tipaul -# moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure) -# -# Revision 1.33 2003/04/29 16:48:36 tipaul -# really proud of this commit :-) -# z3950 search and import seems to works fine. -# Let me explain how : -# * a "search z3950" button is added in the addbiblio template. -# * when clicked, a popup appears and z3950/search.pl is called -# * z3950/search.pl calls addz3950search in the DB -# * the z3950 daemon retrieve the records and stores them in z3950results AND in marc_breeding table. -# * as long as there as searches pending, the popup auto refresh every 2 seconds, and says how many searches are pending. -# * when the user clicks on a z3950 result => the parent popup is called with the requested biblio, and auto-filled -# -# Note : -# * character encoding support : (It's a nightmare...) In the z3950servers table, a "encoding" column has been added. You can put "UNIMARC" or "USMARC" in this column. Depending on this, the char_decode in C4::Biblio.pm replaces marc-char-encode by an iso 8859-1 encoding. Note that in the breeding import this value has been added too, for a better support. -# * the marc_breeding and z3950* tables have been modified : they have an encoding column and the random z3950 number is stored too for convenience => it's the key I use to list only requested biblios in the popup. -# -# Revision 1.32 2003/04/22 12:22:54 tipaul -# 1st draft for z3950 client import. -# moving Breeding farm script to a perl package C4/Breeding.pm -# -# Revision 1.31 2003/02/19 01:01:07 wolfpac444 -# Removed the unecessary $dbh argument from being passed. -# Resolved a few minor FIXMEs. -# -# Revision 1.30 2003/02/02 07:18:38 acli -# Moved C4/Charset.pm to C4/Interface/CGI/Output.pm -# -# Create output_html_with_http_headers function to contain the "print $query -# ->header(-type => guesstype...),..." call. This is in preparation for -# non-HTML output (e.g., text/xml) and charset conversion before output in -# the future. -# -# Created C4/Interface/CGI/Template.pm to hold convenience functions specific -# to the CGI interface using HTML::Template -# -# Modified moremembers.pl to make the "sex" field localizable for languages -# where M and F doesn't make sense -# -# Revision 1.29 2003/01/28 15:28:31 tipaul -# removing use MARC::Charset -# Was a buggy test -# -# Revision 1.28 2003/01/28 15:00:31 tipaul -# user can now search in breeding farm with isbn/issn or title. Title/name are stored in breeding farm and showed when a search is done -# -# Revision 1.27 2003/01/26 23:21:49 acli -# Handle non-latin1 charsets -# -# Revision 1.26 2003/01/23 12:26:41 tipaul -# upgrading import in breeding farm (you can now search on ISBN or on title) AND character encoding. -# -# Revision 1.25 2003/01/21 08:13:50 tipaul -# character encoding ISO646 => 8859-1, first draft -# -# Revision 1.24 2003/01/14 16:41:17 tipaul -# bugfix : use gettemplate_and_user instead of gettemplate. -# fix a blank screen in 1.3.3 in "import in breeding farm" -# -# Revision 1.23 2003/01/06 13:06:28 tipaul -# removing trailing # -# -# Revision 1.22 2002/11/12 15:58:43 tipaul -# road to 1.3.2 : -# * many bugfixes -# * adding value_builder : you can map a subfield in the marc_subfield_structure to a sub stored in "value_builder" directory. In this directory you can create screen used to build values with any method. In this commit is a 1st draft of the builder for 100$a unimarc french subfield, which is composed of 35 digits, with 12 differents values (only the 4th first are provided for instance) -# -# Revision 1.21 2002/10/22 15:50:23 tipaul -# road to 1.3.2 : adding a biblio in MARC format. -# seems to work a few. -# still to do : -# * manage html checks (mandatory subfields...) -# * add list of acceptable values (authorities) -# * manage ## in MARC format -# * manage correctly repeatable fields -# and probably a LOT of bugfixes -# -# Revision 1.20 2002/10/16 12:46:19 arensb -# Added a FIXME comment. -# -# Revision 1.19 2002/10/15 10:14:44 tipaul -# road to 1.3.2. Full rewrite of marcimport.pl. -# The acquisition system in MARC version will work like this : -# * marcimport will put marc records into a "breeding farm" table. -# * when the user want to add a biblio, he enters first the ISBN/ISSN of the biblio. koha searches into breeding farm and if the record exists, it is shown to the user to help him adding the biblio. When the biblio is added, it's deleted from the breeding farm. -# -# This commit : -# * modify acqui.simple home page (addbooks.pl) -# * adds import into breeding farm -# -# Please note that : -# * z3950 functionnality is dropped from "marcimport" will be added somewhere else. -# * templates are in a new acqui.simple sub directory, and the marcimport template directory will become obsolete soon.I think this is more logic -# -- 2.39.5