diff --git a/MARCdetail.pl b/MARCdetail.pl index a6ed965df9..80745c9164 100755 --- a/MARCdetail.pl +++ b/MARCdetail.pl @@ -166,6 +166,7 @@ foreach my $subfield_code (keys(%witness)) { $template->param(item_loop => \@item_value_loop, item_header_loop => \@header_value_loop, biblionumber => $biblionumber, - bibid => $bibid); + bibid => $bibid, + biblionumber => $biblionumber); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/detail.pl b/detail.pl index 0e00051acd..35138420c6 100755 --- a/detail.pl +++ b/detail.pl @@ -84,18 +84,20 @@ my $count=1; # now to get the items into a hash we can use and whack that thru -$template->param(startfrom => $startfrom+1); -$template->param(endat => $startfrom+20); -$template->param(numrecords => $count); my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20); my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0); -$template->param(nextstartfrom => $nextstartfrom); -$template->param(prevstartfrom => $prevstartfrom); -$template->param(BIBLIO_RESULTS => $resultsarray); -$template->param(ITEM_RESULTS => $itemsarray); -$template->param(WEB_RESULTS => $webarray); -$template->param(SITE_RESULTS => $sitearray); -$template->param(loggedinuser => $loggedinuser); +$template->param(startfrom => $startfrom+1, + endat => $startfrom+20, + numrecords => $count, + nextstartfrom => $nextstartfrom, + prevstartfrom => $prevstartfrom, + BIBLIO_RESULTS => $resultsarray, + ITEM_RESULTS => $itemsarray, + WEB_RESULTS => $webarray, + SITE_RESULTS => $sitearray, + loggedinuser => $loggedinuser, + biblionumber => $biblionumber); + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/jmemberentry.pl b/jmemberentry.pl index a16f73faef..c557b2fd53 100755 --- a/jmemberentry.pl +++ b/jmemberentry.pl @@ -27,6 +27,7 @@ use C4::Output; use CGI; use C4::Search; use HTML::Template; +use C4::Interface::CGI::Output; my $input = new CGI; diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl index a755142620..3d83785556 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl @@ -56,7 +56,7 @@
- + /images/background-mem.gif"> diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl index c9272b3e30..9451897c25 100644 --- a/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl @@ -14,82 +14,104 @@ Catalogue Search -
- - -
 
- - - - - - - - - - + + + + + + + + + + +
Barcode     OR
 
HELP
-Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

-Catalogue -Maintenance: To add a new biblio or item go to -acquisitions.

-To request, modify or delete a biblio or item first search for it here. -

Barcode     OR
 
+ HELP
+ Searching:Using more fields for your search (eg Keyword + author + class) will slow it down.

+ Catalogue + Maintenance: To add a new biblio or item go to + acquisitions.

+ To request, modify or delete a biblio or item first search for it here. +

- - - - - - - - - +
Keywords
Title NormalExact
Author
Illustrator
+ + + + + + + + + + + + + + + + + + + + - - + + + + + - - - - - - - - - - - - - -
Keywords
Title + Normal
+ Exact +
Author
Illustrator
Dewey
Dewey
Class + +
Class - -
OR
Subject
- - - -
- -

-Virtual Bookshelves - + + + OR + + + Subject + + + + + + + + + + +
+ + //images/2rightarrow.png" BORDER=0 > + + + + Virtual Bookshelves +
+ + + + +

+ diff --git a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl index 13cdb80513..20f2732689 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl @@ -13,114 +13,97 @@ Add New Junior Member

- - - - - - - - - - - - - - "> + + + + + + + + + + + + + + "> - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/images/background-mem.gif"> + PARENT OR GUARDIAN +
+ +
TitleGiven Names*Surname*Membership No.
/images/background-mem.gif"> + CHILD +
+ Member# , Card Number* + + size=20 value="">
+ value=""> +
size=20 value=""> size=20 value=""> size=10 value=""> + F + M* + size=20 value="">
Given Names*Surname*Date of Birth
(dd/mm/yy)*		 School
Notes
+ //images/2rightarrow.png" ALT="Add New Member" border=0> +
- PARENT OR GUARDIAN
- -
TitleGiven Names*Surname*Membership No.
 
- CHILD -
- Member# , Card Number* - - size=20 value="">
- value=""> -
size=20 value=""> size=20 value=""> size=10 value=""> - F - M* - size=20 value="">
Given Names*Surname*Date of Birth
(dd/mm/yy)*		 School
Notes
 
