View | Details | Raw Unified | Return to bug 8570
Collapse All | Expand All

(-)a/acqui/z3950_search.pl (-16 / +41 lines)
Lines 63-68 my $controlnumber = $input->param('controlnumber'); Link Here
63
my $op            = $input->param('op');
63
my $op            = $input->param('op');
64
my $booksellerid = $input->param('booksellerid');
64
my $booksellerid = $input->param('booksellerid');
65
my $basketno = $input->param('basketno');
65
my $basketno = $input->param('basketno');
66
67
my $page = $input->param('current_page') || 1;
68
$page = $input->param('goto_page') if $input->param('changepage_goto');
69
my $show_next = 0;
70
my $total_pages = 0;
71
66
my $noconnection;
72
my $noconnection;
67
my $attr = '';
73
my $attr = '';
68
my $term;
74
my $term;
Lines 112-133 $template->param( frameworkcode => $frameworkcode, Link Here
112
                                    );
118
                                    );
113
                                    
119
                                    
114
120
121
$template->param(
122
    isbn         => $isbn,
123
    issn         => $issn,
124
    lccn         => $lccn,
125
    lccall       => $lccall,
126
    title        => $title,
127
    author       => $author,
128
    controlnumber=> $controlnumber,
129
    biblionumber => $biblionumber,
130
    dewey        => $dewey,
131
    subject      => $subject,
132
);
115
133
116
if ( $op ne "do_search" ) {
134
if ( $op ne "do_search" ) {
117
    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers  order by host");
135
    my $sth = $dbh->prepare("select id,host,name,checked from z3950servers  order by host");
118
    $sth->execute();
136
    $sth->execute();
119
    my $serverloop = $sth->fetchall_arrayref( {} );
137
    my $serverloop = $sth->fetchall_arrayref( {} );
120
    $template->param(
138
    $template->param(
121
        isbn         => $isbn,
122
        issn         => $issn,
123
        lccn         => $lccn,
124
        lccall       => $lccall,
125
        title        => $title,
126
        author       => $author,
127
        controlnumber=> $controlnumber,
128
        serverloop   => $serverloop,
139
        serverloop   => $serverloop,
129
        opsearch     => "search",
140
        opsearch     => "search",
130
        biblionumber => $biblionumber,
131
    );
141
    );
132
    output_html_with_http_headers $input, $cookie, $template->output;
142
    output_html_with_http_headers $input, $cookie, $template->output;
133
    exit;
143
    exit;
Lines 258-270 warn "query ".$query if $DEBUG; Link Here
258
            warn "numresults = $numresults" if $DEBUG;
268
            warn "numresults = $numresults" if $DEBUG;
259
            my $i;
269
            my $i;
260
            my $result = '';
270
            my $result = '';
261
            if ( $numresults > 0 ) {
271
            if ( $numresults > 0  and $numresults >= (($page-1)*20)) {
262
                for (
272
                $show_next = 1 if $numresults >= ($page*20);
263
                    $i = 0 ;
273
                $total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);
264
                    $i < ( ( $numresults < 20 ) ? ($numresults) : (20) ) ;
274
                for ($i = ($page-1)*20; $i < (($numresults < ($page*20)) ? $numresults : ($page*20)); $i++) {
265
                    $i++
266
                  )
267
                {
268
                    my $rec = $oResult[$k]->record($i);
275
                    my $rec = $oResult[$k]->record($i);
269
                    if ($rec) {
276
                    if ($rec) {
270
                        my $marcrecord;
277
                        my $marcrecord;
Lines 309-315 warn "query ".$query if $DEBUG; Link Here
309
            }    #$numresults
316
            }    #$numresults
310
        }
317
        }
311
    }    # if $k !=0
318
    }    # if $k !=0
312
    #   print  $template->output  if $firstresult !=1;
319
    my $numberpending = $nremaining - 1;
320
321
    my @servers = ();
322
    foreach my $id (@id) {
323
        push(@servers,{id => $id});
324
    }
325
326
    $template->param(
327
        breeding_loop => \@breeding_loop,
328
        server        => $servername[$k],
329
        numberpending => $numberpending,
330
        current_page => $page,
331
        servers => \@servers,
332
        total_pages => $total_pages,
333
    );
334
    $template->param(show_nextbutton=>1) if $show_next;
335
    $template->param(show_prevbutton=>1) if $page != 1;
336
337
    #  	print  $template->output  if $firstresult !=1;
313
    $firstresult++;
338
    $firstresult++;
314
339
315
  } # while nremaining
