From 237766b7bc74e76fbd723a3b8f6b4300a39d0891 Mon Sep 17 00:00:00 2001 From: Sergey Muraviov Date: Sat, 18 Oct 2014 18:06:27 +0400 Subject: [PATCH 01/14] =?UTF-8?q?=D0=92=20=D1=82=D0=B8=D0=BF=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1?= =?UTF-8?q?=D1=83=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- student.dtd | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 student.dtd diff --git a/student.dtd b/student.dtd new file mode 100644 index 0000000..f676f88 --- /dev/null +++ b/student.dtd @@ -0,0 +1,4 @@ + From 7882363232e4ba99514e0295d04468d87d69b33d Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 15:34:26 +0300 Subject: [PATCH 02/14] student.xml --- student.xml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 student.xml diff --git a/student.xml b/student.xml new file mode 100644 index 0000000..c07c6d6 --- /dev/null +++ b/student.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file From d844051e6c178c456937b88cb1cf5d6766f63c52 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 15:35:10 +0300 Subject: [PATCH 03/14] books.dtd --- books.dtd | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 books.dtd diff --git a/books.dtd b/books.dtd new file mode 100644 index 0000000..d021332 --- /dev/null +++ b/books.dtd @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file From 8748f01ae96425ac698fccd840142b5cd2fe68e1 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 15:37:51 +0300 Subject: [PATCH 04/14] books --- books.dtd | 2 +- books.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/books.dtd b/books.dtd index d021332..882af16 100644 --- a/books.dtd +++ b/books.dtd @@ -7,6 +7,6 @@ + cover (hardpack | paperpack) "paperback" #IMPLIED> \ No newline at end of file diff --git a/books.xml b/books.xml index 49f0348..5651d91 100644 --- a/books.xml +++ b/books.xml @@ -1,3 +1,4 @@ + Everyday Italian @@ -21,7 +22,7 @@ 2003 49.99 - + Learning XML Erik T. Ray 2003 From f24419487cb3b56c686cdccdcc63b570c7de5d87 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:08:35 +0300 Subject: [PATCH 05/14] schema --- books.xml | 3 ++- books.xsd | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 books.xsd diff --git a/books.xml b/books.xml index 5651d91..80df694 100644 --- a/books.xml +++ b/books.xml @@ -1,5 +1,6 @@ - + Everyday Italian Giada De Laurentiis diff --git a/books.xsd b/books.xsd new file mode 100644 index 0000000..9e8be8c --- /dev/null +++ b/books.xsd @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7f19bb661c3163593deab7e7e5e3e14a897d37ba Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:10:37 +0300 Subject: [PATCH 06/14] task16 --- task16 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task16 diff --git a/task16 b/task16 new file mode 100644 index 0000000..2625f83 --- /dev/null +++ b/task16 @@ -0,0 +1 @@ +//book \ No newline at end of file From a418ead071935993b3144d8365776b32d76239dc Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:11:48 +0300 Subject: [PATCH 07/14] task17 --- task17 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task17 diff --git a/task17 b/task17 new file mode 100644 index 0000000..9a6397a --- /dev/null +++ b/task17 @@ -0,0 +1 @@ +//book[@cover] \ No newline at end of file From e94616182f4eeacea0906e2ce0fc2d48f99b60d0 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:13:51 +0300 Subject: [PATCH 08/14] task18 --- task18 | 1 + 1 file changed, 1 insertion(+) create mode 100644 task18 diff --git a/task18 b/task18 new file mode 100644 index 0000000..efcfc7a --- /dev/null +++ b/task18 @@ -0,0 +1 @@ +//book[/year = 2003] \ No newline at end of file From 58ba240ec03b789dd2e26002941ece3c4f689c46 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:15:42 +0300 Subject: [PATCH 09/14] task19 --- task18 | 2 +- task19 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 task19 diff --git a/task18 b/task18 index efcfc7a..82d7d89 100644 --- a/task18 +++ b/task18 @@ -1 +1 @@ -//book[/year = 2003] \ No newline at end of file +//book[./year = 2003] \ No newline at end of file diff --git a/task19 b/task19 new file mode 100644 index 0000000..df9a07b --- /dev/null +++ b/task19 @@ -0,0 +1 @@ +//book[./year >= 30 and ./year < 40] \ No newline at end of file From f3d403015085848b0d8adcfbb56c33ecf7940fc3 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:45:36 +0300 Subject: [PATCH 10/14] task20 --- books.xml | 1 + task20.xsl | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 task20.xsl diff --git a/books.xml b/books.xml index 80df694..c9def88 100644 --- a/books.xml +++ b/books.xml @@ -1,3 +1,4 @@ + diff --git a/task20.xsl b/task20.xsl new file mode 100644 index 0000000..bfe9d70 --- /dev/null +++ b/task20.xsl @@ -0,0 +1,8 @@ + + + + + , + + + \ No newline at end of file From b69377a20123a0434ab9c528f75e62ded5ccad35 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:49:27 +0300 Subject: [PATCH 11/14] task21 --- books.xml | 2 +- task21.xsl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 task21.xsl diff --git a/books.xml b/books.xml index c9def88..ec79ac5 100644 --- a/books.xml +++ b/books.xml @@ -1,4 +1,4 @@ - + diff --git a/task21.xsl b/task21.xsl new file mode 100644 index 0000000..71fced4 --- /dev/null +++ b/task21.xsl @@ -0,0 +1,9 @@ + + + + + + , + + + \ No newline at end of file From 2419adc94ae68a1f8c12058f6a3d1dfc7d20b3c7 Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:53:55 +0300 Subject: [PATCH 12/14] task22 --- books.xml | 2 +- task22.xsl | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 task22.xsl diff --git a/books.xml b/books.xml index ec79ac5..155c7e2 100644 --- a/books.xml +++ b/books.xml @@ -1,4 +1,4 @@ - + diff --git a/task22.xsl b/task22.xsl new file mode 100644 index 0000000..bc96083 --- /dev/null +++ b/task22.xsl @@ -0,0 +1,9 @@ + + + + + * + , + + + \ No newline at end of file From b2436bba6a072b64bff079d0167083567fc9f67e Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 16:57:30 +0300 Subject: [PATCH 13/14] task23 --- books.xml | 2 +- task23.xsl | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 task23.xsl diff --git a/books.xml b/books.xml index 155c7e2..33a370f 100644 --- a/books.xml +++ b/books.xml @@ -1,4 +1,4 @@ - + diff --git a/task23.xsl b/task23.xsl new file mode 100644 index 0000000..0795156 --- /dev/null +++ b/task23.xsl @@ -0,0 +1,11 @@ + + + + + >30 + <30 + =30 + , + + + \ No newline at end of file From 79c2d4413adbf86c01721c42981e1f0afd6049ca Mon Sep 17 00:00:00 2001 From: Nikolay Ivanov Date: Tue, 3 Nov 2015 17:26:44 +0300 Subject: [PATCH 14/14] task24 --- books.xml | 3 +-- books.xsd | 8 ++++---- task24.xsl | 28 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 task24.xsl diff --git a/books.xml b/books.xml index 33a370f..af29485 100644 --- a/books.xml +++ b/books.xml @@ -1,5 +1,4 @@ - - + diff --git a/books.xsd b/books.xsd index 9e8be8c..1c265f2 100644 --- a/books.xsd +++ b/books.xsd @@ -5,9 +5,9 @@ - - - + + + @@ -37,7 +37,7 @@ - + diff --git a/task24.xsl b/task24.xsl new file mode 100644 index 0000000..8352529 --- /dev/null +++ b/task24.xsl @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file