- -
+
- + diff --git a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl index 506144e860..791a1cdd7f 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl @@ -12,14 +12,14 @@ You Searched for

- - - - - - - - + + + + + + + + @@ -41,12 +41,8 @@ You Searched for

CardSurnameFirstnameCategoryAddressOD/IssuesChargesNotes/images/background-mem.gif">Card/images/background-mem.gif">Surname/images/background-mem.gif">Firstname/images/background-mem.gif">Category/images/background-mem.gif">Address/images/background-mem.gif">OD/Issues/images/background-mem.gif">Charges/images/background-mem.gif">Notes

-
+//images/filenew.png" ALT="Add New Member" BORDER=0 > Adult Organisation - - - - diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl index 498e420535..3e1b5fc5f1 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl @@ -10,7 +10,7 @@ - + @@ -19,8 +19,8 @@ - - + - - - + @@ -79,10 +77,8 @@ - - - + @@ -96,15 +92,13 @@ - + - - @@ -115,19 +109,17 @@ - - - + - + - + @@ -135,12 +127,10 @@ - - - + - + @@ -152,33 +142,29 @@ - + - - - + - + - + - + - + - - @@ -192,11 +178,8 @@ - - - - - + +
MEMBER PERSONAL DETAILS* + /images/background-mem.gif">MEMBER PERSONAL DETAILS/images/background-mem.gif">* checked>F checked> M     Date of Birth (dd/mm/yy) @@ -50,8 +50,6 @@ Surname* Prefered Name
 
@@ -67,7 +65,7 @@  
Membership Category*
 
MEMBER ADDRESS/images/background-mem.gif">MEMBER ADDRESS
Postal Address* Town* Area
 
Town
 
MEMBER CONTACT DETAILS/images/background-mem.gif">MEMBER CONTACT DETAILS
Phone (Home) Phone (day)Email
 
ALTERNATE CONTACT DETAILS/images/background-mem.gif">ALTERNATE CONTACT DETAILS
Name* Phone Relationship*
 
Notes
 
LIBRARY USE/images/background-mem.gif">LIBRARY USE
Notes
 
FLAGS
//images/2rightarrow.png" ALT="Add New Member" border=0 >
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl index 5442965b61..1b46256f67 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/members-home.tmpl @@ -9,12 +9,12 @@ Members

-1/images/numbers-mem-1.gif" WIDTH=45 HEIGHT=44 ALT="1" hspace=5 align=left BORDER=0> - + + + +
+
/images/background-mem.gif"> Member Search @@ -27,13 +27,13 @@ enter key to activate search

-2/images/numbers-mem-2.gif" WIDTH=45 HEIGHT=44 ALT="2" hspace=5 align=left BORDER=0> - diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl index 092d28343a..0db9b03eff 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl @@ -7,199 +7,208 @@

+/images/background-mem.gif"> Browse Members
- - - + + + - - - + + +
MEMBERSHIP RECORD
/images/background-mem.gif">MEMBERSHIP RECORD
-

-

- - - -
-


- (, )

- Card Number:
- Postal Address: ,
- Home Address: ,
- Phone (Home):
- Phone (Daytime):
- Fax:
- E-mail: ">
- Textmessaging:

- Membership Number:
- Membership:
- Area:
- Fee:$30/year, Paid
- Joined: , Expires:
- Joining Branch:

- - Ethnicity: ,
- - DoB:
- Sex:

- Alternative Contact:
- Phone:
- Relationship:
- Notes:

- - Guarantees:">
 - - Guarantor: - ">
- - no guarantor
- - -

- General Notes: - -

-

- "> - - - -

- ">Password -

- ">Privileges -
-
+

+

+ /images/add-child.gif"> + + +
+


+ (, )

+ Card Number:
+ Postal Address: ,
+ Home Address: ,
+ Phone (Home):
+ Phone (Daytime):
+ Fax:
+ E-mail: ">
+ Textmessaging:

+ Membership Number:
+ Membership:
+ Area:
+ Fee:$30/year, Paid
+ Joined: , Expires:
+ Joining Branch:

+ + Ethnicity: ,
+ + DoB:
+ Sex:

+ Alternative Contact:
+ Phone:
+ Relationship:
+ Notes:

+ + Guarantees:">
 + + Guarantor: + + ">