340
  } # while nremaining
(-)a/cataloguing/z3950_search.pl (-13 / +36 lines)
Lines 49-54 my $stdid = $input->param('stdid'); Link Here
49
my $srchany			= $input->param('srchany');
49
my $srchany			= $input->param('srchany');
50
my $random        = $input->param('random') || rand(1000000000); # this var is not useful anymore just kept for rel2_2 compatibility
50
my $random        = $input->param('random') || rand(1000000000); # this var is not useful anymore just kept for rel2_2 compatibility
51
my $op            = $input->param('op');
51
my $op            = $input->param('op');
52
53
my $page            = $input->param('current_page') || 1;
54
$page = $input->param('goto_page') if $input->param('changepage_goto');
55
my $show_next = 0;
56
my $total_pages = 0;
57
52
my $numberpending;
58
my $numberpending;
53
my $attr = '';
59
my $attr = '';
54
my $term;
60
my $term;
Lines 80-103 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ Link Here
80
});
86
});
81
87
82
$template->param( frameworkcode => $frameworkcode, );
88
$template->param( frameworkcode => $frameworkcode, );
89
$template->param(
90
    isbn         => $isbn,
91
    issn         => $issn,
92
    lccn         => $lccn,
93
    lccall       => $lccall,
94
    title        => $title,
95
    author       => $author,
96
    controlnumber=> $controlnumber,
97
    stdid		 => $stdid,
98
    srchany		 => $srchany,
99
    biblionumber => $biblionumber,
100
    dewey        => $dewey,
101
    subject      => $subject,
102
);
83
103
84
if ( $op ne "do_search" ) {
104
if ( $op ne "do_search" ) {
85
    my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers ORDER BY rank, name");
105
    my $sth = $dbh->prepare("SELECT id,host,name,checked FROM z3950servers ORDER BY rank, name");
86
    $sth->execute();
106
    $sth->execute();
87
    my $serverloop = $sth->fetchall_arrayref( {} );
107
    my $serverloop = $sth->fetchall_arrayref( {} );
88
    $template->param(
108
    $template->param(
89
        isbn         => $isbn,
90
        issn         => $issn,
91
        lccn         => $lccn,
92
        lccall       => $lccall,
93
        title        => $title,
94
        author       => $author,
95
        controlnumber=> $controlnumber,
96
        stdid			=> $stdid,
97
        srchany		=> $srchany,
98
        serverloop   => $serverloop,
109
        serverloop   => $serverloop,
99
        opsearch     => "search",
110
        opsearch     => "search",
100
        biblionumber => $biblionumber,
101
    );
111
    );
102
    output_html_with_http_headers $input, $cookie, $template->output;
112
    output_html_with_http_headers $input, $cookie, $template->output;
103
}
113
}
Lines 231-238 warn "query ".$query if $DEBUG; Link Here
231
            my $numresults = $oResult[$k]->size();
241
            my $numresults = $oResult[$k]->size();
232
            my $i;
242
            my $i;
233
            my $result = '';
243
            my $result = '';
