From 5dda1342e98e70bada52152b57ac7671907d3893 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 19 Nov 2004 16:41:49 +0000 Subject: [PATCH] improving behaviour when MARC=OFF --- acqui.simple/additem-nomarc.pl | 5 +- acqui.simple/saveitem.pl | 2 +- .../en/acqui.simple/addbiblio-nomarc.tmpl | 92 ++---- .../en/acqui.simple/additem-nomarc.tmpl | 301 ++++++------------ loadmodules.pl | 24 +- search.marc/search.pl | 1 + 6 files changed, 153 insertions(+), 272 deletions(-) diff --git a/acqui.simple/additem-nomarc.pl b/acqui.simple/additem-nomarc.pl index 49f9e61c1e..8a126cbef4 100755 --- a/acqui.simple/additem-nomarc.pl +++ b/acqui.simple/additem-nomarc.pl @@ -20,6 +20,9 @@ # Suite 330, Boston, MA 02111-1307 USA # $Log$ +# Revision 1.4 2004/11/19 16:41:49 tipaul +# improving behaviour when MARC=OFF +# # Revision 1.3 2004/08/13 16:37:25 tipaul # adding frameworkcode to API in some subs # @@ -30,7 +33,7 @@ use CGI; use strict; -# use C4::Catalogue; +use C4::Acquisition; use C4::Biblio; use C4::Output; use HTML::Template; diff --git a/acqui.simple/saveitem.pl b/acqui.simple/saveitem.pl index 4df94f3c14..dadf0f8c37 100755 --- a/acqui.simple/saveitem.pl +++ b/acqui.simple/saveitem.pl @@ -54,7 +54,7 @@ my $biblioitem = { volumeddesc => $input->param('volumeddesc')?$input->param('volumeddesc'):"", pages => $input->param('pages')?$input->param('pages'):"", size => $input->param('size')?$input->param('size'):"", - notes => $input->param('notes')?$input->param('notes'):"" + notes => $input->param('itemnotes')?$input->param('itemnotes'):"" }; # my biblioitem my $newgroup = 0; my $website = 0; diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl index 6397ac3be2..acb96904f7 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl @@ -1,60 +1,36 @@ - + -Adding a new Biblio
- - - - - -
Section One: Copyright Information
- - -

 

-
-Please Specify a Title -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Title: *
Subtitle:
Author:
Additional Authors:
One Author per line
Series Title:
-(if applicable)
Subject Headings:
One Subject per line
Copyright Date:
Abstract:
Notes:
-
-* Required +
+

Adding a new Biblio

+ +
+

Section One: Copyright Information

+ + +

Please Specify a Title

+ + +
+

+

+

+

Additional Authors: One Author per line

+

+ +

+

+

Series Title: (if applicable)

+

+

Subject Headings: One Subject per line

+

+ +

+

+

+

+

+
+ * Required +
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl index fe99fbffa4..7bced4d620 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl @@ -1,201 +1,102 @@ - - -

- -You must give the item a barcode -

- - -You must create a new group for your item to be -added to -

- - -Sorry, that barcode is already in use -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BIBLIO RECORD
Author:
-Copyright:
-Series Title:
-Notes:
GROUP - - -
URL:
-Date:
-Notes:
- -GROUP -
ISBN:
-Dewey:
-Publisher:
-Place:
-Date:
Item:
-Home Branch:
-Notes:
- - -

- -
-"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ADD NEW -ITEM:
-For a website add the group only
Item Barcode:
Branch:
Replacement Price:
Notes:
Add to existing group:
Group:
OR Add to a new -Group:
Format:
ISBN:
Publisher:
Publication Year:
Place of Publication:
Illustrator:
Website URL:
Dewey:
Dewey Subclass:
ISSN:
LCCN:
Volume:
Number:
Volume Description:
Pages:
Size:
Notes:
- -
-
+ +
+

+
+

+ +

You must give the item a barcode

+ + +

You must create a new group for your item to be added to

+ + +

Sorry, that barcode is already in use

+ +

BIBLIO RECORD

+

+

+

+

+ + +

GROUP -

+

+

+

+ +

GROUP -

+

+

+

+

+

+ +

+

+

+ + + +
+
+
+ "> +

ADD NEW ITEM:

+

For a website add the group only

+

+

+ + +

+

+

+
+
+

Add to existing group:

+

+ +

+

+
+
+

OR Add to a new Group:

+

+ + +

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+ +
+
diff --git a/loadmodules.pl b/loadmodules.pl index d87da097f0..006b494190 100755 --- a/loadmodules.pl +++ b/loadmodules.pl @@ -68,19 +68,19 @@ sub catalogue_search { my $keyword=$input->param('keyword'); my $query = new CGI; my $type = $query->param('type'); - if ($keyword) { - if ($marc_p) { +# if ($keyword) { +# if ($marc_p) { +# print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type"); +# } else { +# print $input ->redirect("/cgi-bin/koha/search.pl?keyword=$keyword"); +# } +# } else { +# if ($marc_p) { print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type"); - } else { - print $input ->redirect("/cgi-bin/koha/search.pl?keyword=$keyword"); - } - } else { - if ($marc_p) { - print $input->redirect("/cgi-bin/koha/search.marc/search.pl?type=$type"); - } else { - print $input ->redirect("/cgi-bin/koha/catalogue-home.pl"); - } - } +# } else { +# print $input ->redirect("/cgi-bin/koha/catalogue-home.pl"); +# } +# } } sub somethingelse { diff --git a/search.marc/search.pl b/search.marc/search.pl index 60d819b6e0..762b86afd3 100755 --- a/search.marc/search.pl +++ b/search.marc/search.pl @@ -194,6 +194,7 @@ if ($op eq "do_search") { from=>$from, to=>$to, numbers=>\@numbers, + MARC_ON => C4::Context->preferences("MARC"), ); } elsif ($op eq "AddStatement") { -- 2.39.2