CORRECTION TO EARLIER PATCH ATTACHED.
On Mon, Sep 05, 2005 at 05:55:43AM -0600, wrote:
> On Mon, Sep 05, 2005 at 12:25:01AM +0300, Mattias Nordstrom wrote:
> > If you checkout CVS, use the EMILDA_1_2_BRANCH to get the latest
> > _stable_ version. You can do that by adding -r EMILDA_1_2_BRANCH to
> > the cvs checkout command. The debian package differs in many places
> > from the source distribution. You may want to just patch the required
> > files of your debian installation instead of checking out the whole
> > thing.
> >
> > Download the patch from:
> >
> > http://people.realnode.com/~mnordstr/emilda/emilda-encodings.patch
> >
> > and save it in your /usr/share/emilda directory. Enter that directory
> > and type:
> >
> > patch -p1 < emilda-encodings.patch
>
> This probably won't apply cleanly to the debian package.
>
> I notice that there is a version change in the patch:
>
> +define("VERSION", "1.2.3.1");
>
> Will there be a new Emilda release to reflect this patch? If/when that
> happens, I can produce the equivalent debian package upgrade.
>
> > That should update your debian package to support encodings. Remember to
> > update the lib/MARC.inc file with your Z39.50 info.
>
> The Debian package keeps its configuration in /etc (in this instance it
> would be /etc/emilda/z3950-servers.ini and is not represented as php
> source code but in .ini format).
>
> I'm attaching a modified patch to account for the emilda 1.2.3-3 debian
> package.
>
> To apply it, do the following:
>
> cd /usr/share/emilda
> patch -p1 < /path/to/debian-emilda-encodings.patch
>
> In addition, you need to add an RDB_ENCODINGS section and the
> appropriate lines within that section to your
> /etc/emilda/z3950-servers.ini file. For instance:
>
> [RDB_ENCODINGS]
>
> '193.166.7.194:11391/Voyager' = "utf-8,iso-8859-15"
> '193.166.7.194:11191/Voyager' = "utf-8,iso-8859-15"
>
>
> --
> Encrypted Mail Preferred:
> Key ID: 8527B9AF
> Key Fingerprint: E1B6 40B6 B73F 695E 0D3B 644E 6427 DD74 8527 B9AF
> Information: http://www.gnupg.org/
>
>
> ASCII ribbon campaign:
> () against HTML email
> /\ against Microsoft attachments
> Information: http://www.expita.com/nomime.html
> diff -u src/lib/MARC.inc src_latest/lib/MARC.inc
> --- src/lib/MARC.inc 2005-06-29 14:00:10.000000000 +0300
> +++ src_latest/lib/MARC.inc 2005-08-10 15:07:56.000000000 +0300
> @@ -557,9 +557,12 @@
> }
> }
>
> - function Record($v, $p) {
> + function Record($v, $p, $encoding = "") {
> $good = array();
> - $array = yaz_record($v, $p, "array");
> + if (!empty($encoding)) {
> + $encoding = "; charset=".$encoding; //utf-8,iso-8859-15
> + }
> + $array = yaz_record($v, $p, "array".$encoding);
> // Preform map function on the input array
> array_map(array(&$this, "__initmap"), $array);
> }
> diff -u src/lib/constants.inc src_latest/lib/constants.inc
> --- src/lib/constants.inc 2005-06-29 14:00:48.000000000 +0300
> +++ src_latest/lib/constants.inc 2005-08-10 12:10:18.000000000 +0300
> @@ -35,12 +35,12 @@
> //
>
> //-----------------------------------------------------------------------------
> //
> -// $Id: constants.inc,v 1.52.2.6 2005/06/29 11:00:48 mnordstr Exp $
> +// $Id: constants.inc,v 1.52.2.7 2005/08/10 09:10:18 mnordstr Exp $
> //
>
> //-----------------------------------------------------------------------------
>
> define("RELEASE", "STABLE"); // CVS/STABLE/PRE
> -define("VERSION", "1.2.3");
> +define("VERSION", "1.2.3.1");
> define("SOFTWARE", "Emilda");
> define("VENDOR", "Oy Realnode Ab");
>
> diff -u src/lib/search.inc src_latest/lib/search.inc
> --- src/lib/search.inc 2005-05-31 11:36:36.000000000 +0300
> +++ src_latest/lib/search.inc 2005-08-10 12:20:22.000000000 +0300
> @@ -35,7 +35,7 @@
> //
>
> //-----------------------------------------------------------------------------
> //
> -// $Id: search.inc,v 1.80.2.1 2005/05/31 08:36:36 mnordstr Exp $
> +// $Id: search.inc,v 1.80.2.3 2005/08/10 09:20:22 mnordstr Exp $
> //
>
> //-----------------------------------------------------------------------------
>
> @@ -180,7 +180,12 @@
> $this->position++;
> // If we are inside the given boundaries
> if($this->position <= $this->hits && $this->incremental++ <
> $limit) {
> - return new Record($this->yaz_id, $this->position);
> + $encoding = "";
> + global $RDB_ENCODINGS;
> + if (isset($RDB_ENCODINGS[$this->host])) {
> + $encoding = $RDB_ENCODINGS[$this->host];
> + }
> + return new Record($this->yaz_id, $this->position,
> $encoding);
> //return yaz_record($this->yaz_id, $i, "array");
> } else {
> // The next time next() is called, we want to restart.
--
Encrypted Mail Preferred:
Key ID: 8527B9AF
Key Fingerprint: E1B6 40B6 B73F 695E 0D3B 644E 6427 DD74 8527 B9AF
Information: http://www.gnupg.org/
ASCII ribbon campaign:
() against HTML email
/\ against Microsoft attachments
Information: http://www.expita.com/nomime.html
debian-emilda-encodings.patch
Description: Text document
_______________________________________________
Emilda mailing list
Emilda@xxxxxxxxxxxxxxxxxx
http://lists.realnode.com/mailman/listinfo/emilda
|
