OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 24-Nov-2005 10:39:57
Branch: HEAD Handle: 2005112409395700
Modified files:
openpkg-registry register.sh registry-ui.pl
Log:
send DOCTYPE to server although DTD validation is not implemented, yet
Summary:
Revision Changes Path
1.3 +8 -8 openpkg-registry/register.sh
1.4 +4 -0 openpkg-registry/registry-ui.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/register.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 register.sh
--- openpkg-registry/register.sh 19 Nov 2005 22:13:07 -0000 1.2
+++ openpkg-registry/register.sh 24 Nov 2005 09:39:57 -0000 1.3
@@ -29,8 +29,8 @@
# program name, version and date
progname="register"
-progvers="0.0.16"
-progdate="19-Nov-2005"
+progvers="0.0.23"
+progdate="24-Nov-2005"
# determine path to OpenPKG instance
PREFIX="@l_prefix@"
@@ -258,9 +258,9 @@
(
echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"
standalone=\"no\"?>"
- #FIXME echo "<!DOCTYPE registry"
- #FIXME echo " PUBLIC \"-//OpenPKG//DTD OpenPKG Registry 0.0.1//EN\""
- #FIXME echo " \"http://registry.openpkg.org/registry.dtd\"; []>"
+ echo "<!DOCTYPE registry"
+ echo " PUBLIC \"-//OpenPKG//DTD OpenPKG Registry 0.0.1//EN\""
+ echo " \"http://registry.openpkg.org/registry.dtd\"; []>"
echo "<registry>"
echo " <request id=\"$UUID_REGISTRY\""
echo " registry_user=\"$REGISTRY_USER\""
@@ -309,9 +309,9 @@
(
echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"
standalone=\"no\"?>"
- #FIXME echo "<!DOCTYPE registry"
- #FIXME echo " PUBLIC \"-//OpenPKG//DTD OpenPKG Registry
0.0.1//EN\""
- #FIXME echo " \"http://registry.openpkg.org/registry.dtd\"; []>"
+ echo "<!DOCTYPE registry"
+ echo " PUBLIC \"-//OpenPKG//DTD OpenPKG Registry 0.0.1//EN\""
+ echo " \"http://registry.openpkg.org/registry.dtd\"; []>"
echo "<registry>"
echo " <response id=\"$request\" done=\"yes\">fake</response>"
echo "</registry>"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-registry/registry-ui.pl
============================================================================
$ cvs diff -u -r1.3 -r1.4 registry-ui.pl
--- openpkg-registry/registry-ui.pl 22 Nov 2005 11:30:15 -0000 1.3
+++ openpkg-registry/registry-ui.pl 24 Nov 2005 09:39:57 -0000 1.4
@@ -1156,6 +1156,10 @@
return $html;
}
+ # Check DTD
+ # FIXME currently we just drop it!
+ $data =~ s|<!DOCTYPE registry[^>]*>||s;
+
my $ref = eval { local $SIG{__DIE__}; XMLin($data, ForceArray => 1) };
if ($@) {
$msg = $@;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
