I've fixed the problem -- I'll send a replacement patch. Thanks. Jane Wagner Library Systems Analyst PTFS Inc. Content Management and Library Solutions 6400 Goldsboro Road, Suite 200 Bethesda, MD 20817 (301) 654-8088 x 151 [email protected]
-----Original Message----- From: Galen Charlton [mailto:[email protected]] Sent: Wednesday, April 29, 2009 8:44 AM To: Wagner, Jane Cc: [email protected] Subject: Re: [Koha-patches] [PATCH] Enhancements/fixes for OPAC advanced search screen Hi, When I tested this, I found a problem with the display of the expanded options. Specifically, they are now always displayed, and clicking on more/fewer options link has no effect. Instead, when I try that, I'm observing the following error in the Apache log: [Wed Apr 29 07:39:10 2009] [error] [client 98.70.132.238] stack underflow:tags stack is empty, referer: http://gmc.dev.kohalibrary.com/cgi-bin/koha/opac-search.pl?expanded_options=0 [Wed Apr 29 07:39:16 2009] [error] [client 98.70.132.238] stack underflow:tags stack is empty, referer: http://gmc.dev.kohalibrary.com/cgi-bin/koha/opac-search.pl?expanded_options=1 This error is coming from HTML::Template::Pro, and likely means that the starting and closing TMPL_IFs are not balanced. Please fix and resubmit. Regards, Galen On Tue, Apr 28, 2009 at 12:35 PM, Jane Wagner <[email protected]> wrote: > Fixed opac-search.pl for correct test of expanded options. > > Added Publication Date Range search to advanced search screen > > Removed obsolete item type code section from advanced search screen > (wasn't displaying anyway because expanded options wasn't working, > superceded by site-specific item type searches). > > Changed wording on Additional Content Types pulldown to make clear > it's limited to Books/Printed Materials -- this is basing off the > 008 positions 24-27, but the options (and those positions) are only > valid for Book material types. Other material types have different > 008 settings in those positions. > --- > .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 37 ++++++------------- > opac/opac-search.pl | 2 +- > 2 files changed, 13 insertions(+), 26 deletions(-) > > diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl > b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl > index a17434c..266e333 100644 > --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl > +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl > @@ -206,6 +206,17 @@ > > </fieldset></div> > </div> > + > +<div id="pubrange" class="container"> > +<fieldset> > +<!-- PUB RANGE OPTION --> > +<legend>Publication Date Range:</legend> > +<option value="limit-yr">For example: 1999-2001. You could also use > "-1987" for everything published before 1987 or "2008-" for everything > published after 2008.</option> > +<input type="text" size="30" name="limit-yr" title="Enter search terms" > value="" /> > +</fieldset> > +<!-- /PUB RANGE OPTION --> > +</div> > + > <div class="yui-g"> > <!-- /BOOLEAN SEARCH OPTIONS --> > <div id="advsearch-itemtype" class="container"> > @@ -223,30 +234,6 @@ > </fieldset> > </div> > <!-- TMPL_IF NAME="expanded_options" --> > - <!-- BASIC LIMITS --> > - <!--TMPL_IF Name="usmarc"--> > - <fieldset> > - <legend>Limit type to: match any of the following</legend> > - <table class="itemtypes"> > - <tr> > - <td><input type="checkbox" id="mc-bks" name="limit" > value="mc:t" /><label for="mc-bks" title="Books, Pamphlets, Technical > reports, Manuscripts, Legal papers, Theses and dissertations"><img border="0" > src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books" />Books</label></td> > - <td><input type="checkbox" id="mc-vis" name="limit" > value="mc:v" /><label for="mc-vis" title="Motion pictures, Videorecordings, > Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><img > border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Visual > Materials" />Visual Materials</label></td> > - <td><input type="checkbox" id="mc-sr" name="limit" > value="mc-rtype:i" /><label for="mc-sr" title="Spoken, Books on CD and > Cassette"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" > alt="Books on Tape" />Books on Tape</label></td> > - </tr> > - <tr> > - <td><input type="checkbox" id="mc-cf" name="limit" > value="mc:c" /><label for="mc-cf" title="Computer files, Data, Software"><img > border="0" src="/intranet-tmpl/prog/en/images/CD-ROM software.gif" > alt="Computer Files" />Computer Files</label></td> > - <td><input type="checkbox" id="mc-lh" name="limit" > value="mc-collection:LH" /><label for="mc-lh" title="Local History > Materials"><img border="0" src="/intranet-tmpl/prog/en/images/Local > history.gif" alt="Local History Materials" />Local History > Materials</label></td> > - <td><input type="checkbox" id="mc-map" name="limit" > value="mc:a" /><label for="mc-map" title="Maps, Globes"><img border="0" > src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps" />Maps</label></td> > - </tr> > - <tr> > - <td><input type="checkbox" id="mc-mus" name="limit" > value="mc-rtype:j" /><label for="mc-mus" title="Music"><img border="0" > src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music" />Music</label></td> > - <td><input type="checkbox" id="mc-kit" name="limit" > value="mc-rtype:o" /><label for="mc-kit" title="Kits"><img border="0" > src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits" />Kits</label></td> > - <td><input type="checkbox" id="mc-ref" name="limit" > value="mc-collection:REF" /><label for="mc-ref" title="Reference"><img > border="0" src="/intranet-tmpl/prog/en/images/REF.gif" alt="Reference" > />Reference</label></td></tr> > - > - </table> > - </fieldset> > - <!-- /BASIC LIMITS --> > - > <!-- SUBTYPE LIMITS --> > <div id="subtypes" class="container"><fieldset> > <legend>Subtype limits</legend><select name="limit" > class="subtype"> > @@ -282,7 +269,7 @@ > </select> > > <select name="limit" class="subtype"> > - <option value="">Additional Content Types</option> > + <option value="">Additional Content Types for Books/Printed > Materials</option> > <option value="ctype:a">Abstracts/summaries</option> > <option value="ctype:b">Bibliographies</option> > <option value="ctype:c">Catalogs</option> > diff --git a/opac/opac-search.pl b/opac/opac-search.pl > index f32ffc3..7a63d31 100755 > --- a/opac/opac-search.pl > +++ b/opac/opac-search.pl > @@ -221,7 +221,7 @@ if ( $template_type eq 'advsearch' ) { > search_boxes_loop => \...@search_boxes_array); > > # use the global setting by default > - if ( C4::Context->preference("expandedSearchOption") == 1) { > + if ( C4::Context->preference("expandedSearchOption") ) { > $template->param( expanded_options => > C4::Context->preference("expandedSearchOption") ); > } > # but let the user override it > -- > 1.5.6.5 > > _______________________________________________ > Koha-patches mailing list > [email protected] > http://lists.koha.org/mailman/listinfo/koha-patches > -- Galen Charlton VP, Research & Development, LibLime [email protected] p: 1-888-564-2457 x709 skype: gmcharlt _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
