X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=xml%2Fschema%2Fretrievalinfo.rnc;h=7270a7f9214c44e75ef2ce97812bfcd15a6c99bc;hb=8521d17ae94153b0613ec767f2f766b0dbb2429a;hp=62ec0973da6b83db9d45820b7b3a09b270edabf2;hpb=6c0547158e19d7cfcc7379ae1c14420fb4cfff37;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 62ec097..7270a7f 100644
--- a/xml/schema/retrievalinfo.rnc
+++ b/xml/schema/retrievalinfo.rnc
@@ -1,7 +1,6 @@
 # Metaproxy XML config file schemas
-#  $Id: retrievalinfo.rnc,v 1.2 2006-11-29 21:43:38 marc Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (c) 2005-2008 Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -19,10 +18,23 @@
 # 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"
 
-#start = retrievalinfo
+# 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
+
+marc = element y:marc {
+  attribute inputformat { xsd:string },
+  attribute outputformat { xsd:string },
+  attribute inputcharset { xsd:string }
+}
+
+xslt = element y:xslt {
+  attribute stylesheet { xsd:string }
+}
 
 retrievalinfo = 
   element y:retrievalinfo { 
@@ -31,17 +43,12 @@ retrievalinfo =
       attribute syntax { xsd:string },
       attribute name { xsd:string }?,
       attribute identifier { xsd:string }?,
-      attribute backendsyntax { xsd:string }?,
-      attribute backendname { xsd:string }?,
-      element y:convert {
-        element y:marc {
-          attribute inputformat { xsd:string },
-          attribute outputformat { xsd:string },
-          attribute inputcharset { xsd:string }
-        },
-        element y:xslt {
-          attribute stylesheet { xsd:string }
-        }?
+      #attribute backendsyntax { xsd:string }?,
+      #attribute backendname { xsd:string }?,
+      element y:backend {
+      attribute syntax { xsd:string },
+      attribute name { xsd:string }?,
+      (marc | xslt)*
       }?
     }+
   }