+ + no guarantor
+ + +

+ General Notes: + +

+

+ "> + /images/modify-mem.gif"> + /images/delete-mem.gif"> +

+ ">Password +

+ ">Privileges +
+
- +/images/holder.gif" width=16 height=800 align=left> - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + +
FINES & CHARGES
/images/background-mem.gif" colspan=4>FINES & CHARGES
- - &bib=&bi="> - -   - -
- - > - > - -
+ + &bib=&bi="> + +   + +
+ + >/images/view-account.gif"> + >/images/pay-fines.gif"> + +

- "> - + "> +
- - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + -
ITEMS CURRENTLY ON ISSUE
/images/background-mem.gif" colspan=6>ITEMS CURRENTLY ON ISSUE
TitleDueItemtypeChargeRenew
/images/background-mem.gif">Title/images/background-mem.gif">Due/images/background-mem.gif">Itemtype/images/background-mem.gif">Charge/images/background-mem.gif">Renew
- - &bib=&bi="> - - - - - ">On Request - no renewals - - " value=y>Y - " value=n>N - - -
- -
+ + &bib=&bi="> + + + + + ">On Request - no renewals + + " value=y>Y + " value=n>N + + +
+
+ /images/update-renewals.gif"> +

+ + + - - - + + + + + - - - - - + + - - + + + + + + "> + "> + + - - - - - - "> - "> - - - - - - - + + + + +
/images/background-mem.gif" colspan=5>ITEMS REQUESTED
ITEMS REQUESTED
/images/background-mem.gif">Title/images/background-mem.gif">Requested/images/background-mem.gif">Remove
TitleRequestedRemove
+ "> + + + + + + +
"> - - - -
- -
+ /images/cancel-requests.gif"> +
+
+
+ + + +
+

+ ">/images/reading-record.gif"> +

+
-

- "> -

- diff --git a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl index 90a6058226..36cf20c2e0 100644 --- a/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/members/readingrec.tmpl @@ -1,38 +1,35 @@ +&limit=full">Full output +

