From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 12 Aug 2014 11:07:13 +0000 (+0200)
Subject: remove patch for zorba3-0.xqy; no longer necessary
X-Git-Tag: loc_1~2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=c7800919cfa7b346da5448c5d490fdc62afb4fa7;p=mp-xquery-moved-to-github.git

remove patch for zorba3-0.xqy; no longer necessary
---

diff --git a/bibframe/README b/bibframe/README
index d7fc77a..4c9edf1 100644
--- a/bibframe/README
+++ b/bibframe/README
@@ -27,16 +27,6 @@ of marc2bibframe . Do not move zorba3-0.xqy from its place within the
 marc2bibframe directory as other files are referred to and their relative
 location must be preserved.
 
-marcxml_raw.patch
------------------
-zorba3-0.xqy must be patched before it can be used by Metaproxy's XQuery
-module. This is because zorba3-0.xqy at this stage do not allow
-"in-memory" conversion of records. For this reason, patch zorba3-0.xqy as
-follows:
-  cd marc2bibframe/xbin
-  patch < ~pathto/marcxml_raw.patch
-
-
 cql2pqf.txt
 -----------
 Contains a simple DC/CQL profile for driving a CQL to RPN conversion.
diff --git a/bibframe/marcxml_raw.patch b/bibframe/marcxml_raw.patch
deleted file mode 100644
index 57fd0b0..0000000
--- a/bibframe/marcxml_raw.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/xbin/zorba3-0.xqy b/xbin/zorba3-0.xqy
-index ba07c2e..481950f 100644
---- a/xbin/zorba3-0.xqy
-+++ b/xbin/zorba3-0.xqy
-@@ -212,7 +212,11 @@ let $marcxml :=
-         let $json := http:get($marcxmluri)
-         return parsexml:parse($json("body")("content"), <parseoptions:options/>)
-     else
--        let $raw-data as xs:string := file:read-text($marcxmluri)
-+        let $raw-data :=
-+            if ( fn:starts-with($marcxmluri, "raw:" ) ) then
-+                fn:substring($marcxmluri, 5)
-+            else
-+                file:read-text($marcxmluri)
-         let $mxml := parsexml:parse(
-                     $raw-data, 
-                     <parseoptions:options />