From b89c301421eb73bce1aa31b0ee1999069f13513f Mon Sep 17 00:00:00 2001
From: Marc Cromme <marc@indexdata.dk>
Date: Thu, 30 Nov 2006 23:10:26 +0000
Subject: [PATCH] fixing relaxng-to-xmlschema translation error by new
 namespace for retirevalinfo and by choice between root
 elements metaproxy and retrievalinfo

---
 etc/retrieval-info.xml       |    4 ++--
 xml/schema/metaproxy.rnc     |    6 +++---
 xml/schema/retrievalinfo.rnc |   10 ++++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/etc/retrieval-info.xml b/etc/retrieval-info.xml
index d632bc6..d72fdfd 100644
--- a/etc/retrieval-info.xml
+++ b/etc/retrieval-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<!-- $Id: retrieval-info.xml,v 1.1 2006-11-29 21:43:37 marc Exp $ -->
-<retrievalinfo  xmlns="http://indexdata.com/metaproxy" version="1.0">
+<!-- $Id: retrieval-info.xml,v 1.2 2006-11-30 23:10:26 marc Exp $ -->
+<retrievalinfo  xmlns="http://indexdata.com/yaz" version="1.0">
   <retrieval syntax="grs-1"/>
   <retrieval syntax="usmarc" name="F"/>
   <retrieval syntax="usmarc" name="B"/>
diff --git a/xml/schema/metaproxy.rnc b/xml/schema/metaproxy.rnc
index 4e91ab7..4757eef 100644
--- a/xml/schema/metaproxy.rnc
+++ b/xml/schema/metaproxy.rnc
@@ -1,5 +1,5 @@
 # Metaproxy XML config file schemas
-#  $Id: metaproxy.rnc,v 1.9 2006-11-29 21:45:04 marc Exp $
+#  $Id: metaproxy.rnc,v 1.10 2006-11-30 23:10:26 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -22,9 +22,9 @@
 
 namespace mp = "http://indexdata.com/metaproxy"
 
-include "retrievalinfo.rnc"
+start |= metaproxy
 
-start = metaproxy
+include "retrievalinfo.rnc"
 
 metaproxy =
   element mp:metaproxy {
diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 62ec097..7af944d 100644
--- a/xml/schema/retrievalinfo.rnc
+++ b/xml/schema/retrievalinfo.rnc
@@ -1,5 +1,5 @@
 # Metaproxy XML config file schemas
-#  $Id: retrievalinfo.rnc,v 1.2 2006-11-29 21:43:38 marc Exp $
+#  $Id: retrievalinfo.rnc,v 1.3 2006-11-30 23:10:26 marc Exp $
 # 
 #   Copyright (c) 2005-2006, Index Data.
 # 
@@ -19,10 +19,12 @@
 # For information on RelaxNG see http://relaxng.org 
 # see also http://books.xmlschemata.org/relaxng/
 
-#namespace y = "http://indexdata.com/yaz"
-namespace y = "http://indexdata.com/metaproxy"
+namespace y = "http://indexdata.com/yaz"
+# need to be in different namespace then metaproxy, otherwise 
+# xslt element definition clashes in XML Schema files
+# namespace y = "http://indexdata.com/metaproxy"
 
-#start = retrievalinfo
+start |= retrievalinfo
 
 retrievalinfo = 
   element y:retrievalinfo { 
-- 
1.7.10.4