234
            if ( $numresults > 0 ) {
244
            if ( $numresults > 0  and $numresults >= (($page-1)*20)) {
235
                for ($i = 0; $i < (($numresults < 20) ? $numresults : 20); $i++) {
245
                $show_next = 1 if $numresults >= ($page*20);
246
                $total_pages = int($numresults/20)+1 if $total_pages < ($numresults/20);
247
                for ($i = ($page-1)*20; $i < (($numresults < ($page*20)) ? $numresults : ($page*20)); $i++) {
236
                    my $rec = $oResult[$k]->record($i);
248
                    my $rec = $oResult[$k]->record($i);
237
                    if ($rec) {
249
                    if ($rec) {
238
                        my $marcrecord;
250
                        my $marcrecord;
Lines 280-292 warn "query ".$query if $DEBUG; Link Here
280
        }
292
        }
281
    }    # if $k !=0
293
    }    # if $k !=0
282
    $numberpending = $nremaining - 1;
294
    $numberpending = $nremaining - 1;
295
296
    my @servers = ();
297
    foreach my $id (@id) {
298
        push(@servers,{id => $id});
299
    }
300
283
    $template->param(
301
    $template->param(
284
        breeding_loop => \@breeding_loop,
302
        breeding_loop => \@breeding_loop,
285
        server        => $servername[$k],
303
        server        => $servername[$k],
286
        numberpending => $numberpending,
304
        numberpending => $numberpending,
287
        biblionumber  => $biblionumber,
305
        biblionumber  => $biblionumber,
288
        errconn       => \@errconn
306
        errconn       => \@errconn,
307
        current_page => $page,
308
        servers => \@servers,
309
        total_pages => $total_pages,
289
    );
310
    );
311
    $template->param(show_nextbutton=>1) if $show_next;
312
    $template->param(show_prevbutton=>1) if $page != 1;
290
    
313
    
291
    output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
314
    output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
292
315
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +49 lines)
Lines 16-22 Link Here
16
        "aoColumnDefs": [
16
        "aoColumnDefs": [
17
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
17
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
18
        ],
18
        ],
19
        "sPaginationType": "four_button"
19
        "bPaginate": false
20
    } ) );
20
    } ) );
21
21
22
    $("#CheckAll").click(function(){
22
    $("#CheckAll").click(function(){
Lines 50-55 Link Here
50
            row.addClass("selected");
50
            row.addClass("selected");
51
        });
51
        });
52
});
52
});
53
54
[% IF ( total_pages ) %]
55
function validate_goto_page(){
56
    var page = $('#goto_page').val();
57
    if(isNaN(page)) {
58
        alert(_("The page entered is not a number."));
59
        return false;
60
    }
61
    else if(page < 1 || page > [% total_pages %] ) {
62
        alert(_("The page should be a number between 1 and ") + [% total_pages %] + ".");
63
        return false;
64
    }
65
    else {
66
        return true;
67
    }
68
}
69
[% END %]
70
53
//]]>
71
//]]>
54
</script>
72
</script>
55
<style type="text/css">
73
<style type="text/css">
Lines 155-160 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
155
        [% END %]
173
        [% END %]
156
    [% END %]</tbody>
174
    [% END %]</tbody>
157
</table>
175
</table>
176
177
    <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
178
        <input type="hidden" name="op" id="op" value="do_search" />
179
        <input type="hidden" name="current_page" id="current_page" value="[% current_page %]" />
180
        <input type="hidden" id="searchtitle"  name="title" value="[% title |html %]" />
181
        <input type="hidden" id="isbn" name="isbn" value="[% isbn %]" />
182
        <input type="hidden" id="lccall" name="lccall" value="[% lccall %]" />
183
        <input type="hidden" id="author" name="author" value="[% author %]" />
184
        <input type="hidden" id="subject" name="subject" value="[% subject %]" />
185
        <input type="hidden" id="dewey" name="dewey" value="[% dewey %]" />
186
        <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
187
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
188
        <input type="hidden" name="controlnumber" value="[% controlnumber %]" />
189
        <input type="hidden" name="basketno" value="[% basketno %]" />
190
        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
191
192
        [% FOREACH server IN servers %]
193
        <input type="hidden" name="id" id="z3950_[% server.id %]" value="[% server.id %]" />
194
        [% END %]
195
196
        [% IF ( show_prevbutton ) %]
197
            <input type="button" name="changepage_prev" value="Previous Page" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();" />
