exist-commits Mailing List for eXist-db

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10910
          http://exist.svn.sourceforge.net/exist/?rev=10910&view=rev
Author:   cutlass
Date:     2009-12-30 19:49:28 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
ripping out some guts to implement params and options

Modified Paths:
--------------
    trunk/eXist/extensions/xprocxq/main/etc/pipeline-optional.xml
    trunk/eXist/extensions/xprocxq/main/etc/pipeline-standard.xml
    trunk/eXist/extensions/xprocxq/main/etc/xproc-component.xml
    trunk/eXist/extensions/xprocxq/main/src/xquery/naming.xqm
    trunk/eXist/extensions/xprocxq/main/src/xquery/std.xqm
    trunk/eXist/extensions/xprocxq/main/src/xquery/util.xqm
    trunk/eXist/extensions/xprocxq/main/src/xquery/xproc.xqm

Modified: trunk/eXist/extensions/xprocxq/main/etc/pipeline-optional.xml
===================================================================

--- trunk/eXist/extensions/xprocxq/main/etc/pipeline-optional.xml	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/etc/pipeline-optional.xml	2009-12-30 19:49:28 UTC (rev 10910)
@@ -36,7 +36,7 @@
       <p:output port="result" primary="true" select="/"/>
       <p:input port="parameters" kind="parameter" select="/"/>
       <p:option name="value" required="true"/>
-      <p:option name="algorithm" required="true" select="'md5'"/>
+      <p:option name="algorithm" required="true"/>
       <p:option name="version"/>
       <p:option name="match" required="true"/>
    </p:declare-step>

Modified: trunk/eXist/extensions/xprocxq/main/etc/pipeline-standard.xml
===================================================================
--- trunk/eXist/extensions/xprocxq/main/etc/pipeline-standard.xml	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/etc/pipeline-standard.xml	2009-12-30 19:49:28 UTC (rev 10910)
@@ -8,7 +8,7 @@
       <p:option name="attribute-name" required="true"/>
       <p:option name="attribute-value" required="true"/>
    </p:declare-step>
-   <p:declare-step type="p:add-xml-base" xml:id="add-xml-base">
+   <p:declare-step type="p:add-xml-base" xml:id="add-xml-base" xmlns:xproc="http://xproc.net/xproc"  xproc:support="true">
       <p:input port="source" primary="true" select="/"/>
       <p:output port="result" primary="true" select="/"/>
       <p:option name="all" select="'false'"/>

Modified: trunk/eXist/extensions/xprocxq/main/etc/xproc-component.xml
===================================================================
--- trunk/eXist/extensions/xprocxq/main/etc/xproc-component.xml	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/etc/xproc-component.xml	2009-12-30 19:49:28 UTC (rev 10910)
@@ -52,7 +52,7 @@
    
 <!-- Input alternatives //-->    
 
-    <xproc:element type="p:iteration-source" xproc:support="false"/>
+    <xproc:element type="p:iteration-source" xproc:support="true"/>
     <xproc:element type="p:viewport-source" xproc:support="false"/>
     <xproc:element type="p:xpath-context" xproc:support="false"/>
 
@@ -65,7 +65,7 @@
     <xproc:element type="p:option" xproc:support="true"/>            
     <xproc:element type="p:with-option" xproc:support="true"/>            
     <xproc:element type="p:with-param"/>            
-    <xproc:element type="p:variable"/>            
+    <xproc:element type="p:variable" xproc:support="true"/>            
 
 <!-- //-->    
 

