Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Nov 2014 14:15:33 -0700 (MST)
From:      Warren Block <wblock@wonkity.com>
To:        Li-Wen Hsu <lwhsu@FreeBSD.org>
Cc:        "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>
Subject:   Re: Documentation testing and textproc/igor
Message-ID:  <alpine.BSF.2.11.1411171406460.65992@wonkity.com>
In-Reply-To: <CAKBkRUwpwvS8tYUHE-K9tjV1rxkpo3xSmgysPb_W6wsZASWjtg@mail.gmail.com>
References:  <alpine.BSF.2.11.1411151919590.24432@wonkity.com> <CAG=rPVc2me%2B5vOcRfcC9-dB_AZSmmaC3APQdyQLS3b3u3ZJyrQ@mail.gmail.com> <alpine.BSF.2.11.1411160820100.93232@wonkity.com> <CAG=rPVdB6bgiX-riCwAvowsxGUBbstNpL8gqMzY_BV9KVam0hQ@mail.gmail.com> <CAKBkRUy7w_uhsVapbyhzbCM9v3sXg9kBRxBKSswHCXyjG7qZsw@mail.gmail.com> <CAKBkRUwpwvS8tYUHE-K9tjV1rxkpo3xSmgysPb_W6wsZASWjtg@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

--3512871622-1326637320-1416258933=:65992
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed

On Tue, 18 Nov 2014, Li-Wen Hsu wrote:

> The job is created:
>
>    https://jenkins.freebsd.org/jenkins/view/FreeBSD_doc/job/FreeBSD_Doc-igor/
>
> Please note that the current version of igor generates malformed xml.
> The job currently is using igor with a quick fix:
>
>    https://gist.github.com/lwhsu/7fddad9b4ce674a447d2
>
> Maybe we should modify xmlize() to use a perl module that supports xml-output?

I'd prefer to avoid dependencies for just that small routine.  Also, it 
seems fairly obvious now that those should be ampersands rather than 
dollar signs.  No idea what I was thinking back then.  Anyway, patch 
attached and included inline:


Index: igor
===================================================================
--- igor	(revision 510)
+++ igor	(working copy)
@@ -387,8 +387,10 @@

  sub xmlize {
  	my $txt = shift;
-	$txt =~ s/'/\$apos;/g;
-	$txt =~ s/"/\$quot;/g;
+	$txt =~ s/'/&apos;/g;
+	$txt =~ s/"/&quot;/g;
+	$txt =~ s/</&lt;/g;
+	$txt =~ s/>/&gt;/g;
  	return $txt;
  }

--3512871622-1326637320-1416258933=:65992
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=igor-xmlize.diff
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.BSF.2.11.1411171415330.65992@wonkity.com>
Content-Description: 
Content-Disposition: attachment; filename=igor-xmlize.diff

SW5kZXg6IGlnb3INCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBpZ29y
CShyZXZpc2lvbiA1MTApDQorKysgaWdvcgkod29ya2luZyBjb3B5KQ0KQEAg
LTM4Nyw4ICszODcsMTAgQEANCiANCiBzdWIgeG1saXplIHsNCiAJbXkgJHR4
dCA9IHNoaWZ0Ow0KLQkkdHh0ID1+IHMvJy9cJGFwb3M7L2c7DQotCSR0eHQg
PX4gcy8iL1wkcXVvdDsvZzsNCisJJHR4dCA9fiBzLycvJmFwb3M7L2c7DQor
CSR0eHQgPX4gcy8iLyZxdW90Oy9nOw0KKwkkdHh0ID1+IHMvPC8mbHQ7L2c7
DQorCSR0eHQgPX4gcy8+LyZndDsvZzsNCiAJcmV0dXJuICR0eHQ7DQogfQ0K
IA0K

--3512871622-1326637320-1416258933=:65992--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.11.1411171406460.65992>