- - - - - - -
- &limit=full">Full output -
+ /images/background-mem.gif"> &order=title&limit=">TITLE + /images/background-mem.gif"> &order=author&limit=">AUTHOR + /images/background-mem.gif"> &limit=">DATE + /images/background-mem.gif"> Volume
- +   - +   - +   - +  
diff --git a/loadmodules.pl b/loadmodules.pl index 58bce25c9a..717f49193b 100755 --- a/loadmodules.pl +++ b/loadmodules.pl @@ -31,24 +31,12 @@ my $module=$input->param('module'); SWITCH: { if ($module eq 'acquisitions') { acquisitions(); last SWITCH; } if ($module eq 'search') { catalogue_search(); last SWITCH; } - if ($module eq 'cataloguing') {cataloguing(); last SWITCH; } + if ($module eq 'MARC') {marc(); last SWITCH; } if ($module eq 'somethingelse') { somethingelse(); last SWITCH; } } sub acquisitions { - my $aq_type = C4::Context->preference("acquisitions") || "normal"; - # Get the acquisition preference. This should be: - # "simple" - minimal information required - # "normal" - full information required - # other - Same as "normal" - - if ($aq_type eq 'simple') { - print $input->redirect("/cgi-bin/koha/acqui.simple/addbooks.pl"); - } elsif ($aq_type eq 'normal') { print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); - } else { - print $input ->redirect("/cgi-bin/koha/acqui/acqui-home.pl"); - } } sub catalogue_search { @@ -72,16 +60,16 @@ sub catalogue_search { } } -sub cataloguing { - my $marc_p = C4::Context->boolean_preference("marc"); - $marc_p = 1 unless defined $marc_p; - my $query = new CGI; - my $type = $query->param('type'); - if ($marc_p) { - print $input->redirect("/cgi-bin/koha/cataloguing.marc/cataloguing-home.pl"); - } else { - print $input ->redirect("/cgi-bin/koha/catalogue-home.pl"); - } +sub marc { +# my $marc_p = C4::Context->boolean_preference("marc"); +# $marc_p = 1 unless defined $marc_p; +# my $query = new CGI; +# my $type = $query->param('type'); +# if ($marc_p) { +# print $input->redirect("/cgi-bin/koha/cataloguing.marc/cataloguing-home.pl"); +# } else { + print $input ->redirect("/cgi-bin/koha/acqui.simple/isbnsearch.pl"); +# } } sub somethingelse { diff --git a/modbib.pl b/modbib.pl index 4a7af07e2b..06212e9455 100755 --- a/modbib.pl +++ b/modbib.pl @@ -31,14 +31,17 @@ use C4::Search; use CGI; use C4::Output; use HTML::Template; +use C4::Auth; +use C4::Context; +use C4::Interface::CGI::Output; my $input = new CGI; my $bibnum=$input->param('bibnum'); my $data=&bibdata($bibnum); -my ($subjectcount, $subject) = &subject($data->{'biblionumber'}); -my ($subtitlecount, $subtitle) = &subtitle($data->{'biblionumber'}); -my ($addauthorcount, $addauthor) = &addauthor($data->{'biblionumber'}); +my ($subjectcount, $subject) = &subject($bibnum); +my ($subtitlecount, $subtitle) = &subtitle($bibnum); +my ($addauthorcount, $addauthor) = &addauthor($bibnum); my $sub = $subject->[0]->{'subject'}; my $additional = $addauthor->[0]->{'author'}; my $dewey; @@ -47,12 +50,14 @@ if ($submit eq '') { print $input->redirect("/cgi-bin/koha/delbiblio.pl?biblio=$bibnum"); } # if -#print $input->header; -# my ($analytictitle) = &analytic($biblionumber,'t'); -# my ($analyticauthor) = &analytic($biblionumber,'a'); -#print startpage(); -#print startmenu('catalogue'); -my $template = gettemplate("modbib.tmpl"); +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "modbib.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {acquisition => 1}, + debug => 1, + }); # have to get all subtitles, subjects and additional authors $sub = join("|", map { $_->{'subject'} } @{$subject}); @@ -77,21 +82,21 @@ $dewey = ~ s/\.$//; $data->{'title'} = &tidyhtml($data->{'title'}); -$template->param ( biblionumber => $data->{'biblionumber'}); -$template->param ( biblioitemnumber => $data->{'biblioitemnumber'}); -$template->param ( author => $data->{'author'}); -$template->param ( title => $data->{'title'}); -$template->param ( abstract => $data->{'abstract'}); -$template->param ( subject => $sub); -$template->param ( copyrightdate => $data->{'copyrightdate'}); -$template->param ( seriestitle => $data->{'seriestitle'}); -$template->param ( additionalauthor => $additional); -$template->param ( subtitle => $data->{'subtitle'}); -$template->param ( untitle => $data->{'untitle'}); -$template->param ( notes => $data->{'notes'}); -$template->param ( serial => $data->{'serial'}); +$template->param ( biblionumber => $bibnum, + biblioitemnumber => $data->{'biblioitemnumber'}, + author => $data->{'author'}, + title => $data->{'title'}, + abstract => $data->{'abstract'}, + subject => $sub, + copyrightdate => $data->{'copyrightdate'}, + seriestitle => $data->{'seriestitle'}, + additionalauthor => $additional, + subtitle => $data->{'subtitle'}, + untitle => $data->{'untitle'}, + notes => $data->{'notes'}, + serial => $data->{'serial'}); -print "Content-Type: text/html\n\n", $template->output; +output_html_with_http_headers $input, $cookie, $template->output; sub tidyhtml { my ($inp)=@_; diff --git a/request.pl b/request.pl index 379418a7ff..3653efe891 100755 --- a/request.pl +++ b/request.pl @@ -24,7 +24,6 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; -#use DBI; use C4::Search; use C4::Output; use C4::Auth; @@ -33,7 +32,7 @@ use C4::Biblio; use C4::Koha; use C4::Circulation::Circ2; use HTML::Template; - +use C4::Catalogue; use CGI; my $input = new CGI; @@ -172,13 +171,23 @@ foreach my $res (sort {$a->{'found'} cmp $b->{'found'}} @$reserves){ push(@reserveloop,\%reserve); } +my @branches; +my @select_branch; +my %select_branches; +my ($count2,@branches)=branches(); +for (my $i=0;$i<$count2;$i++){ + push @select_branch, $branches[$i]->{'branchcode'};# + $select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'}; +} +my $CGIbranch=CGI::scrolling_list( -name => 'pickup', + -values => \@select_branch, + -labels => \%select_branches, + -size => 1, + -multiple => 0 ); + #get the time for the form name... my $time = time(); - - - - #setup colours my ($template, $borrowernumber, $cookie) = get_template_and_user({template_name => "request.tmpl", @@ -188,10 +197,12 @@ my ($template, $borrowernumber, $cookie) flagsrequired => {parameters => 1}, }); $template->param( optionloop =>\@optionloop, - branchloop => \@branchloop, + CGIbranch => $CGIbranch, reserveloop => \@reserveloop, 'time' => $time, bibitemloop => \@bibitemloop, - date => $date); + date => $date, + bib => $bib, + title =>$dat->{title}); # printout the page print $input->header(-expires=>'now'), $template->output; diff --git a/updatebiblio.pl b/updatebiblio.pl index b581de65f4..ed4a2c57f7 100755 --- a/updatebiblio.pl +++ b/updatebiblio.pl @@ -19,27 +19,29 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; +require Exporter; +use C4::Context; +use C4::Output; # contains gettemplate +use C4::Search; +use C4::Auth; +use C4::Interface::CGI::Output; use CGI; -use C4::Acquisitions; +use C4::Biblio; use C4::Output; use HTML::Template; -# FIXME - This script uses a bunch of functions that appear in both -# C4::Acquisitions and C4::Biblio. But I gather that the latter are -# preferred. So should this script "use C4::Biblio;" ? - my $input = new CGI; my $bibnum = checkinp($input->param('biblionumber')); my $biblio = { - biblionumber => $bibnum, - title => $input->param('title')?$input->param('title'):"", - author => $input->param('author')?$input->param('author'):"", - abstract => $input->param('abstract')?$input->param('abstract'):"", - copyright => $input->param('copyrightdate')?$input->param('copyrightdate'):"", - seriestitle => $input->param('seriestitle')?$input->param('seriestitle'):"", - serial => $input->param('serial')?$input->param('serial'):"", - unititle => $input->param('unititle')?$input->param('unititle'):"", - notes => $input->param('notes')?$input->param('notes'):"", + biblionumber => $bibnum, + title => $input->param('title')?$input->param('title'):"", + author => $input->param('author')?$input->param('author'):"", + abstract => $input->param('abstract')?$input->param('abstract'):"", + copyrightdate => $input->param('copyrightdate')?$input->param('copyrightdate'):"", + seriestitle => $input->param('seriestitle')?$input->param('seriestitle'):"", + serial => $input->param('serial')?$input->param('serial'):"", + unititle => $input->param('unititle')?$input->param('unititle'):"", + notes => $input->param('notes')?$input->param('notes'):"", }; # my $biblio my $subtitle = checkinp($input->param('subtitle')); my $subject = checkinp($input->param('subject')); @@ -61,32 +63,38 @@ $subject = uc($subject); $count = @sub; for (my $i = 0; $i < $count; $i++) { - $sub[$i] =~ s/ +$//; + $sub[$i] =~ s/ +$//; } # for $error = &modsubject($bibnum,$force,@sub); if ($error ne ''){ - my $template = gettemplate("updatebiblio.tmpl"); + my ($template, $loggedinuser, $cookie) = get_template_and_user({ + template_name => "updatebiblio.tmpl", + query => $input, + type => "intranet", + flagsrequired => {catalogue => 1}, + }); - my @subs=split('\n',$error); - my @names=$input->param; - my $count=@names; - my @dataloop; - for (my $i=0;$i<$count;$i++) { - if ($names[$i] ne 'Force') { - my %line; - $line{'value'}=$input->param("$names[$i]"); - $line{'name'}=$names[$i]; - push(@dataloop, \%line); - } # if - } # for - template->param(substring =>$subs[0]); - template->param(error =>$error); - template->param(dataloop => \@dataloop); - print "Content-Type: text/html\n\n", $template->output; + + my @subs=split('\n',$error); + my @names=$input->param; + my $count=@names; + my @dataloop; + for (my $i=0;$i<$count;$i++) { + if ($names[$i] ne 'Force') { + my %line; + $line{'value'}=$input->param("$names[$i]"); + $line{'name'}=$names[$i]; + push(@dataloop, \%line); + } # if + } # for + $template->param(substring =>$subs[0], + error =>$error, + dataloop => \@dataloop); + print "Content-Type: text/html\n\n", $template->output; } else { - print $input->redirect("detail.pl?type=intra&bib=$bibnum"); + print $input->redirect("detail.pl?type=intra&bib=$bibnum"); } # else sub checkinp{