Merge git://git.koha.org/pub/scm/koha
authorGalen Charlton <galen.charlton@liblime.com>
Tue, 18 Dec 2007 23:46:54 +0000 (17:46 -0600)
committerGalen Charlton <galen.charlton@liblime.com>
Tue, 18 Dec 2007 23:46:54 +0000 (17:46 -0600)
44 files changed:
C4/Branch.pm
C4/Circulation.pm
C4/Search.pm
admin/koha2marclinks.pl
catalogue/search.pl
circ/circulation.pl
etc/zebradb/biblios/etc/bib1.att
etc/zebradb/ccl.properties
etc/zebradb/marc_defs/marc21/biblios/record.abs
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
koha-tmpl/intranet-tmpl/prog/en/js/members.js
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
koha-tmpl/intranet-tmpl/prog/img/item-bullet.gif [new file with mode: 0644]
koha-tmpl/opac-tmpl/prog/en/css/hierarchy.css
koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
members/memberentry.pl
members/moremember.pl
members/setstatus.pl
misc/cronjobs/result.txt [deleted file]
opac/opac-search.pl

index a13af59..833c772 100644 (file)
@@ -111,7 +111,7 @@ sub GetBranches {
     while ( my $branch = $sth->fetchrow_hashref ) {
         my $nsth =
           $dbh->prepare(
-            "SELECT category_id FROM branchrelations WHERE branchcode = ?");
+            "SELECT categorycode FROM branchrelations WHERE branchcode = ?");
         $nsth->execute( $branch->{'branchcode'} );
         while ( my ($cat) = $nsth->fetchrow_array ) {
 
index 77708d5..8263c67 100644 (file)
@@ -1612,12 +1612,13 @@ sub AddRenewal {
 
     my ( $borrowernumber, $itemnumber, $branch ,$datedue ) = @_;
     my $dbh = C4::Context->dbh;
-
+       
+       my $biblio = GetBiblioFromItemNumber($itemnumber);
     # If the due date wasn't specified, calculate it by adding the
     # book's loan length to today's date.
     unless ( $datedue ) {
 
-        my $biblio = GetBiblioFromItemNumber($itemnumber);
+
         my $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 );
         my $loanlength = GetLoanLength(
             $borrower->{'categorycode'},
@@ -1656,8 +1657,15 @@ sub AddRenewal {
     );
     $sth->execute( $datedue->output('iso'), $renews, $borrowernumber, $itemnumber );
     $sth->finish;
-    
-    # Log the renewal
+
+    # Update the renewal count on the item, and tell zebra to reindex
+    $renews = $biblio->{'renewals'} + 1;
+    $sth = $dbh->prepare("UPDATE items SET renewals = ? WHERE itemnumber = ?");
+    $sth->execute($renews,$itemnumber);
+    $sth->finish();
+    my $record = GetMarcItem( $biblio->{'biblionumber'}, $itemnumber );
+    my $frameworkcode = GetFrameworkCode( $biblio->{'biblionumber'} );
+    ModItemInMarc( $record, $biblio->{'biblionumber'}, $itemnumber, $frameworkcode );
 
     # Charge a new rental fee, if applicable?
     my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber );
@@ -1676,6 +1684,7 @@ sub AddRenewal {
             'Rent', $charge, $itemnumber );
         $sth->finish;
     }
+    # Log the renewal
     UpdateStats( $branch, 'renew', $charge, '', $itemnumber );
 }
 
index 3b52cae..ab6edc3 100644 (file)
@@ -429,8 +429,8 @@ sub getRecords {
                         my $tmprecord = MARC::Record->new();
                         $tmprecord->encoding('UTF-8');
                         my $tmptitle;
-
-                       # srote the minimal record in author/title (depending on MARC flavour)
+                                               my $tmpauthor;
+                       # the minimal record in author/title (depending on MARC flavour)
                         if ( C4::Context->preference("marcflavour") eq
                             "UNIMARC" )
                         {
@@ -441,15 +441,12 @@ sub getRecords {
                             );
                         }
                         else {
-                            $tmptitle = MARC::Field->new(
-                                '245', ' ', ' ',
-                                a => $term,
-                                b => $occ
-                            );
+                            $tmptitle = MARC::Field->new('245', ' ', ' ',a => $term,);
+                                                       $tmpauthor = MARC::Field->new('100', ' ', ' ',a => $occ,);
                         }
                         $tmprecord->append_fields($tmptitle);
-                        $results_hash->{'RECORDS'}[$j] =
-                          $tmprecord->as_usmarc();
+                                               $tmprecord->append_fields($tmpauthor);
+                        $results_hash->{'RECORDS'}[$j] = $tmprecord->as_usmarc();
                     }
                     else {
                         $record = $results[ $i - 1 ]->record($j)->raw();
@@ -660,8 +657,10 @@ sub _build_weighted_query {
         $weighted_query .= " or ti,phr,r3=\"$operand\"";            # phrase title
        #$weighted_query .= " or any,ext,r4=$operand";               # exact any
        #$weighted_query .=" or kw,wrdl,r5=\"$operand\"";            # word list any
-        $weighted_query .= " or wrd,fuzzy,r8=\"$operand\"" if $fuzzy_enabled; # add fuzzy, word list
-        $weighted_query .= " or wrd,right-Truncation,r9=\"$stemmed_operand\"" if ($stemming and $stemmed_operand); # add stemming, right truncation
+        $weighted_query .= " or wrdl,fuzzy,r8=\"$operand\"" if $fuzzy_enabled; # add fuzzy, word list
+        $weighted_query .= " or wrdl,right-Truncation,r9=\"$stemmed_operand\"" if ($stemming and $stemmed_operand); # add stemming, right truncation
+               $weighted_query .= " or wrdl,r9=\"$operand\"";
+
        # embedded sorting: 0 a-z; 1 z-a
        # $weighted_query .= ") or (sort1,aut=1";
     }
@@ -678,7 +677,7 @@ sub _build_weighted_query {
        $weighted_query .= " $index,ext,r1=\"$operand\"";            # exact index
        #$weighted_query .= " or (title-sort-az=0 or $index,startswithnt,st-word,r3=$operand #)";
        $weighted_query .= " or $index,phr,r3=\"$operand\"";         # phrase index
-       $weighted_query .= " or $index,rt,wrd,r3=\"$operand\"";      # word list index
+       $weighted_query .= " or $index,rt,wrdl,r3=\"$operand\"";      # word list index
     }
     $weighted_query .= "))";    # close rank specification
     return $weighted_query;
@@ -751,7 +750,8 @@ sub buildQuery {
 
                                # a flag to determine whether or not to add the index to the query
                                my $indexes_set;
-                               # if the user is sophisticated enough to specify an index, turn off some defaults
+
+                               # if the user is sophisticated enough to specify an index, turn off field weighting, stemming, and stopword handling
                                if ($operands[$i] =~ /(:|=)/ || $scan) {
                                        $weight_fields = 0;
                                        $stemming = 0;
@@ -760,9 +760,29 @@ sub buildQuery {
                 my $operand = $operands[$i];
                 my $index   = $indexes[$i];
 
+                               # add some attributes for certain index types
+                               # Date of Publication
+                               if ($index eq 'yr') {
+                                       $index .=",st-numeric";
+                                       $indexes_set++;
+                                       ($stemming,$auto_truncation,$weight_fields, $fuzzy_enabled, $remove_stopwords) = (0,0,0,0,0);
+                               }
+                               # Date of Acquisition
+                               elsif ($index eq 'acqdate') {
+                                       $index.=",st-date-normalized";
+                                       $indexes_set++;
+                                       ($stemming,$auto_truncation,$weight_fields, $fuzzy_enabled, $remove_stopwords) = (0,0,0,0,0);
+
+                               }
+
+                               # set default structure attribute (word list)
+                               my $struct_attr;
+                               unless (!$index || $index =~ /(st-|phr|ext|wrdl)/) {
+                                       $struct_attr = ",wrdl";
+                               }
                                # some helpful index modifs
-                my $index_plus = "$index:" if $index;
-                my $index_plus_comma="$index," if $index;
+                my $index_plus = $index.$struct_attr.":" if $index;
+                my $index_plus_comma=$index.$struct_attr."," if $index;
 
                 # Remove Stopwords
                                if ($remove_stopwords) {
@@ -876,15 +896,14 @@ sub buildQuery {
                        $limit_desc .=" or " if $group_OR_limits;
                        $group_OR_limits .= "$this_limit";
                        $limit_cgi .="&limit=$this_limit";
-                       $limit_desc .= "$this_limit";
+                       $limit_desc .= " $this_limit";
         }
-
                # regular old limits
                else {
                        $limit .= " and " if $limit || $query;
                        $limit .= "$this_limit";
                        $limit_cgi .="&limit=$this_limit";
-                       $limit_desc .=" and $this_limit";
+                       $limit_desc .=" $this_limit";
                }
     }
        if ($group_OR_limits) {
@@ -1033,19 +1052,28 @@ sub searchResults {
         }
         # add spans to search term in results for search term highlighting
         # save a native author, for the <a href=search.lq=<!--tmpl_var name="author"-->> link
+               my $searchhighlightblob;
+               for my $highlight_field ($marcrecord->fields) {
+                       next if $highlight_field->tag() =~ /(^00)/; # skip fixed fields
+                       my $match;
+                       my $field = $highlight_field->as_string();
+                       for my $term ( keys %$span_terms_hashref ) {
+                               if (($field =~ /$term/i) && (length($term) > 3)) {
+                                       $field =~ s/$term/<span class=\"term\">$&<\/span>/gi;
+                                       $match++;
+                               }
+                       }
+                       $searchhighlightblob .= $field." ... " if $match;
+               }
+               $oldbiblio->{'searchhighlightblob'} = $searchhighlightblob;
+
         $oldbiblio->{'author_nospan'} = $oldbiblio->{'author'};
-        foreach my $term ( keys %$span_terms_hashref ) {
+        for my $term ( keys %$span_terms_hashref ) {
             my $old_term = $term;
             if ( length($term) > 3 ) {
-                $term =~ s/(.*=|\)|\(|\+|\.|\?|\[|\])//g;
-                $term =~ s/\\//g;
-                $term =~ s/\*//g;
-
-                #FIXME: is there a better way to do this?
+                $term =~ s/(.*=|\)|\(|\+|\.|\?|\[|\]|\\|\*)//g;
                 $oldbiblio->{'title'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
-                $oldbiblio->{'subtitle'} =~
-                  s/$term/<span class=\"term\">$&<\/span>/gi;
-
+                $oldbiblio->{'subtitle'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
                 $oldbiblio->{'author'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
                 $oldbiblio->{'publishercode'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
                 $oldbiblio->{'place'} =~ s/$term/<span class=\"term\">$&<\/span>/gi;
@@ -1323,7 +1351,7 @@ sub NZanalyse {
         $left='subject' if $left =~ '^su$';
         $left='koha-Auth-Number' if $left =~ '^an$';
         $left='keyword' if $left =~ '^kw$';
-        if ($operator) {
+        if ($operator && $left  ne 'keyword' ) {
             #do a specific search
             my $dbh = C4::Context->dbh;
             $operator='LIKE' if $operator eq '=' and $right=~ /%/;
@@ -1364,7 +1392,7 @@ sub NZanalyse {
                 }
             }
         } else {
-            #do a complete search (all indexes)
+            #do a complete search (all indexes), if index='kw' do complete search too.
             my $dbh = C4::Context->dbh;
             my $sth = $dbh->prepare("SELECT biblionumbers FROM nozebra WHERE server=? AND value LIKE ?");
             # split each word, query the DB and build the biblionumbers result
index 90da842..aa2e368 100755 (executable)
@@ -141,14 +141,14 @@ else {    # DEFAULT
     my $sth2 = $dbh->prepare("SHOW COLUMNS from $tablename");
     $sth2->execute;
 
-    my $toggle    = "white";
+    my $toggle    = 1;
     my @loop_data = ();
     while ( ( my $field ) = $sth2->fetchrow_array ) {
-        if ( $toggle eq 'white' ) {
-            $toggle = "#ffffcc";
+        if ( $toggle eq 1 ) {
+            $toggle = 0;
         }
         else {
-            $toggle = "white";
+            $toggle = 1;
         }
         my %row_data;    # get a fresh hash for the row data
         $row_data{tagfield} = $fields{ $tablename . "." . $field }->{tagfield};
@@ -159,7 +159,7 @@ else {    # DEFAULT
         $row_data{kohafield} = $field;
         $row_data{edit}      =
 "$script_name?op=add_form&amp;tablename=$tablename&amp;kohafield=$field";
-        $row_data{bgcolor} = $toggle;
+        $row_data{toggle} = $toggle;
         push( @loop_data, \%row_data );
     }
     $template->param(
index 40be2cd..46f7887 100755 (executable)
@@ -387,7 +387,21 @@ foreach my $limit(@limits) {
 $template->param(available => $available);
 
 # append year limits if they exist
-push @limits, map "yr:".$_, split("\0",$params->{'limit-yr'}) if $params->{'limit-yr'};
+my $limit_yr;
+my $limit_yr_value;
+if ($params->{'limit-yr'}) {
+       if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) {
+               my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'});
+               $limit_yr = "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2";
+               $limit_yr_value = "$yr1-$yr2";
+       }
+       elsif ($params->{'limit-yr'} =~ /\d{4}/) {
+               $limit_yr = "yr,st-numeric=$params->{'limit-yr'}";
+               $limit_yr_value = $params->{'limit-yr'};
+       }
+       push @limits,$limit_yr;
+       #FIXME: Should return a error to the user, incorect date format specified
+}
 
 # Params that can only have one value
 my $scan = $params->{'scan'};
@@ -423,6 +437,11 @@ $template->param ( QUERY_INPUTS => \@query_inputs );
 my @limit_inputs;
 for my $this_cgi ( split('&',$limit_cgi) ) {
        next unless $this_cgi;
+       # handle special case limit-yr
+       if ($this_cgi =~ /yr,st-numeric/) {
+               push @limit_inputs, { input_name => 'limit-yr', input_value => $limit_yr_value };       
+               next;
+       }
     $this_cgi =~ m/(.*=)(.*)/;
     my $input_name = $1;
     my $input_value = $2;
@@ -492,6 +511,9 @@ for (my $i=0;$i<=@servers;$i++) {
         $total = $total + $results_hashref->{$server}->{"hits"};
         if ($hits) {
             $template->param(total => $hits);
+                       my $limit_cgi_not_availablity = $limit_cgi;
+            $limit_cgi_not_availablity =~ s/&limit=available//g;
+            $template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity);
                        $template->param(limit_cgi => $limit_cgi);
                        $template->param(query_cgi => $query_cgi);
                        $template->param(query_desc => $query_desc);
@@ -546,7 +568,11 @@ for (my $i=0;$i<=@servers;$i++) {
                        $template->param(       PAGE_NUMBERS => \@page_numbers,
                                                                previous_page_offset => $previous_page_offset) unless $pages < 2;
                        $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
-         }
+               }
+               # no hits
+               else {
+                       $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
+               }
     } # end of the if local
     else {
         # check if it's a z3950 or opensearch source
index 3c2af2d..28a43f1 100755 (executable)
@@ -120,6 +120,7 @@ my $issueconfirmed = $query->param('issueconfirmed');
 my $cancelreserve  = $query->param('cancelreserve');
 my $organisation   = $query->param('organisations');
 my $print          = $query->param('print');
+my $newexpiry = $query->param('dateexpiry');
 
 #set up cookie.....
 # my $branchcookie;
@@ -632,6 +633,7 @@ $template->param(
     printername                 => $printer,
     firstname                   => $borrower->{'firstname'},
     surname                     => $borrower->{'surname'},
+       dateexpiry => format_date($newexpiry),
     expiry                      =>
       $borrower->{'dateexpiry'},    #format_date($borrower->{'dateexpiry'}),
     categorycode      => $borrower->{'categorycode'},
index 3fa2721..e4c584b 100644 (file)
@@ -32,7 +32,7 @@ att 26              PA-subject
 att 27              LC-subject-heading
 att 28              RVM-subject-heading
 att 29              Local-subject-index
-att 30              Date
+att 30              copydate
 att 31              pubdate
 att 32              Date-of-acquisition
 att 33              Title-key
@@ -78,7 +78,7 @@ att 1007            Identifier-standard
 att 1008            Subject-LC-childrens
 att 1009            Subject-name-personal
 att 1010            Body-of-text
-att 1011            dateaddeddb
+att 1011            date-entered-on-file
 att 1012            Date/time-last-modified
 att 1013            Authority/format-id
 att 1014            Concept-text
@@ -131,7 +131,8 @@ att 8010                    itemnumber
 att 8011                       homebranch
 att 8012                       holdingbranch
 att 8013                       location
-att 8014                       Date-of-acquisition
+# handled in bib1 attr 1=32
+#att 8014                      Date-of-acquisition
 att 8015                       acqsource
 att 8016                       coded-location-qualifier
 att 8017                       price
index 8643e2a..7e49986 100644 (file)
@@ -183,7 +183,7 @@ aut 1=1003
 #                           number from a system not
 #                           specified elsewhere in this
 #                           list of attributes.
-Local-classification 4=1 1=20
+Local-classification 1=20
 lcn Local-classification
 callnum Local-classification
 #Local-classification cc callnum dewey
@@ -326,18 +326,19 @@ Local-number 1=12
 #Date                   30  The point of time at which      005, 008/00-05,
 #                           a transaction or event          008/07-10, 260$c,
 #                           takes place.                    008/11-14, 033,etc.
-Date 1=30 4=109 r=r
-#yr Date
+# interpreting this as the copyright date in 260$c
+copydate 1=30 r=r
 
 #Date-publication       31  The date (usually year) in      008/07-10, 260$c
 #                           which a document is published.  046, 533$d
-Date-of-publication 1=31 4=109 r=r
+Date-of-publication 1=pubdate r=r
 #dp Date-of-publication
 yr Date-of-publication
+pubdate Date-of-publication
 
 #Date-acquisition       32  The date when a document was    541$d
 #                           acquired.
-Date-of-acquisition 1=32
+Date-of-acquisition 1=Date-of-acquisition
 acqdate Date-of-acquisition
 #da Date-of-acquisition
 
@@ -847,12 +848,7 @@ st-key     4=3
 st-year        4=4
 st-date-normalized     4=5
 st-word-list   4=6
-wrdl 4=6
-
-# there was a reason I didn't want to use this but it's
-# escaped me -- JF
-wrd 4=6
-
+wrdl st-word-list
 #st-word
 st-date-un-normalized  4=100
 st-name-normalized     4=101
@@ -861,7 +857,7 @@ st-structure        4=103
 st-urx         4=104
 st-free-form-text      4=105
 st-document-text       4=106
-st-local       number 4=107
+st-local-number 4=107
 st-string      4=108
 st-numeric     4=109
 #string 109
@@ -908,6 +904,7 @@ cn-item 1=9008
 cn-prefix 1=9009
 cn-suffix 1=9010
 Suppress 1=9011
+date-entered-on-file 1=date-entered-on-file
 
 # Items Index
 withdrawn 1=8001
@@ -923,14 +920,14 @@ itemnumber 1=8010
 Code-institution 1=8011
 holdingbranch 1=8012
 location 1=8013
-Date-of-acquisition 1=8014
+#Date-of-acquisition 1=8014
 acqsource 1=8015
 coded-location-qualifier 1=8016
 price 1=8017
-stack 1=8018 4=109
-issues 1=8019 4=109
-renewals 1=8020 4=109
-reserves 1=8021 4=109
+stack 1=8018
+issues 1=8019
+renewals 1=8020
+reserves 1=8021
 Local-classification 1=8022
 barcode 1=8023
 bc barcode
@@ -954,7 +951,6 @@ pl Place-publication
 
 #att 8900            
 #Call-Number 1=8900
-#date-entered-on-file 1=8800
 #date1 1=8801
 #date2 1=8802
 #language 8805
index a51c029..775fcc1 100644 (file)
@@ -16,7 +16,7 @@ esetname B @
 marc usmarc.mar
 systag sysno rank
 xpath enable
-
+# Some notes:
 # pl = Published Place
 # ta = Target Audience 002/22
 # ff8-23
@@ -27,6 +27,13 @@ xpath enable
 # ctype = Content type: review, catalog, encyclopedia, dictionary
 # pubdate Publication Date
 # rtype =  Record type (leader 06)
+#
+# Date indexing in Koha 3.0 for MARC21:
+# Index                   Expected format         Notes
+# date-entered-on-file    [yymmdd]        (008/0-5, indexed in word and sort indexes)
+# copydate                [yyyy]          (260$c, indexed in word and sort indexes)
+# acqdate                 [yyyy-mm-dd]    (952$d, indexed in date,word,sort indexes)
+# pubdate                 [yyyy]          (008/7-10, indexed in year,word,num,sort indexes)
 
 all any
 # melm 000             rtype:n:range(data,06,1),Bib-level:w:range(data,07,01)
@@ -34,10 +41,10 @@ xelm /record/leader llength:w:range(data,0,5),rtype:w:range(data,6,1),Bib-level:
 # example: xelm /record/leader l1:w:range(data,0,5),l2:w:range(data,10,2)
 
 melm 001               Control-number
-melm 005               Date,Date/time-last-modified
+melm 005               Date/time-last-modified
 melm 007               Microform-generation:n:range(data,11,1),Material-type,ff7-00:w:range(data,0,1),ff7-01:w:range(data,1,1),ff7-02:w:range(data,2,1),ff7-01-02:w:range(data,0,2)
 
-melm 008               ln:n:range(data,35,3),ctype:w:range(data,24,4),Date:n:range(data,0,5),Date:s:range(data,0,5),Date:n:range(data,7,4),Date:s:range(data,7,4),Date:n:range(data,11,4),Date:s:range(data,11,4),pubdate:n:range(data,7,4),pubdate:s:range(data,7,4),dateaddeddb:n:range(data,0,5),dateaddeddb:s:range(data,0,5),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),Record-source:w:range(data,39,0)
+melm 008               date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:n:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0)
 
 melm 010               LC-card-number,Identifier-standard
 melm 011               LC-card-number,Identifier-standard
@@ -54,7 +61,7 @@ melm 025              Identifier-standard
 melm 027               Report-number,Identifier-standard
 melm 028               Number-music-publisher,Identifier-standard
 melm 030               CODEN,Identifier-standard
-melm 033               Date
+#melm 033              Date
 melm 034        Map-scale
 #melm 035              Local-number,Identifier-standard
 melm 037               Identifier-standard,Stock-number
@@ -107,8 +114,7 @@ melm 246            Title,Title:p,Title-abbreviated,Title-expanded,Title-former
 melm 247               Title,Title:p,Title-former,Title-other-variant,Related-periodical
 melm 260$a             pl:w,pl:p
 melm 260$b             Publisher:w,Publisher:p
-melm 260$c             Date,Date:s,Date:y
-#,pubdate,pubdate:s
+melm 260$c             copydate,copydate:s
 melm 260               pl
 melm 300               Extent:w,Extent:p
 melm 400$a             Name-and-title
index 2faefef..ff95de9 100644 (file)
@@ -968,6 +968,18 @@ div.first fieldset {
   width: 65%;
   }
   
+.dialog table {
+       margin : .5em auto;
+}
+
+.dialog table th {
+       text-align : right;
+}
+
+.dialog table td {
+       text-align : left;
+}
+  
 .dialog  h2, .dialog h3, .dialog h4 {
        margin : auto;
        text-align : center;
@@ -1204,7 +1216,7 @@ overflow :  hidden;
 #searchheader {
        background-color : #f3f3f3;
        font-size : 80%;
-       margin-bottom : .5em;
+       margin : 0 0 .5em -1px;
        padding : .1em 0 .1em 1em;
 }
 
@@ -1251,4 +1263,31 @@ overflow :  hidden;
 #search-facets li.showmore {
        font-weight : bold;
        text-indent : 1em;
+}
+
+div.pages {
+       margin-top : .5em;
+}
+
+div.pages a {
+       font-weight: bold;
+       padding: 1px 5px 1px 5px;
+       text-decoration: none;
+}
+
+div.pages a:link {
+       background-color : #eeeeee;
+       color : #3366CC;
+}
+
+div.pages a:hover {
+       background-color : #e8f0f6;
+}
+
+div.pages a:active {
+       background-color : #ffc;
+}
+
+div.browse {
+       margin : .5em 0;
 }
\ No newline at end of file
index cc10df5..5490aa4 100644 (file)
@@ -16,7 +16,7 @@ function confirm_reregistration() {
     var is_confirmed = window.confirm('Are you sure you want to renew this patron\'s registration?');
     var borrowernumbervalue1 = $("#borrowernumber").attr("value");
     if (is_confirmed) {
-    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
+       window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;reregistration=y';
     }
 }
 
index a71a2b4..a640c6f 100644 (file)
@@ -3,6 +3,12 @@
 <div id="search-facets">
 <h4>Refine your search</h4>
 <ul>
+<li>Availability<ul>
+<li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="related" --> <li>(related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)</li><!-- /TMPL_IF -->.
+</li></ul>
+
+
 <!-- TMPL_LOOP NAME="facets_loop" -->
 <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" --><ul>
         <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
index 5f255dc..21788b6 100644 (file)
 <option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
 <option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
 <option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
-<option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
+<option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date (yyyy)</option>
+<option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date (yyyy-mm-dd)</option>
 <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
 <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
 <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-<option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+<option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
 <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
 <option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
 <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
index d9358c0..74e6aba 100644 (file)
@@ -19,19 +19,19 @@ if (d!="") {
       if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
         msg = _("day not correct."); 
            alert(msg); ok=0; field.focus();
-           return;
+           return false;
       }
       // checking months
       if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
         msg = _("month not correct.");
            alert(msg); ok=0; field.focus();
-           return;
+           return false;
       }
       // checking years
       if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
         msg = _("years not correct."); 
            alert(msg); ok=0; field.focus();
-           return;
+           return false;
       }
    }
 }
index 999857b..bb6e603 100644 (file)
 
 <!-- TMPL_IF name="delete_confirm" -->
 
+<div class="dialog alert">
+<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
   <input type="hidden" name="op" value="delete_confirmed" />
   <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
   <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" -->" />
-       <fieldset><legend>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></legend>
        <table>
                  <tr>
     <th scope="row">Fund: </th><td>
     <th scope="row">Group: </th><td>
     <!-- TMPL_VAR name="bookfundgroup" --></td></tr>
        </table>
-   <fieldset class="action"> <input type="submit" value="Yes, Delete this Fund" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbookfund.pl">Cancel</a></fieldset>
-  </fieldset>
-</form>
+   <input type="submit" class="approve" value="Yes, Delete this Fund" /></form>
+   <form action="/cgi-bin/koha/admin/aqbookfund.pl" method="get"><input type="submit" class="deny" value="No, Do not Delete" /></form>
+   </div>
 
 <!-- /TMPL_IF --> <!-- delete_confirm -->
 
 <!-- TMPL_IF name="delete_confirmed" -->
-<h3>Data Deleted</h3>
+<div class="dialog message"><h3>Data Deleted</h3>
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
-  <input type="submit" value="OK" />
-</form>
+  <input type="submit" class="approve" value="OK" />
+</form></div>
 <!-- /TMPL_IF --> <!-- delete_confirmed -->
 
 </div>
index 210175a..039a2c2 100644 (file)
 
 <!-- TMPL_IF name="else" -->
     <h1>Libraries</h1>
-    <!-- TMPL_IF NAME="message" --><div class="problem">
-        <!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE1" --><div class="problem">Library saved</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE2" --><div class="problem">Library saved</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE3" --><div class="problem">Library deleted</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE4" --><div class="problem">Library category added</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE5" --><div class="problem">Library category modified</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE6" --><div class="problem">Library category deleted</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE7" --><div class="problem">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
-    <!-- TMPL_IF name="MESSAGE8" --><div class="problem">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="message" --><div class="dialog message">
+        <!-- TMPL_VAR name="message" --></div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE1" --><div class="dialog message">Library saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE2" --><div class="dialog message">Library saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE3" --><div class="dialog message">Library deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE4" --><div class="dialog message">Library category added</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE5" --><div class="dialog message">Library category modified</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE6" --><div class="dialog message">Library category deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE7" --><div class="dialog message">Library cannot be deleted because there are patrons using that library</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE8" --><div class="dialog message">Category cannot be deleted because there are libraries using that category</div><!-- /TMPL_IF -->
 
     <table>
         <tr>
index 040b999..6d8b0df 100644 (file)
 
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->
-<h3>Confirm Deletion of City</h3>
+               <!-- TMPL_IF NAME="totalgtzero" -->
+<div class="dialog message">
+               <h3>Cannot Delete City "<!-- TMPL_VAR NAME="city_name" -->"</h3>
+               <p>This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</p>
+               <!-- TMPL_ELSE -->
+<div class="dialog alert">
+<h3>Delete City "<!-- TMPL_VAR NAME="city_name" -->?"</h3>
+<!-- /TMPL_IF -->
        <table>
                <tr>
-                       <td>
-                               <b>City id</b>
-                       </td>
+                       <th>City id
+                       </th>
                        <td>
                                <!-- TMPL_VAR NAME="cityid" -->
                        </td>
                </tr>
                        
                <tr>
-                       <td>City name</td>
+                       <th>City name</th>
                        <td><!-- TMPL_VAR NAME="city_name" --></td>
                </tr>
                <tr>
-                       <td>City zipcode</td>
+                       <th>City zipcode</th>
                        <td><!-- TMPL_VAR NAME="city_zipcode" --></td>
                </tr>
+</table>
                <!-- TMPL_IF NAME="totalgtzero" -->
-               <tr>
-                       <td colspan="2" align="center" class="problem">This record is used <!-- TMPL_VAR NAME="total" --> times. Impossible to delete it</td>
-               </tr>
-       <tr>
-                       <td colspan="2">
                                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                               <input type="submit" value="OK" />
+                               <input type="submit" class="approv" value="OK" />
                                </form>
-                       </td>
-               </tr>
                <!-- TMPL_ELSE -->
-               <tr>
-                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" />
-                       <input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" /><input type="submit" value="YES" /></form></td>
-                       <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                       <input type="submit" value="NO" /></form></td>
-               </tr>
+                       <input type="hidden" name="cityid" value="<!-- TMPL_VAR NAME="cityid" -->" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                       <input type="submit" class="deny" value="No, do not Delete" /></form>
                <!-- /TMPL_IF -->
-</table>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
index 0a372c3..1e3fc04 100644 (file)
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Administration &rsaquo;
-<!-- TMPL_IF name="add_form" -->MARC Links &rsaquo; <!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --> MARC Links &rsaquo; Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></title>
 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -9,7 +9,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">MARC Links</a> &rsaquo; Connect<!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="add_form" --> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">MARC Links</a> &rsaquo; Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->MARC Links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF --></div>
 <!-- TMPL_IF name="add_form" -->
 <div id="doc" class="yui-t7">
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
-<h1>Connect a koha field and a MARC subfield</h1>
-    <p>Choose and validate 1 MARC subfield for <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" -->. That will modify <b>all frameworks</b> which is usually what you need, but you have been warned.</p>
-    <table>
-<tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">     <input type="hidden" name="op" value="add_validate" />
+<h1>Connect <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --> to a MARC subfield</h1>
+    <p>Choose and validate 1 MARC subfield for <strong><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></strong>. That will modify <b>all frameworks</b> which is usually what you need, but you have been warned.</p>
+    <fieldset class="rows"><ol>
+<li><form action="<!-- TMPL_VAR name="script_name" -->" method="post"> <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist0" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist0" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
 
-        <td>   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+               <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />
-            <!-- TMPL_VAR name="marclist1" --> </form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist1" -->
+            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />      </form>
+        
+    </li>
+    <li>
 
-        <td>
+        
                 <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist2" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist2" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist3" --><input type="submit" value="OK" />       </form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist3" --> <input type="submit" value="OK" />      </form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist4" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist4" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
 
-        <td>   <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+               <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist5" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist5" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist6" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist6" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist7" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist7" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist8" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
+            <!-- TMPL_VAR name="marclist8" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    <li>
     
-        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
-            <!-- TMPL_VAR name="marclist9" --><input type="submit" value="OK" /></form>
-        </td>
-    </tr>
-    <tr>
-        <td>
+            <!-- TMPL_VAR name="marclist9" --> <input type="submit" value="OK" /></form>
+        
+    </li>
+    </ol></fieldset>
+       <fieldset class="action">
             <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
                 <input type="hidden" name="op" value="add_validate" />
                 <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
                 <input type="hidden" name="choice" value="" />
                 <input type="submit" value="Click to &quot;Unmap&quot;" />
             </form>
-        </td>
-    </tr>
-    </table>
+       <a class="cancel" href="/cgi-bin/koha/admin/koha2marclinks.pl">Cancel</a>
+       </fieldset>
 <!-- /TMPL_IF -->
 
 
     <th>&nbsp;</th>
 </tr>
 <!-- TMPL_LOOP name="loop" -->
-<tr>
+<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
     <td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="kohafield" --></a></td>
     <td><!-- TMPL_VAR name="tagfield" --></td>
     <td><!-- TMPL_VAR name="tagsubfield" --></td>
index 04deafe..20f8134 100644 (file)
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-       <h3>Confirm Deletion of Road Type</h3>
-       <ul>
-               <li>
-                       <strong>Road type id : </strong>
-                       <!-- TMPL_VAR NAME="roadtypeid" --></td>
-               </li>
-               <li>
-                       <strong>Road type: </strong>
-                       <!-- TMPL_VAR NAME="road_type" -->
-               </li>
-
-       </ul><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+       <div class="dialog alert"><h3>Delete Road Type "<!-- TMPL_VAR NAME="road_type" -->?"</h3>
+<table>        <tr>
+               <th>Road type id : </th>
+                       <td><!-- TMPL_VAR NAME="roadtypeid" --></td>
+               </tr>
+       <tr>    <th>Road type: </th>
+               <td><!-- TMPL_VAR NAME="road_type" -->
+               </td>
+
+       </tr></table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" />
-                       <input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                       <input type="submit" value="No, Do Not Delete" /></form>
+                       <input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" /><input type="submit" class="approve" value="Yes, Delete" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                       <input type="submit" class="deny" value="No, Do Not Delete" /></form></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
index eb6eb21..8d8a716 100644 (file)
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Catalog &rsaquo; <!-- TMPL_IF NAME="searchdesc" -->Results of Search for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'<!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Catalog &rsaquo; <!-- TMPL_IF NAME="searchdesc" -->Results of Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --><!-- TMPL_ELSE -->You did not specify any search criteria<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript">
 //<![CDATA[
@@ -33,7 +33,7 @@ $(window).load(function() {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>  &rsaquo; Search for <i><!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" --></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t1">
    
@@ -73,14 +73,14 @@ $(window).load(function() {
                     <!-- RESORT END -->
                                </form>
     <h3>
-        <!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'
+        <!-- TMPL_VAR NAME="total" --> result(s) found <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.
     </h3></div>
        <!-- TMPL_IF NAME="stopwords_removed" --><div><p class="tip">Ignored the following common words: "<!-- TMPL_VAR NAME="stopwords_removed" -->"<p></div><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
         <!-- TMPL_IF NAME="searchdesc" -->
             <h3>No results found</h3>
             <p>
-                No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
+                No results match your search <!-- TMPL_IF NAME="query_desc" -->for <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="query_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s): <span style="font-weight: bold;">'<!-- TMPL_VAR NAME="limit_desc" -->'</span><!-- /TMPL_IF --><!-- TMPL_IF NAME="LibraryName" --> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog<!-- /TMPL_IF -->.
             </p>
         <!-- TMPL_ELSE -->
             <h3>No results found</h3>
@@ -149,7 +149,7 @@ $(window).load(function() {
                             <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
                         </td>
                         <td>
-                            <!-- TMPL_VAR NAME="subtitle" -->
+                            <!-- TMPL_VAR NAME="author" -->
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
@@ -252,7 +252,7 @@ $(window).load(function() {
                                     </a></td>                           
                             <!-- /TMPL_IF -->
                             <td>
-                                <p>
+                                <p><!-- TMPL_VAR NAME="result_number" -->.
                                     <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
                                         <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
                                             <b><!-- TMPL_VAR NAME="title" --></b>
@@ -277,7 +277,7 @@ $(window).load(function() {
                                     <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" style="float: left; margin: .1em;" />
                                                                        <!-- /TMPL_IF -->                                
                                         <!-- TMPL_IF NAME="author" -->
-                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a>
+                                            <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan" ESCAPE="URL" -->" title="Search for this Author"><!-- TMPL_VAR NAME="author" --></a>
                                         <!-- TMPL_ELSE -->
                                             &nbsp;
                                         <!-- /TMPL_IF -->
@@ -290,6 +290,7 @@ $(window).load(function() {
                                                                                <!-- TMPL_VAR name="description" -->
                                         <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
                                     </p>
+                                                                       <p><!-- TMPL_VAR NAME="searchhighlightblob" --></p>
                                 <!-- /TMPL_IF -->
                                                                  <!-- TMPL_IF NAME="norequests" -->
                                         No holds allowed
index c2cd1cb..8668654 100755 (executable)
@@ -43,9 +43,9 @@
 <!-- /TMPL_IF -->
 
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-
+<!-- TMPL_IF NAME="dateexpiry" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-<div class="yui-g" style="text-align: center">
+<div class="yui-g">
 
 <div id="circ_needsconfirmation" class="dialog alert">
 <h3>Please Confirm Checkout</h3>
@@ -268,7 +268,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                <ul>
                
                        <!--TMPL_IF Name="warndeparture"-->
-                       <li><span class="circ-hlt">Expiration:</span> Patron card has expired or will expire soon.</li>
+                       <li><span class="circ-hlt">Expiration:</span> Patron card has expired or will expire soon.
+                       Patron Expires on <!-- TMPL_VAR NAME="expiry" --> <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?modify=edit&amp;destination=circ&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Edit Details</a>
+                       
+                       </li>
                        <!--/TMPL_IF-->
 
             <!-- TMPL_IF NAME="gna" -->
@@ -280,7 +283,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
                        <!-- /TMPL_IF -->
                        
             <!-- TMPL_IF NAME="dbarred" --><li class="blocker">
-               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a></li><!-- /TMPL_IF -->
+               <span class="circ-hlt"> Restricted:</span> Patron's account is restricted <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a>
+</li><!-- /TMPL_IF -->
 
                <!-- TMPL_IF name="odues" --><li><!-- TMPL_IF name="nonreturns" --><span class="circ-hlt">Overdues:</span> Patron has <span class="circ-hlt">ITEMS OVERDUE</span>. See highlighted items <a href="#checkouts">below</a><!-- /TMPL_IF --></li>
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/inventory.tmpl
new file mode 100644 (file)
index 0000000..d4e7d44
--- /dev/null
@@ -0,0 +1,5 @@
+<!-- TMPL_INCLUDE name="help-top.inc" -->
+<div class="main">
+<h1>Inventory/Stocktaking</h1><h2>How do I use this feature?</h2><p>This inventory feature works by using the &quot;Last Seen Date&quot; as criteria for building reports. From these reports the library can identify which items are missing.&nbsp;</p><h2>How do I get a file of barcodes to upload?&nbsp;</h2><p>The easiest way to generate the barcode file is to scan the barcodes of all the items on the shelf in situ to a text file. This can be done using a standard keyboard wedge type Barcode scanner and a Laptop, or using a handheld PC with an integrated scanner (e.g Palm or iPaq).</p><p>Save the file locally to your machine and then when you are attached to the network, open the Inventory/Stocktaking page again and use the &quot;Browse&quot; feature to find the file on your local drive.&nbsp; Now set the last seen to the date you wish to use (normally today's date). </p><h2>How do I find what items are missing?</h2><p>Now you have set the Last Seen Date of the items, you can use that as a criteria to generate a report. Use the &quot;Select items you want to check&quot; feature to generate this report. </p><p>NOTE: If you have scanned all the items in your library, you will not need to change any of the default criteria.&nbsp;</p><p>Set the &quot;Not seen since&quot; date to the day <strong>before </strong>the date you used when you set the &quot;Last Seen Date&quot; when uploading the barcode file.&nbsp;</p><p>Press the &quot;Submit&quot; button to generate the list of items that Koha has not seen. &nbsp;</p><h2><br /></h2><p>&nbsp;</p><br /><p>&nbsp;</p>
+</div>
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
index a024ee8..c1160d8 100644 (file)
@@ -27,7 +27,7 @@
     <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
     <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
     <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
-    <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
+    <option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
     <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
    <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
     <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
@@ -44,7 +44,7 @@
     <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
     <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
     <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
-    <option value="lcn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
+    <option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
     <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
    <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
     <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
index ed43eb2..194337d 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form>
 
 <!-- The manual invoice and credit buttons -->
index 1aa469f..b69fe6c 100644 (file)
@@ -12,7 +12,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->  <h3>Cannot Delete Patron</h3>
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" --><h3>Cannot Delete Patron</h3>
                <ul><!-- TMPL_IF name="ItemsOnIssues" -->
                        <li>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</li>
                <!-- /TMPL_IF -->
index 01a12e3..278c81a 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
 <!-- The manual invoice and credit buttons -->
 <div class="toptabs">
index 3973f16..a3cbe5f 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
 <!-- The manual invoice and credit buttons -->
 <div class="toptabs">
index d30bee4..93af845 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
     <input type="hidden" name="member" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
index f51fa2c..1c6bbe2 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
 <!-- TMPL_IF NAME="newpassword" -->
 <h1>Password Updated</h1>
index 8ece441..6c5f07d 100644 (file)
@@ -17,7 +17,7 @@
 <!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
 
 
-<div>
+<div class="browse">
     Browse by last name:
     <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
     <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
 
 
 <!-- TMPL_IF NAME="resultsloop" -->
-    <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
-       <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found<br/>
-  Page : <!-- TMPL_VAR Name ="startfrom" --> Results <!-- TMPL_VAR Name ="from" --> to <!-- TMPL_VAR Name ="to" --></div>
+   <div id="searchheader"> <h3>Results <!-- TMPL_VAR Name ="from" --> to <!-- TMPL_VAR Name ="to" --> of <!-- TMPL_VAR Name ="numresults" --> found for '<span class="ex"><!-- TMPL_VAR NAME="member" --></span>'</h3></div>
 <div class="searchresults">
-<p align="center"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></p>
+
     <table>
     <tr>
     <th><a href="member.pl?member=<!--TMPL_VAR Name="member" -->&amp;orderby=cardnumber">Card</a></th>
@@ -94,6 +92,7 @@
     </tr>
     <!-- /TMPL_LOOP -->
     </table>
+       <div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
 </div>
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="searching" -->
index 5abfd6f..a63a516 100644 (file)
@@ -14,14 +14,14 @@ patron <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --><!--
                        $("#contactname").attr("value","");
                        $("#contactfirstname").attr("value","");
                        $("#guarantorsearch").attr("value","Find guarantor");
+               });
+                       $("#select_city").change(function(){
+                               var myRegEx=new RegExp(/(.*)\|(.*)/);
+                       document.form.select_city.value.match(myRegEx);
+                       document.form.zipcode.value=RegExp.$1;
+                       document.form.city.value=RegExp.$2;                                     
                });
         });
-        function changecity() {
-          var myRegEx=new RegExp(/(.*)\|(.*)/);
-        document.form.select_city.value.match(myRegEx);
-        document.form.zipcode.value=RegExp.$1;
-        document.form.city.value=RegExp.$2;
-        }
 //]]>
 </script>
 </head>
@@ -123,7 +123,7 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
             <!-- TMPL_VAR NAME="borrotitlepopup" -->
             <!-- TMPL_IF NAME="mandatorytitle" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
-        <!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
                <li>
                <!-- TMPL_IF NAME="mandatorysurname" -->
                <label for="surname" class="required">
@@ -179,7 +179,7 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                 <input type="text" id="initials" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->" />       
                 <!-- TMPL_IF NAME="mandatoryinitials" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
-        <!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
                <li>
                        <!-- TMPL_IF NAME="mandatoryothernames" -->
                        <label for="othernames" class="required">
@@ -270,10 +270,10 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
       <!--TMPL_ELSE-->
         <label for="city">
       <!-- /TMPL_IF-->
-      City: </label>
+      City, State: </label>
         
         <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
-        or choose <!-- TMPL_VAR NAME="citypopup" -->
+        <!-- TMPL_IF NAME="city_cgipopup" -->or <strong>choose</strong> <!-- TMPL_VAR NAME="citypopup" --><!-- /TMPL_IF -->
          <!-- TMPL_IF NAME="mandatorycity" --><span class="required">Required</span><!-- /TMPL_IF -->
     </li>
     <li> 
@@ -293,15 +293,6 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
     <legend>Contact</legend><ol>       
 <!--TMPL_IF Name="C"-->
       <h2>Patron</h2>
-      <li> 
-        <!-- TMPL_IF NAME="mandatoryB_email" -->
-          <label for="B_email" class="required">
-        <!--TMPL_ELSE-->
-          <label for="B_email">
-        <!-- /TMPL_IF-->
-        E-mail (home): </label>
-        <input type="text" id="B_email" name="B_email" size="45" value="<!-- TMPL_VAR NAME="B_email" -->" />
-               <!-- TMPL_IF NAME="mandatoryB_email" --><span class="required">Required</span><!-- /TMPL_IF --> </li>
 <!--/TMPL_IF-->
       <li>
       <!-- TMPL_IF NAME="mandatoryphone" --> 
@@ -413,6 +404,15 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                 <input type="text" id="B_phone" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" />
                 <!-- TMPL_IF NAME="mandatoryB_phone" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
+                       <li> 
+        <!-- TMPL_IF NAME="mandatoryB_email" -->
+          <label for="B_email" class="required">
+        <!--TMPL_ELSE-->
+          <label for="B_email">
+        <!-- /TMPL_IF-->
+        E-mail: </label>
+        <input type="text" id="B_email" name="B_email" size="45" value="<!-- TMPL_VAR NAME="B_email" -->" />
+               <!-- TMPL_IF NAME="mandatoryB_email" --><span class="required">Required</span><!-- /TMPL_IF --> </li>
             <li>
                 <!-- TMPL_IF NAME="mandatorycontacnote" -->
                 <label for="contacnote" class="required">
@@ -630,7 +630,7 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                <!-- /TMPL_UNLESS -->   
 <!-- /TMPL_IF -->
     <fieldset class="action">
-        <input type="button" name="save" onclick="return check_form_borrowers();" value="Save" />
+        <input type="submit" name="save" onclick="return check_form_borrowers();" value="Save" />
       <!-- TMPL_IF NAME="opadd" -->
        <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
           <!-- TMPL_ELSE -->
index 296c574..c8bcb03 100644 (file)
@@ -41,7 +41,7 @@ Unable to delete member: insufficient privileges.
 <!-- TMPL_IF NAME="unknowuser" -->
     This patron does not exist.
 <!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="reregistration" --><div class="message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="reregistration" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
 <form action="" name="form">
 <input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->" /> 
 <input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
@@ -119,7 +119,6 @@ Unable to delete member: insufficient privileges.
      <!-- /TMPL_IF  -->
 </ol>
 </div>
-</div>    
           <div class="action">  <!-- TMPL_IF name="guarantorborrowernumber" -->
                        <a href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1&amp;guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->">Edit</a>
                        <!-- TMPL_ELSE -->
@@ -127,6 +126,7 @@ Unable to delete member: insufficient privileges.
                        <!-- /TMPL_IF --></div>
 
 
+</div>    
 </div>
  <div class="yui-u"> 
  <div id="patron-library-details">
@@ -171,7 +171,6 @@ Unable to delete member: insufficient privileges.
       <!-- TMPL_VAR NAME="B_zipcode" --></p>
   <!-- /TMPL_UNLESS -->
     <!-- /TMPL_UNLESS -->
- <!-- TMPL_IF NAME="C" -->C!<!-- TMPL_ELSE -->Not C.<!-- /TMPL_IF -->
      <!-- TMPL_IF NAME="C" -->
    <div class="rows"> <ol><li><span class="label">Name: </span><!-- TMPL_VAR NAME="contactname" --></li>
     <li><span class="label">Firstname: </span><!-- TMPL_VAR NAME="firstname" --></li>    
@@ -193,7 +192,7 @@ Unable to delete member: insufficient privileges.
        
 <div id="finesandcharges">
     <h2>Fines and Charges</h2>
-    <!-- TMPL_IF EXPR="totaldue eq 0.00" -->
+    <!-- TMPL_IF EXPR="totaldue ne '0.00'" -->
         <p>Total due: <!-- TMPL_VAR NAME="totaldue" --></p>
     <!-- TMPL_ELSE -->
         <p>No outstanding charges</p>
index 843ab66..5105fd8 100644 (file)
@@ -20,7 +20,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+<!-- TMPL_INCLUDE NAME="members-toolbar.inc" -->
 
 <!-- The manual invoice and credit buttons -->
 <div class="toptabs">
index 742e03f..39dce64 100644 (file)
@@ -160,7 +160,8 @@ function confirmDelete(s,n){
 </form>
 </div>
 <!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
+<!-- /TMPL_IF -->
+
     <!-- TMPL_IF NAME="shelves" -->
 <div class="yui-ge">
        <div class="yui-u first">
@@ -198,8 +199,8 @@ function confirmDelete(s,n){
         </ul></div>
        </div>
 </div>
-        
-    <!-- TMPL_ELSE -->
+<!-- /TMPL_IF -->
+   
     <!-- TMPL_IF name="edit" -->
        <div class="yui-ge">
        <div class="yui-u first">
@@ -221,6 +222,7 @@ function confirmDelete(s,n){
                         <option value="2" selected="selected">Public</option>
                     <!-- TMPL_ELSE -->
                         <option value="2">Public</option>
+                    <!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="category3" -->
                                                <option value="3" selected="selected">Open</option>
                                        <!-- TMPL_ELSE -->
@@ -239,7 +241,11 @@ function confirmDelete(s,n){
             </ul></div>
        </div>
 
-<!-- /TMPL_IF --><!-- TMPL_ELSE -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="viewshelf" --><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="shelves" --><!-- TMPL_ELSE -->
+<!-- TMPL_IF name="edit" --><!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="shelvesloop" -->
 <h3>Virtual shelves</h3>
 
@@ -259,7 +265,7 @@ function confirmDelete(s,n){
 <!-- /TMPL_LOOP -->
 </table>
 <!-- /TMPL_IF -->
-
+<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/img/item-bullet.gif b/koha-tmpl/intranet-tmpl/prog/img/item-bullet.gif
new file mode 100644 (file)
index 0000000..eae920d
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/item-bullet.gif differ
index de241da..d661bb3 100644 (file)
        display:block;
 }
 .child {
+       display:none;
     margin-left : 50px;
     width:150%;
-  display:none;
 }
 .child a:hover{
   background-color:#BFCFFF;
 }
 .parent {
+       display:none;
     margin-left : -50px;
 }
 .parent a:hover{
index b7251a4..d70291a 100644 (file)
                     <option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option><!-- /TMPL_IF -->
                                
                                <!-- TMPL_IF NAME="selected" -->
-                    <option value="lcn" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
+                    <option value="lcn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
                                        <!-- TMPL_ELSE -->
-                    <option value="lcn">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option><!-- /TMPL_IF -->
+                    <option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option><!-- /TMPL_IF -->
 
 
                 <!-- /TMPL_IF -->
index 46d87e4..c0d48d5 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF Name="displayhierarchy"-->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css">
 <script language="JavaScript" type="text/javascript">
 function showParents(mynumber) {
   var parents=document.getElementsByName(mynumber+'p')
index 55ee9c4..5e1333d 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; 
 <!-- TMPL_IF NAME="searchdesc" -->
-    Results of Search for '<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->'
+       Results of Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
     You did not specify any search criteria
 <!-- /TMPL_IF -->
@@ -9,7 +9,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <link rel="alternate" type="application/rss+xml" title="Koha - RSS"
-href="/cgi-bin/koha/opac-rss.pl?q=<!-- TMPL_VAR name="searchdesc"-->">
+href="/cgi-bin/koha/opac-rss.pl?q=<!-- TMPL_VAR name="query_cgi"--><!-- TMPL_VAR NAME="limit_cgi" -->">
 </head>
 <body>
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
index 6430699..f324c2b 100755 (executable)
@@ -108,9 +108,18 @@ if ($op eq 'insert' || $op eq 'modify' || $op eq 'save') {
         $newdata{$key} = $input->param($key) if (defined $input->param($key));
         $newdata{$key} =~ s/\"/&quot;/gg unless $key eq 'borrowernotes' or $key eq 'opacnote';
     }
-#    $newdata{'dateenrolled'}=format_date_in_iso($newdata{'dateenrolled'}) if ($newdata{dateenrolled});  
-#    $newdata{'dateexpiry'}  =format_date_in_iso($newdata{'dateexpiry'}  ) if ($newdata{dateexpiry});  
-#    $newdata{'dateofbirth'} =format_date_in_iso($newdata{'dateofbirth'} ) if ($newdata{dateofbirth});  
+       my $dateobject = C4::Dates->new();
+       my $regexp = $dateobject->regexp();             # same format for all 3 dates
+       foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+               my $userdate = $newdata{$_} or next;
+               if ($userdate =~ /$regexp/) {
+                       $newdata{$_} = format_date_in_iso($userdate);
+               } else {
+                       $template->param( "ERROR_$_" => $userdate );
+                       push(@errors,"ERROR_$_");
+                       $nok++;
+               }
+       }
   # check permission to modify login info.
     if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($dbh,$userenv->{'id'},{'staffaccess'=>1})) )  {
                $NoUpdateLogin =1;
@@ -171,7 +180,7 @@ if ($op eq 'save' || $op eq 'insert'){
       $nok = 1;
     }
   }
-warn $newdata{'dateofbirth'};
+       $debug and warn "dateofbirth: " . $newdata{'dateofbirth'};
     
   if (C4::Context->preference("IndependantBranches")) {
     if ($userenv && $userenv->{flags} != 1){
@@ -207,7 +216,7 @@ if ($op eq 'insert'){
       add_member_orgs($borrowernumber,\@orgs);
     }
     if ($destination eq "circ")        {
-       print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
+               print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
     } else {
         if ($loginexist == 0) {
             print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
@@ -222,7 +231,7 @@ if ($op eq 'save'){
                        delete $newdata{'password'};
                        delete $newdata{'userid'};
                }
-warn $newdata{'dateofbirth'};
+               $debug and warn "dateofbirth: " . $newdata{'dateofbirth'};
                &ModMember(%newdata);    
            if ($destination eq "circ") {
                print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
@@ -316,7 +325,6 @@ my $citypopup = CGI::popup_menu(-name=>'select_city',
         -values=>$name_city,
         -labels=>$name_city,
         -default=>$default_city,
-        -onChange => "javascript:changecity()",
         );  
   
 my $default_roadtype;
index 64d8083..361692e 100755 (executable)
@@ -46,6 +46,8 @@ use C4::Biblio;
 use C4::Reserves;
 use C4::Branch; # GetBranchName
 
+#use Smart::Comments;
+
 use vars qw($debug);
 
 BEGIN {
@@ -96,6 +98,8 @@ if ( $reregistration eq 'y' ) {
 my $borrowercategory = GetBorrowercategory( $data->{'categorycode'} );
 my $category_type = $borrowercategory->{'category_type'};
 
+### $category_type
+
 # in template <TMPL_IF name="I"> => instutitional (A for Adult& C for children) 
 $template->param( $data->{'categorycode'} => 1 ); 
 
@@ -121,10 +125,16 @@ $data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} );
 $data->{ "sex_".$data->{'sex'}."_p" } = 1;
 
 if ( $category_type eq 'C' and $data->{'guarantorid'} ne '0' ) {
+
     my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber');
-       foreach (qw(address city B_address B_city phone mobilezipcode)) {
-       $data->{$_} = $data2->{$_};
-       }
+    foreach (qw(address city B_address B_city phone mobilezipcode)) {
+        $data->{$_} = $data2->{$_};
+    }
+    my  ( $catcodes, $labels ) = 
+        GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+    my $cnt = scalar(@$catcodes);
+    $template->param( 'CATCODE_MULTI' => 1)    if  $cnt > 1;
+    $template->param( 'IS_CHILD' => 1 );
 }
 
 if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
index 6fa13ea..c2b7a38 100755 (executable)
@@ -26,6 +26,7 @@ use strict;
 
 use CGI;
 use C4::Context;
+use C4::Members;
 use C4::Auth;
 
 
@@ -39,14 +40,14 @@ my $destination = $input->param("destination");
 my $cardnumber = $input->param("cardnumber");
 my $borrowernumber=$input->param('borrowernumber');
 my $status = $input->param('status');
-my $renewaldate = $input->param('renewaldate');
+my $reregistration = $input->param('reregistration');
 
 my $dbh = C4::Context->dbh;
+my $dateexpiry;
 
-if($renewaldate){
-       my $sth=$dbh->prepare("Update borrowers set expiry = ? where borrowernumber = ?");
-       $sth->execute($renewaldate,$borrowernumber);
-       $sth->finish;
+if ( $reregistration eq 'y' ) {
+       # re-reregistration function to automatic calcul of date expiry
+       $dateexpiry = ExtendMemberSubscriptionTo( $borrowernumber );
 } else {
        my $sth=$dbh->prepare("Update borrowers set debarred = ? where borrowernumber = ?");
        $sth->execute($status,$borrowernumber); 
@@ -54,7 +55,15 @@ if($renewaldate){
        }
 
 if($destination eq "circ"){
-       print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
+       if($dateexpiry){
+               print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&dateexpiry=$dateexpiry");
+       } else {
+               print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
+       }
 } else {
-       print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+       if($dateexpiry){
+               print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber&dateexpiry=$dateexpiry");
+       } else {
+               print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
+       }
 }
diff --git a/misc/cronjobs/result.txt b/misc/cronjobs/result.txt
deleted file mode 100644 (file)
index e69de29..0000000
index fb0e46d..0cc0dcc 100755 (executable)
@@ -394,7 +394,18 @@ foreach my $limit(@limits) {
 $template->param(available => $available);
 
 # append year limits if they exist
-push @limits, map "yr:".$_, split("\0",$params->{'limit-yr'}) if $params->{'limit-yr'};
+if ($params->{'limit-yr'}) {
+    if ($params->{'limit-yr'} =~ /\d{4}-\d{4}/) {
+        my ($yr1,$yr2) = split(/-/, $params->{'limit-yr'});
+        push @limits, "yr,st-numeric,ge=$yr1 and yr,st-numeric,le=$yr2";
+    }
+    elsif ($params->{'limit-yr'} =~ /\d{4}/) {
+        push @limits, "yr,st-numeric=$params->{'limit-yr'}";
+    }
+    else {
+        #FIXME: Should return a error to the user, incorect date format specified
+    }
+}
 
 # Params that can only have one value
 my $scan = $params->{'scan'};
@@ -560,10 +571,10 @@ for (my $i=0;$i<=@servers;$i++) {
                                                                previous_page_offset => $previous_page_offset) unless $pages < 2;
                        $template->param(next_page_offset => $next_page_offset) unless $pages eq $current_page_number;
          }
-         else {
-            # Here we must handle cases where no results are returned otherwise the template gives a malformed message. -fbcit
-            $template->param(query_desc => $query_desc);
-         }
+               # no hits
+        else {
+            $template->param(searchdesc => 1,query_desc => $query_desc,limit_desc => $limit_desc);
+        }
     } # end of the if local
     else {
         # check if it's a z3950 or opensearch source