From 03f9467912a21b1d1ff2e5832ac89b66a5095a74 Mon Sep 17 00:00:00 2001 From: tipaul Date: Wed, 4 Jun 2003 13:46:24 +0000 Subject: [PATCH] moving breeding farm import to parameters page (GUI) and to new import/ directory (code structure) --- .../marcimport.pl => import/breeding.pl | 5 +- .../default/en/acqui.simple/addbooks.tmpl | 32 ---------- .../default/en/import/breeding.tmpl | 60 +++++++++++++++++++ .../marcimport.tmpl => import/breeding.tmpl} | 2 +- 4 files changed, 65 insertions(+), 34 deletions(-) rename acqui.simple/marcimport.pl => import/breeding.pl (97%) create mode 100644 koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl rename koha-tmpl/intranet-tmpl/default/fr/{acqui.simple/marcimport.tmpl => import/breeding.tmpl} (97%) diff --git a/acqui.simple/marcimport.pl b/import/breeding.pl similarity index 97% rename from acqui.simple/marcimport.pl rename to import/breeding.pl index cf9f505680..ea3062ba06 100755 --- a/acqui.simple/marcimport.pl +++ b/import/breeding.pl @@ -69,7 +69,7 @@ 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 => "acqui.simple/marcimport.tmpl", + = get_template_and_user({template_name => "import/breeding.tmpl", query => $input, type => "intranet", authnotrequired => 0, @@ -103,6 +103,9 @@ my $file; #--------------- # log cleared, as marcimport is (almost) rewritten from scratch. # $Log$ +# 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. diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl index af2cc1fa4a..5f913c92a0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl @@ -44,38 +44,6 @@

- - - - -
Tools for importing MARC records into breeding farm
- - - - - - - -
 
  • Upload MARC records
    		•  The breeding farm is a table where imported MARC records are stored.
    - A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm. - If it is found, the biblio is added to Koha active table and removed from the breeding farm.
    -
    - - - - - - -
    Tools for importing a MARC record from a z39.50 server
    - - - - - - - - -
     
  • z39.50 Search Tool
    		•  does not work
    diff --git a/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl new file mode 100644 index 0000000000..1c4cd48dd2 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/import/breeding.tmpl @@ -0,0 +1,60 @@ + +

    MARC acquisition system

    + +
    + + + +
    Import into the breeding farm
    + + +

    Import results :

    + + + +
    " enctype="multipart/form-data"> + + + + + + + + + + + + + + + + + + + + + + +
    Select the file to import: +
    +
    Name of this import: +
    +
    Character encoding (USMARC or UNIMARC) +
    +
    If ISBN already in breeding farm: Ignore this one, keep the existing one
    + Overwrite the existing one with this
     
    +
    + + diff --git a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl b/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl similarity index 97% rename from koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl rename to koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl index 827f87dc66..251b2ad1de 100644 --- a/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl +++ b/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl @@ -15,7 +15,7 @@

    pas importé : déjàdans le réservoir

    pas importé : ne semble pas au format MARC (ou ISBN/ISSN manquent) !

    notices traitées

    -

    Retour au catalogage +

    Retour

      Sélectionnez un fichier à importer dans le réservoir. Il sera traité, et pour chaque ISBN trouvé, une nouvelle notice sera crée dans le réservoir. Si un ISBN existe déjà dans le réservoir, vous pouvez choisir ou bien d'ignorer la nouvelle notice, ou bien d'écraser l'ancienne.
      -- 2.39.5