X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=xml%2Fschema%2Fretrievalinfo.rnc;h=d4a257383bdbe26008eae9aec2f1e1160c6184d6;hb=24037b116e6c6a46a477e973e60e5fe6030b46c3;hp=023fe8a02cdf8feb5f7a84b609015e821ebedc87;hpb=71995159f745f963fa5a38c169014b9d0e024af2;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 023fe8a..d4a2573 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.1 2006-11-29 14:49:20 marc Exp $
 # 
-#   Copyright (c) 2005-2006, Index Data.
+#   Copyright (C) 2005-2012 Index Data.
 # 
 #   See the LICENSE file for details
 # 
@@ -19,28 +18,48 @@
 # 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 },
+  attribute outputcharset { xsd:string }?,
+  attribute leaderspec { xsd:string }?
+}
+
+xslt = element y:xslt {
+  attribute stylesheet { xsd:string },
+  element y:param {
+  attribute name {xsd:string},
+  attribute value {xsd:string}
+  }*
+}
+
+usemarcon = element y:usemarcon {
+  attribute stage1 { xsd:string }?,
+  attribute stage2 { xsd:string }?
+}
 
 retrievalinfo = 
   element y:retrievalinfo { 
+    attribute version { "1.0" },
     element y:retrieval {
       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 | usemarcon)*
       }?
     }+
   }