X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=xml%2Fschema%2Fretrievalinfo.rnc;h=3e75da20975c5a58b0497f97a6157a2d34dcf931;hb=a309e13d47573bc16aaa531668ea9d02ca3f28a4;hp=7270a7f9214c44e75ef2ce97812bfcd15a6c99bc;hpb=b464a978592dda551de0897b149f29a08575c98d;p=metaproxy-moved-to-github.git

diff --git a/xml/schema/retrievalinfo.rnc b/xml/schema/retrievalinfo.rnc
index 7270a7f..3e75da2 100644
--- a/xml/schema/retrievalinfo.rnc
+++ b/xml/schema/retrievalinfo.rnc
@@ -1,39 +1,28 @@
-# Metaproxy XML config file schemas
-# 
-#   Copyright (c) 2005-2008 Index Data.
-# 
-#   See the LICENSE file for details
-# 
-# 
-# The RelaxNG Compact Syntax file 'retrievalinfo.rnc' is the master copy.
-# 
-# The RelaxNG XML Syntax and XML Schema are generated using 'trang':
-# trang retrievalinfo.rnc retrievalinfo.rng 
-# trang retrievalinfo.rnc retrievalinfo.xsd 
-# 
-# Config file validation is done using 'xmllint':
-# xmllint -/-relaxng retrievalinfo.rng retrievalinfo.xml 
-# xmllint -/-schema retrievalinfo.xsd retirevalinfo.xml
-# 
-# For information on RelaxNG see http://relaxng.org 
-# see also http://books.xmlschemata.org/relaxng/
+# Schema for YAZ retrieval info and USEMARCON extension
 
 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 }
+  attribute inputcharset { xsd:string },
+  attribute outputcharset { xsd:string }?,
+  attribute leaderspec { xsd:string }?
 }
 
 xslt = element y:xslt {
-  attribute stylesheet { xsd:string }
+  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 = 
@@ -48,7 +37,7 @@ retrievalinfo =
       element y:backend {
       attribute syntax { xsd:string },
       attribute name { xsd:string }?,
-      (marc | xslt)*
+      (marc | xslt | usemarcon)*
       }?
     }+
   }