Modified: trunk/eXist/extensions/xprocxq/main/src/xquery/naming.xqm
===================================================================
--- trunk/eXist/extensions/xprocxq/main/src/xquery/naming.xqm	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/src/xquery/naming.xqm	2009-12-30 19:49:28 UTC (rev 10910)
@@ -318,8 +318,12 @@
                for $import in $xproc/*/p:import
                 return
                     if (doc-available($import/@href)) then
-                          (: TODO - add file: support :)
-                          doc($import/@href)/p:library/*
+                    let $imported := doc($import/@href)
+                    return
+                          if ($imported/p:library)then
+                            $imported/p:library/*
+                          else
+                            $imported/p:pipeline/*
                     else
                           u:dynamicError('XD0002',"cannot import pipeline document ")
             }

Modified: trunk/eXist/extensions/xprocxq/main/src/xquery/std.xqm
===================================================================
--- trunk/eXist/extensions/xprocxq/main/src/xquery/std.xqm	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/src/xquery/std.xqm	2009-12-30 19:49:28 UTC (rev 10910)
@@ -77,37 +77,17 @@
 
 (: -------------------------------------------------------------------------- :)
 declare function std:add-xml-base($primary,$secondary,$options) {
-
-(: TODO: need to refactor to pass in pipeline uri and any external input uri :)
-
 let $v := u:get-primary($primary)
-let $all := xs:boolean(u:get-option('all',$options,$v))
-let $relative := xs:boolean(u:get-option('relative',$options,$v))
-let $attrNames := xs:QName('xml:base')
-let $attrValues := base-uri($v) 
-
+let $all := u:get-option('all',$options,$v)
+let $relative := u:get-option('relative',$options,$v)
+let $matchresult := u:evalXPATH('//*', $v, $primary)
+let $attribute-name := "xml:base"
+let $attribute-value := base-uri($v)
 return
-    if ($all) then
-    for $element in $v/*
-       return element { node-name($element)}
-                      { for $attrName at $seq in $attrNames
-                        return if ($element/@*[node-name(.) = $attrName])
-                               then ()
-                               else attribute {$attrName}
-                                              {$attrValues[$seq]},
-                        $element/@*,
-                        $element/node() }
-else
-    for $element in $v/*
-       return element { node-name($element)}
-                      { for $attrName at $seq in $attrNames
-                        return if ($element/@*[node-name(.) = $attrName])
-                               then ()
-                               else attribute {$attrName}
-                                              {$attrValues[$seq]},
-                        $element/@*,
-                        $element/node() }
-};
+<test uri="{$attribute-value}">{$v}</test>
+(:
+	u:add-attribute-matching-elements($v,$matchresult,$attribute-name,$attribute-value)
+:)};
 
 
 (: -------------------------------------------------------------------------- :)
@@ -233,10 +213,11 @@
 
 (: -------------------------------------------------------------------------- :)
 declare function std:filter($primary,$secondary,$options) {
+(: TODO - broken :)
 u:assert(exists($options/p:with-option[@name='select']/@select),'p:with-option match is required'),
 let $v := u:get-primary($primary)
 let $select := string(u:get-option('select',$options,$v))
-let $result := u:safe-evalXPATH($select, $v, $primary)
+let $result := u:evalXPATH($select, $v, $primary)
     return
         if(exists($result)) then
         	$result
@@ -396,7 +377,10 @@
 
     for $child at $count in $v
     return
-	    element {$wrapper}{$child,$alternate[$count]}
+	    element {$wrapper}{
+	        $child,
+	        $alternate
+	    }
 };
 
 
@@ -565,26 +549,28 @@
 
 (: -------------------------------------------------------------------------- :)
 declare function std:unwrap($primary,$secondary,$options) {
-let $v := u:get-primary($primary)
-let $match := u:get-option('match',$options,$v)
-let $query := if (contains($match,'/')) then
-				$match
-			  else
-				concat('//',$match)
-let $matchresult := u:evalXPATH($query, $v, $primary)
-return
-	u:unwrap-matching-elements($v/*,$matchresult)
+    let $v := u:get-primary($primary)
+    let $match := u:get-option('match',$options,$v)
+    let $query := if (contains($match,'/')) then
+                    $match
+                  else
+                    concat('//',$match)
+    let $matchresult := u:evalXPATH($query, $v, $primary)
+    return
+        u:unwrap-matching-elements($v/*,$matchresult)
 };
 
 
 (: -------------------------------------------------------------------------- :)
 declare function std:xslt($primary,$secondary,$options){
-
     u:assert(exists($secondary/xproc:input[@port='stylesheet']/*),'stylesheet is required'),
 	let $v := u:get-primary($primary)
     let $stylesheet := u:get-secondary('stylesheet',$secondary)
     return
+    $v
+    (:
         u:xslt($stylesheet,$v)
+:)
 };
 
 

Modified: trunk/eXist/extensions/xprocxq/main/src/xquery/util.xqm
===================================================================
--- trunk/eXist/extensions/xprocxq/main/src/xquery/util.xqm	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/src/xquery/util.xqm	2009-12-30 19:49:28 UTC (rev 10910)
@@ -32,6 +32,13 @@
 (: -------------------------------------------------------------------------- :)
 (: manage namespaces                                                          :)
 (: -------------------------------------------------------------------------- :)
+
+
+declare function u:declarens($element){
+    u:declare-ns(u:enum-ns($element))
+};
+
+
 declare function u:declare-ns($namespaces){
     for $ns in $namespaces//ns
     return
@@ -217,9 +224,10 @@
 
 let $option := xs:string($options/*[@name=$option-name]/@select)
 return
+	(: TODO - if required this could be an error :)
     if (empty($option)) then
-		(: TODO - if required this could be an error :)
         ()
+    (: TODO- need to remove this branch at some point :)
     else if(contains($option,"'")) then
     	string(replace($option,"'",""))
     else
@@ -323,6 +331,8 @@
                 concat('.',$query)
 			  else if(contains($query,'(/')) then
 				replace($query,'\(/','(./')
+              else if($query eq '') then
+			    u:dynamicError('err:XD0001','query is empty and/or XProc step is not supported')
               else
                   $query
     let $result := util:eval($qry)   

Modified: trunk/eXist/extensions/xprocxq/main/src/xquery/xproc.xqm
===================================================================
--- trunk/eXist/extensions/xprocxq/main/src/xquery/xproc.xqm	2009-12-30 19:48:14 UTC (rev 10909)
+++ trunk/eXist/extensions/xprocxq/main/src/xquery/xproc.xqm	2009-12-30 19:49:28 UTC (rev 10910)
@@ -57,7 +57,10 @@
 (: -------------------------------------------------------------------------- :)
 declare function xproc:for-each($primary,$secondary,$options,$currentstep,$outputs) {
 (: -------------------------------------------------------------------------- :)
- let $v := u:get-primary($primary)
+ let $v := if ($currentstep/p:for-each/p:iteration-source/@select) then
+                u:evalXPATH(string($currentstep/p:iteration-source/@select), u:get-primary($primary), $primary)
+            else
+                u:get-primary($primary)
  let $defaultname := concat(string($currentstep/@xproc:defaultname),'.0')
  let $subpipeline := $currentstep/node()
  let $namespaces := xproc:enum-namespaces($subpipeline)
@@ -74,6 +77,7 @@
                     {$child}
                   </xproc:output>
     return
+
         (u:call($xproc:parse-and-eval,<p:declare-step name="{$defaultname}" xproc:defaultname="{$defaultname}" >
         {$subpipeline}</p:declare-step>,$namespaces,$child,(),($outputs,$iteration-source))/.)[last()]/node()
  };
@@ -476,8 +480,14 @@
             attribute xproc:escape{'true'}
         else
             (),
-        if (contains($child/@href,'file:')) then
+        if (starts-with($child/@href,'file:')) then
               util:binary-doc($child/@href)
+        else if (ends-with($child/@href,'.xml')) then
+        let $result :=  doc($child/@href)
+        let $namespaces := u:declare-ns(xproc:enum-namespaces($result))
+        return
+          $result
+        
         else
 	            util:binary-to-string(util:binary-doc($child/@href))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2004	Jan	Feb	Mar (57)	Apr (103)	May (164)	Jun (139)	Jul (173)	Aug (196)	Sep (221)	Oct (333)	Nov (214)	Dec (88)
2005	Jan (163)	Feb (165)	Mar (98)	Apr (93)	May (199)	Jun (118)	Jul (200)	Aug (212)	Sep (185)	Oct (297)	Nov (437)	Dec (272)
2006	Jan (542)	Feb (329)	Mar (267)	Apr (332)	May (267)	Jun (130)	Jul (161)	Aug (348)	Sep (166)	Oct (305)	Nov (173)	Dec (173)
2007	Jan (199)	Feb (118)	Mar (133)	Apr (200)	May (208)	Jun (146)	Jul (198)	Aug (146)	Sep (187)	Oct (182)	Nov (181)	Dec (83)
2008	Jan (252)	Feb (124)	Mar (124)	Apr (101)	May (143)	Jun (122)	Jul (129)	Aug (60)	Sep (80)	Oct (89)	Nov (54)	Dec (112)
2009	Jan (88)	Feb (145)	Mar (105)	Apr (164)	May (123)	Jun (154)	Jul (374)	Aug (341)	Sep (219)	Oct (137)	Nov (373)	Dec (240)
2010	Jan (197)	Feb (270)	Mar (253)	Apr (150)	May (102)	Jun (51)	Jul (300)	Aug (512)	Sep (254)	Oct (258)	Nov (288)	Dec (143)
2011	Jan (238)	Feb (179)	Mar (253)	Apr (332)	May (248)	Jun (255)	Jul (216)	Aug (282)	Sep (146)	Oct (77)	Nov (86)	Dec (69)
2012	Jan (172)	Feb (234)	Mar (229)	Apr (101)	May (212)	Jun (267)	Jul (129)	Aug (210)	Sep (239)	Oct (271)	Nov (368)	Dec (220)
2013	Jan (179)	Feb (155)	Mar (59)	Apr (47)	May (99)	Jun (158)	Jul (185)	Aug (16)	Sep (16)	Oct (7)	Nov (20)	Dec (12)
2014	Jan (21)	Feb (17)	Mar (18)	Apr (13)	May (27)	Jun (15)	Jul (19)	Aug (22)	Sep (30)	Oct (16)	Nov (19)	Dec (16)
2015	Jan (14)	Feb (24)	Mar (33)	Apr (41)	May (14)	Jun (80)	Jul (53)	Aug (8)	Sep (7)	Oct (15)	Nov (13)	Dec (2)
2016	Jan (22)	Feb (12)	Mar (30)	Apr (6)	May (33)	Jun (16)	Jul (8)	Aug (20)	Sep (12)	Oct (18)	Nov (12)	Dec (11)
2017	Jan (24)	Feb (26)	Mar (47)	Apr (23)	May (19)	Jun (14)	Jul (28)	Aug (30)	Sep (17)	Oct	Nov	Dec
2019	Jan (1)	Feb (73)	Mar (90)	Apr (42)	May (116)	Jun (90)	Jul (127)	Aug (103)	Sep (56)	Oct (42)	Nov (95)	Dec (58)
2020	Jan (102)	Feb (31)	Mar (93)	Apr (60)	May (57)	Jun (45)	Jul (29)	Aug (32)	Sep (44)	Oct (86)	Nov (51)	Dec (71)
2021	Jan (44)	Feb (25)	Mar (78)	Apr (130)	May (64)	Jun (74)	Jul (21)	Aug (64)	Sep (40)	Oct (43)	Nov (21)	Dec (99)
2022	Jan (154)	Feb (64)	Mar (45)	Apr (95)	May (62)	Jun (48)	Jul (73)	Aug (37)	Sep (71)	Oct (27)	Nov (40)	Dec (65)
2023	Jan (89)	Feb (130)	Mar (124)	Apr (50)	May (93)	Jun (46)	Jul (45)	Aug (68)	Sep (62)	Oct (71)	Nov (108)	Dec (82)
2024	Jan (53)	Feb (76)	Mar (64)	Apr (75)	May (36)	Jun (54)	Jul (98)	Aug (137)	Sep (58)	Oct (177)	Nov (84)	Dec (52)
2025	Jan (70)	Feb (53)	Mar (72)	Apr (47)	May (88)	Jun (49)	Jul (86)	Aug (51)	Sep (65)	Oct (91)	Nov (18)	Dec

S	M	T	W	T	F	S
		1 (6)	2 (16)	3 (3)	4 (1)	5 (1)
6 (23)	7	8	9	10	11 (7)	12 (1)
13 (4)	14	15 (33)	16 (11)	17 (15)	18 (20)	19 (3)
20 (14)	21 (4)	22 (10)	23 (27)	24 (6)	25 (2)	26 (10)
27 (3)	28 (11)	29	30 (9)	31

exist-commits Mailing List for eXist-db

eXist-db is a feature rich Open Source native XML database

exist-commits — Receive notifications about CVS commits.