198
        [% END %]
199
        Page [% current_page %] / [% total_pages %]
200
        [% IF ( show_nextbutton ) %]
201
            <input type="button" name="changepage_next" value="Next Page" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();" />
202
        [% END %]
203
        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" onclick="return validate_goto_page();" value="Go" />
204
    </form>
205
158
    [% ELSE %]
206
    [% ELSE %]
159
        [% IF ( emptyserverlist ) %]
207
        [% IF ( emptyserverlist ) %]
160
            <div class="dialog alert">You didn't select any Z39.50 target.</div>
208
            <div class="dialog alert">You didn't select any Z39.50 target.</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt (-1 / +47 lines)
Lines 62-67 $(document).ready(function(){ Link Here
62
    });
62
    });
63
});
63
});
64
64
65
[% IF ( total_pages ) %]
66
function validate_goto_page(){
67
    var page = $('#goto_page').val();
68
    if(isNaN(page)) {
69
        alert(_("The page entered is not a number."));
70
        return false;
71
    }
72
    else if(page < 1 || page > [% total_pages %] ) {
73
        alert(_("The page should be a number between 1 and ") + [% total_pages %] + ".");
74
        return false;
75
    }
76
    else {
77
        return true;
78
    }
79
}
80
[% END %]
81
65
//]]>
82
//]]>
66
</script>
83
</script>
67
<style type="text/css">
84
<style type="text/css">
Lines 160-165 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
160
        [% END %]
177
        [% END %]
161
    [% END %]</tbody>
178
    [% END %]</tbody>
162
</table>
179
</table>
180
181
    <form method="post" action="z3950_search.pl" id="page_form" name="page_form" class="checkboxed">
182
        <input type="hidden" name="op" id="op" value="do_search" />
183
        <input type="hidden" name="current_page" id="current_page" value="[% current_page %]" />
184
        <input type="hidden" id="title"  name="title" value="[% title %]" />
185
        <input type="hidden" id="isbn" name="isbn" value="[% isbn %]" />
186
        <input type="hidden" id="lccall" name="lccall" value="[% lccall %]" />
187
        <input type="hidden" id="controlnumber" name="controlnumber" value="[% controlnumber %]" />
188
        <input type="hidden" id="srchany" name="srchany" value="[% srchany %]" />
189
        <input type="hidden" id="author" name="author" value="[% author %]" />
190
        <input type="hidden" id="subject" name="subject" value="[% subject %]" />
191
        <input type="hidden" id="dewey" name="dewey" value="[% dewey %]" />
192
        <input type="hidden" id="stdid" name="stdid" value="[% stdid %]" />
193
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
194
        <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
195
196
        [% FOREACH server IN servers %]
197
        <input type="hidden" name="id" id="z3950_[% server.id %]" value="[% server.id %]" />
198
        [% END %]
199
200
        [% IF ( show_prevbutton ) %]
201
            <input type="button" name="changepage_prev" value="Previous Page" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();" />
202
        [% END %]
203
        Page [% current_page %] / [% total_pages %]
204
        [% IF ( show_nextbutton ) %]
205
            <input type="button" name="changepage_next" value="Next Page" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();" />
206
        [% END %]
207
        <br />Go to page : <input id="goto_page" name="goto_page" value="[% current_page %]" size="4" /><input type="submit" name="changepage_goto" onclick="return validate_goto_page();" value="Go" />
208
    </form>
209
163
<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode %]"/><input type="submit" value="Try Another Search"/></form></p>
210
<p><form method="get" action="/cgi-bin/koha/cataloguing/z3950_search.pl"><input type="hidden" name="biblionumber" value="[% biblionumber %]"/><input type="hidden" name="frameworkcode" value="[% frameworkcode %]"/><input type="submit" value="Try Another Search"/></form></p>
164
    [% ELSE %]
211
    [% ELSE %]
165
        [% IF ( errconn ) %]
212
        [% IF ( errconn ) %]
166
- 

Return to bug 8570