Patch for bug #1236435

This is a multi-part message in MIME format.

------=WEBMAIL_ATT_0.453538674236373
Content-Type: text/plain; charset=iso-8859-1

Hi,

Regarding bug #1236435, here is a patch for htsearch/Display.cc.

The patch is similar to this one:
http://sourceforge.net/mailarchive/forum.php?thread_id=1377415&forum_id=2688

The patch I'm attaching has these features:

1. It provides a Google-style paging. Say the current page is 9,
maximum_page_buttons
is 10 and the number of pages matching the search is bigger than 30, we
get this
for PAGELIST:

[prev] 4 5 6 7 8 9 10 11 12 13 [next]

The current page is centered if possible.

2. If an insufficient number of pictures is provided, it mixes up
graphics and text:

[pic prev] [pic 4] [pic 5] [pic 6] [pic 7] [pic 8] [pic 9] [pic 10] 11
12 13 [pic next]

To install the patch, update htsearch/Display.cc, compile the code and copy
% cp htsearch/.lig/htsearch to your cgi-bin directory.

Jose


------=WEBMAIL_ATT_0.453538674236373
Content-Type: application/octet-stream;
	name="diff_Display_cc"
Content-Transfer-Encoding: base64

LS0tIERpc3BsYXkuY2MJMjAwNS0wNy0xMyAyMDoxMDoyNS4wMDAwMDAwMDAgLTA0MDAKKysrIERp
c3BsYXkuY2MuYmFjawkyMDA1LTA3LTEyIDIzOjExOjM5LjAwMDAwMDAwMCAtMDQwMApAQCAtNjk0
LDM4ICs2OTQsNiBAQCBEaXNwbGF5OjpzZXRWYXJpYWJsZXMoaW50IHBhZ2VOdW1iZXIsIExpCiAg
ICAgLy8KICAgICBpZiAoblBhZ2VzID4gMSkKICAgICB7Ci0gICAgICAgLy8gQXNzdW1lIG51bWJl
ciBvZiBwYWdlIGxpbmtzIGlzIGVxdWFsIHRvIG1heGltdW1fcGFnZV9idXR0b25zCi0gICAgICAg
Ly8gRm9yIGV4YW1wbGUsIGlmIHBhZ2VOdW1iZXI9OSwgbWF4aW11bV9wYWdlX2J1dHRvbnM9MTAs
Ci0gICAgICAgLy8gYW5kIG5QYWdlcz49MTMsIHdlIGdldDoKLSAgICAgICAvLwotICAgICAgIC8v
IFtwcmV2XSA0IDUgNiA3IDggOSAxMCAxMSAxMiAxMyBbbmV4dF0KLQotICAgICAgIGludCBuUGFn
ZUJ1dHRvbnMgPSBjb25maWctPlZhbHVlKCJtYXhpbXVtX3BhZ2VfYnV0dG9ucyIsIDEwKTsKLQkK
LSAgICAgICAvLyBJbml0aWFsaXplIGluZGV4ZXMgb2YgcGFnZXMgbGlua3MKLSAgICAgICBpbnQg
Zmlyc3RfcGFnZV9pbmRleCA9IDE7Ci0gICAgICAgaW50IGxhc3RfcGFnZV9pbmRleCAgPSBuUGFn
ZXM7Ci0KLSAgICAgICBpZiAoblBhZ2VzID4gblBhZ2VCdXR0b25zKSAKLSAgICAgICB7Ci0gICAg
ICAgICAgLy8gVHJ5IHRvIGNlbnRlciB0aGUgY3VycmVudCBwYWdlCi0gICAgICAgICAgaW50IGxp
bmtzX29uX3RoZV9sZWZ0ID0gblBhZ2VCdXR0b25zLzI7Ci0gICAgICAgICAgZmlyc3RfcGFnZV9p
bmRleCA9IHBhZ2VOdW1iZXIgLSBsaW5rc19vbl90aGVfbGVmdDsKLSAgICAgICAgICBsYXN0X3Bh
Z2VfaW5kZXggID0gZmlyc3RfcGFnZV9pbmRleCArIG5QYWdlQnV0dG9ucyAtIDE7Ci0KLSAgICAg
ICAgICAvLyBBZGp1c3QgaWYgcmVxdWlyZWQKLSAgICAgICAgICBpZiAoZmlyc3RfcGFnZV9pbmRl
eCA8IDEpIAotICAgICAgICAgIHsKLSAgICAgICAgICAgICBmaXJzdF9wYWdlX2luZGV4ID0gMTsK
LSAgICAgICAgICAgICBsYXN0X3BhZ2VfaW5kZXggID0gblBhZ2VCdXR0b25zOwotICAgICAgICAg
IH0KLSAgICAgICAgICBlbHNlIGlmIChsYXN0X3BhZ2VfaW5kZXggPiBuUGFnZXMgKQotICAgICAg
ICAgIHsKLSAgICAgICAgICAgICBsYXN0X3BhZ2VfaW5kZXggID0gblBhZ2VzOwotICAgICAgICAg
ICAgIGZpcnN0X3BhZ2VfaW5kZXggPSBuUGFnZXMgLSBuUGFnZUJ1dHRvbnMgKyAxOwotICAgICAg
ICAgIH0KLSAgICAgICB9Ci0KIAlpZiAocGFnZU51bWJlciA+IDEpCiAJewogCSAgICBzdHIgPSBu
ZXcgU3RyaW5nKCI8YSBocmVmPVwiIik7CkBAIC03NTcsOCArNzI1LDkgQEAgRGlzcGxheTo6c2V0
VmFyaWFibGVzKGludCBwYWdlTnVtYmVyLCBMaQogCVF1b3RlZFN0cmluZ0xpc3QJcG50KGNvbmZp
Zy0+RmluZCgicGFnZV9udW1iZXJfdGV4dCIpLCAiIFx0XHJcbiIpOwogCVF1b3RlZFN0cmluZ0xp
c3QJbnBudChjb25maWctPkZpbmQoIm5vX3BhZ2VfbnVtYmVyX3RleHQiKSwgIiBcdFxyXG4iKTsK
IAlRdW90ZWRTdHJpbmdMaXN0CXNlcChjb25maWctPkZpbmQoInBhZ2VfbnVtYmVyX3NlcGFyYXRv
ciIpLCAiIFx0XHJcbiIpOwotCi0JZm9yIChpID0gZmlyc3RfcGFnZV9pbmRleDsgaSA8PSBsYXN0
X3BhZ2VfaW5kZXg7IGkrKykKKwlpZiAoblBhZ2VzID4gY29uZmlnLT5WYWx1ZSgibWF4aW11bV9w
YWdlX2J1dHRvbnMiLCAxMCkpCisJICAgIG5QYWdlcyA9IGNvbmZpZy0+VmFsdWUoIm1heGltdW1f
cGFnZV9idXR0b25zIiwgMTApOworCWZvciAoaSA9IDE7IGkgPD0gblBhZ2VzOyBpKyspCiAJewog
CSAgICBpZiAoaSA9PSBwYWdlTnVtYmVyKQogCSAgICB7Cg==

------=WEBMAIL_ATT_0.453538674236373--


-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
ht://Dig Developer mailing list:
[email protected]
List information (subscribe/unsubscribe, etc.)
https://lists.sourceforge.net/lists/listinfo/htdig-dev