From 36595bbf16504e2d65fad4d588b13554391493af Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Mon, 29 Oct 2007 17:42:30 -0500 Subject: [PATCH] moving unimarc subtypes to an include, adding UNIMARC flag Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- catalogue/search.pl | 9 +- .../prog/en/includes/subtypes_unimarc.inc | 206 +++++++ .../prog/en/modules/catalogue/advsearch.tmpl | 4 + .../modules/catalogue/advsearch_unimarc.tmpl | 571 ------------------ 4 files changed, 213 insertions(+), 577 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch_unimarc.tmpl diff --git a/catalogue/search.pl b/catalogue/search.pl index 0879c02072..049d03dd88 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -183,15 +183,12 @@ if ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ( $template_name = 'catalogue/results.tmpl'; } else { - # use a UNIMARC-specific template if UNIMARC - if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { - $template_name = 'catalogue/advsearch_unimarc.tmpl'; - } - else { $template_name = 'catalogue/advsearch.tmpl'; - } $template_type = 'advsearch'; } +if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { + $template->param('UNIMARC' => 1); +} # load the template ($template, $borrowernumber, $cookie) = get_template_and_user({ template_name => $template_name, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc new file mode 100644 index 0000000000..afc4208c6b --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc @@ -0,0 +1,206 @@ + + + + + - - -- 2.39.5