X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=xml%2Fschema%2Fretrievalinfo.rnc;h=7270a7f9214c44e75ef2ce97812bfcd15a6c99bc;hb=a8f363a4b0d94a46640144e2d521c070f61e5b6e;hp=7af944de2bf6790de3724b50275d2d64e8fa13fa;hpb=b89c301421eb73bce1aa31b0ee1999069f13513f;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 7af944d..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.3 2006-11-30 23:10:26 marc Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (c) 2005-2008 Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -20,12 +19,23 @@
 # see also http://books.xmlschemata.org/relaxng/
 
 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
 
+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 { 
     attribute version { "1.0" },
@@ -33,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)*
       }?
     }+
   }