From cf0819fca5bac1cea043c29609672d596a4c9733 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 4 Nov 2014 19:52:15 +0400 Subject: [PATCH 01/29] test1 --- books.dtd | 13 ++++++++++++ books.xml | 58 +++++++++++++++++++++++++++-------------------------- books.xsd | 34 +++++++++++++++++++++++++++++++ student.dtd | 6 +++++- student.xml | 4 ++++ 5 files changed, 86 insertions(+), 29 deletions(-) create mode 100644 books.dtd create mode 100644 books.xsd create mode 100644 student.xml diff --git a/books.dtd b/books.dtd new file mode 100644 index 0000000..6a4c67b --- /dev/null +++ b/books.dtd @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/books.xml b/books.xml index 49f0348..1c901ae 100644 --- a/books.xml +++ b/books.xml @@ -1,30 +1,32 @@ + + - - Everyday Italian - Giada De Laurentiis - 2005 - 30.00 - - - Harry Potter - J K. Rowling - 2005 - 29.99 - - - XQuery Kick Start - James McGovern - Per Bothner - Kurt Cagle - James Linn - Vaidyanathan Nagarajan - 2003 - 49.99 - - - Learning XML - Erik T. Ray - 2003 - 39.95 - + +Everyday Italian +Giada De Laurentiis +2005 +30.00 + + +Harry Potter +J K. Rowling +2005 +29.99 + + +XQuery Kick Start +James McGovern +Per Bothner +Kurt Cagle +James Linn +Vaidyanathan Nagarajan +2003 +49.99 + + +Learning XML +Erik T. Ray +2003 +39.95 + diff --git a/books.xsd b/books.xsd new file mode 100644 index 0000000..147875a --- /dev/null +++ b/books.xsd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/student.dtd b/student.dtd index 3613239..f8624c8 100644 --- a/student.dtd +++ b/student.dtd @@ -1 +1,5 @@ - + + diff --git a/student.xml b/student.xml new file mode 100644 index 0000000..2529abf --- /dev/null +++ b/student.xml @@ -0,0 +1,4 @@ + + + + From 634e4880c763f9fee684f6d395f9fb431da0bb58 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:01:46 +0400 Subject: [PATCH 02/29] student.xml added --- student.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student.xml b/student.xml index 2529abf..6991a9a 100644 --- a/student.xml +++ b/student.xml @@ -1,4 +1,4 @@ - + From 29403397c6fb208b46eaa37e50dff3d475b0d467 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:09:15 +0400 Subject: [PATCH 03/29] books.dtd added --- books.dtd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/books.dtd b/books.dtd index 6a4c67b..bab32cf 100644 --- a/books.dtd +++ b/books.dtd @@ -1,13 +1,10 @@ - - + From 614740fdce174500dfb3c94f3b6f6acee7edf278 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:28:57 +0400 Subject: [PATCH 04/29] books.xsd added --- books.xsd | 88 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 25 deletions(-) diff --git a/books.xsd b/books.xsd index 147875a..1c0c19d 100644 --- a/books.xsd +++ b/books.xsd @@ -1,34 +1,72 @@ - + - - - - - + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - + + + + + + + + + + + + + - From 9f1fe9ea2b2e275bf9d9722d77be966a2d3bb48b Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:46:13 +0400 Subject: [PATCH 05/29] task16 --- task16 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task16 diff --git a/task16 b/task16 new file mode 100644 index 0000000..52639a1 --- /dev/null +++ b/task16 @@ -0,0 +1 @@ +//book From 40c090383a59c3eb7fa8ca1b466163f3d31d9f07 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:46:26 +0400 Subject: [PATCH 06/29] task17 --- task17 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task17 diff --git a/task17 b/task17 new file mode 100644 index 0000000..f582071 --- /dev/null +++ b/task17 @@ -0,0 +1 @@ +//book[@cover] From 6fa356812fa38af1715a5616b4f06090ca6fad6c Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:46:43 +0400 Subject: [PATCH 07/29] task18 --- task18 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task18 diff --git a/task18 b/task18 new file mode 100644 index 0000000..ed203f4 --- /dev/null +++ b/task18 @@ -0,0 +1 @@ +//book[child::year=2003] From 001fdf30fff8fd5ae63561bc7f0b92b5551ef494 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:46:57 +0400 Subject: [PATCH 08/29] task19 --- task19 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task19 diff --git a/task19 b/task19 new file mode 100644 index 0000000..e9e2c20 --- /dev/null +++ b/task19 @@ -0,0 +1 @@ +//book[child::price >= 30 and child::price < 40] From 7a6b097461d8bb08d24c7c2f1bd2fab6a7069a36 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:47:12 +0400 Subject: [PATCH 09/29] task20 --- task20.xsl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 task20.xsl diff --git a/task20.xsl b/task20.xsl new file mode 100644 index 0000000..0f33a14 --- /dev/null +++ b/task20.xsl @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 90c075538bbe144c933dc903a531f1a73ddcf682 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:47:28 +0400 Subject: [PATCH 10/29] task21 --- task21.xsl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 task21.xsl diff --git a/task21.xsl b/task21.xsl new file mode 100644 index 0000000..043407c --- /dev/null +++ b/task21.xsl @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + From 7d272a0b18adb42c6d2896f191a15fce8572991f Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:47:44 +0400 Subject: [PATCH 11/29] task22 --- task22.xsl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 task22.xsl diff --git a/task22.xsl b/task22.xsl new file mode 100644 index 0000000..c706928 --- /dev/null +++ b/task22.xsl @@ -0,0 +1,19 @@ + + + + + + + + + + + + * + + + + + + + From ce22e06f4e50a637a5ce1bb49c190cc841758c39 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:47:58 +0400 Subject: [PATCH 12/29] task23 --- task23.xsl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 task23.xsl diff --git a/task23.xsl b/task23.xsl new file mode 100644 index 0000000..c42f556 --- /dev/null +++ b/task23.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + >30 + + + + + <30 + + + =30 + + + + + + + + + + From 6e4439e58e1b5783310289c794f0338c1ba51f8e Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:48:19 +0400 Subject: [PATCH 13/29] task24 --- task24.xsl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 task24.xsl diff --git a/task24.xsl b/task24.xsl new file mode 100644 index 0000000..b2443c2 --- /dev/null +++ b/task24.xsl @@ -0,0 +1,26 @@ + + + + + + + + + <?xml version="1.0" encoding="UTF-8"?> <library> + + </library> + + + + + + + <book title="" year=""> + + </book> + + + <author name=""> + </author> + + From 0ee78dde402e147500130c726dd9546a4efe5672 Mon Sep 17 00:00:00 2001 From: zhekon Date: Tue, 11 Nov 2014 15:48:37 +0400 Subject: [PATCH 14/29] fixed --- books.dtd~ | 13 ++++++++++ books.xml~ | 32 ++++++++++++++++++++++++ books.xsd~ | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ student.xml~ | 4 +++ task16~ | 0 task17~ | 0 task18~ | 0 task19~ | 0 task20.xsl~ | 0 task21.xsl~ | 0 task22.xsl~ | 0 task23.xsl~ | 0 task24.xsl~ | 0 13 files changed, 118 insertions(+) create mode 100644 books.dtd~ create mode 100644 books.xml~ create mode 100644 books.xsd~ create mode 100644 student.xml~ create mode 100644 task16~ create mode 100644 task17~ create mode 100644 task18~ create mode 100644 task19~ create mode 100644 task20.xsl~ create mode 100644 task21.xsl~ create mode 100644 task22.xsl~ create mode 100644 task23.xsl~ create mode 100644 task24.xsl~ diff --git a/books.dtd~ b/books.dtd~ new file mode 100644 index 0000000..6a4c67b --- /dev/null +++ b/books.dtd~ @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/books.xml~ b/books.xml~ new file mode 100644 index 0000000..1c901ae --- /dev/null +++ b/books.xml~ @@ -0,0 +1,32 @@ + + + + +Everyday Italian +Giada De Laurentiis +2005 +30.00 + + +Harry Potter +J K. Rowling +2005 +29.99 + + +XQuery Kick Start +James McGovern +Per Bothner +Kurt Cagle +James Linn +Vaidyanathan Nagarajan +2003 +49.99 + + +Learning XML +Erik T. Ray +2003 +39.95 + + diff --git a/books.xsd~ b/books.xsd~ new file mode 100644 index 0000000..d4ca4c6 --- /dev/null +++ b/books.xsd~ @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/student.xml~ b/student.xml~ new file mode 100644 index 0000000..2529abf --- /dev/null +++ b/student.xml~ @@ -0,0 +1,4 @@ + + + + diff --git a/task16~ b/task16~ new file mode 100644 index 0000000..e69de29 diff --git a/task17~ b/task17~ new file mode 100644 index 0000000..e69de29 diff --git a/task18~ b/task18~ new file mode 100644 index 0000000..e69de29 diff --git a/task19~ b/task19~ new file mode 100644 index 0000000..e69de29 diff --git a/task20.xsl~ b/task20.xsl~ new file mode 100644 index 0000000..e69de29 diff --git a/task21.xsl~ b/task21.xsl~ new file mode 100644 index 0000000..e69de29 diff --git a/task22.xsl~ b/task22.xsl~ new file mode 100644 index 0000000..e69de29 diff --git a/task23.xsl~ b/task23.xsl~ new file mode 100644 index 0000000..e69de29 diff --git a/task24.xsl~ b/task24.xsl~ new file mode 100644 index 0000000..e69de29 From 5c50fadf9301f9751aa972ed419f0d3b5fa961df Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:38:41 +0400 Subject: [PATCH 15/29] Update student.xml~ --- student.xml~ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student.xml~ b/student.xml~ index 2529abf..6991a9a 100644 --- a/student.xml~ +++ b/student.xml~ @@ -1,4 +1,4 @@ - + From 6fb64cc4c16b906c16a0fe8b528a284fc92d7e35 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:43:38 +0400 Subject: [PATCH 16/29] Delete books.dtd --- books.dtd | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 books.dtd diff --git a/books.dtd b/books.dtd deleted file mode 100644 index bab32cf..0000000 --- a/books.dtd +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - From 47115a27a3813cb1ce6a0ecba24860c7a6bc28db Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:44:01 +0400 Subject: [PATCH 17/29] Rename books.dtd~ to books.dtd --- books.dtd~ => books.dtd | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename books.dtd~ => books.dtd (100%) diff --git a/books.dtd~ b/books.dtd similarity index 100% rename from books.dtd~ rename to books.dtd From 5a21db3cc1ef7de7706f059fb2b722ad6a023d05 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:44:48 +0400 Subject: [PATCH 18/29] Delete books.xml~ --- books.xml~ | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 books.xml~ diff --git a/books.xml~ b/books.xml~ deleted file mode 100644 index 1c901ae..0000000 --- a/books.xml~ +++ /dev/null @@ -1,32 +0,0 @@ - - - - -Everyday Italian -Giada De Laurentiis -2005 -30.00 - - -Harry Potter -J K. Rowling -2005 -29.99 - - -XQuery Kick Start -James McGovern -Per Bothner -Kurt Cagle -James Linn -Vaidyanathan Nagarajan -2003 -49.99 - - -Learning XML -Erik T. Ray -2003 -39.95 - - From c24301a8bd8ecb391cb78317dae7554d8e123309 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:45:11 +0400 Subject: [PATCH 19/29] Delete books.xsd~ --- books.xsd~ | 69 ------------------------------------------------------ 1 file changed, 69 deletions(-) delete mode 100644 books.xsd~ diff --git a/books.xsd~ b/books.xsd~ deleted file mode 100644 index d4ca4c6..0000000 --- a/books.xsd~ +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From c4f879a2e56374f8f2a0f86472813cdb9d88e5f0 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:45:29 +0400 Subject: [PATCH 20/29] Delete student.xml~ --- student.xml~ | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 student.xml~ diff --git a/student.xml~ b/student.xml~ deleted file mode 100644 index 6991a9a..0000000 --- a/student.xml~ +++ /dev/null @@ -1,4 +0,0 @@ - - - - From 5a91e2a644993b971bbedfe9a305b98e29774e4c Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:45:43 +0400 Subject: [PATCH 21/29] Delete task16~ --- task16~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task16~ diff --git a/task16~ b/task16~ deleted file mode 100644 index e69de29..0000000 From 5e6c2855be2ef28ffd28078fe5fb384ee7252dda Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:45:51 +0400 Subject: [PATCH 22/29] Delete task17~ --- task17~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task17~ diff --git a/task17~ b/task17~ deleted file mode 100644 index e69de29..0000000 From d5578a6f0fd0809bb1255a1c77b0c9d598e9a29c Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:02 +0400 Subject: [PATCH 23/29] Delete task18~ --- task18~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task18~ diff --git a/task18~ b/task18~ deleted file mode 100644 index e69de29..0000000 From 37afbdff4213e1c90ed0b198e3e00162093fcc6b Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:11 +0400 Subject: [PATCH 24/29] Delete task19~ --- task19~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task19~ diff --git a/task19~ b/task19~ deleted file mode 100644 index e69de29..0000000 From cb7373cd6140f62c4f5aaac2347e8c298152dc02 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:17 +0400 Subject: [PATCH 25/29] Delete task20.xsl~ --- task20.xsl~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task20.xsl~ diff --git a/task20.xsl~ b/task20.xsl~ deleted file mode 100644 index e69de29..0000000 From 60295284ab80c5d1a89988142c1ddf1248e6fd10 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:25 +0400 Subject: [PATCH 26/29] Delete task21.xsl~ --- task21.xsl~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task21.xsl~ diff --git a/task21.xsl~ b/task21.xsl~ deleted file mode 100644 index e69de29..0000000 From cda68b9f41d377efd461531c42200ea83bb04cd6 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:31 +0400 Subject: [PATCH 27/29] Delete task22.xsl~ --- task22.xsl~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task22.xsl~ diff --git a/task22.xsl~ b/task22.xsl~ deleted file mode 100644 index e69de29..0000000 From 0e290ef335d445ada0b50211c46c3629729d1c82 Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:37 +0400 Subject: [PATCH 28/29] Delete task23.xsl~ --- task23.xsl~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task23.xsl~ diff --git a/task23.xsl~ b/task23.xsl~ deleted file mode 100644 index e69de29..0000000 From cf5ae48dea803349791c0623244d33e7f2abeb8a Mon Sep 17 00:00:00 2001 From: Evgeny Dzhumaylo Date: Tue, 11 Nov 2014 17:46:43 +0400 Subject: [PATCH 29/29] Delete task24.xsl~ --- task24.xsl~ | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 task24.xsl~ diff --git a/task24.xsl~ b/task24.xsl~ deleted file mode 100644 index e69de29..0000000