From 0811dbaf9371212607c714213e15507a3af91985 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 25 Sep 2009 15:24:07 +0200 Subject: [PATCH] Setting files moved to etc/settings. Setting XML files are now stored in etc/settings instead of etc. This reflects the layout with the Debian package layout. --- NEWS | 7 + debian/cfg.patch | 4 +- debian/rules | 1 - doc/book.xml | 4 +- etc/danish.xml | 41 ----- etc/edu.xml | 71 --------- etc/gutenberg-sru.xml | 8 - etc/loc-sru.xml | 7 - etc/loc-xml.xml | 31 ---- etc/loc.xml | 29 ---- etc/many.xml | 324 ---------------------------------------- etc/opencontent.xml | 42 ------ etc/pazpar2.cfg.dist | 2 +- etc/settings/danish.xml | 41 +++++ etc/settings/edu.xml | 71 +++++++++ etc/settings/gutenberg-sru.xml | 8 + etc/settings/loc-sru.xml | 7 + etc/settings/loc-xml.xml | 31 ++++ etc/settings/loc.xml | 29 ++++ etc/settings/many.xml | 324 ++++++++++++++++++++++++++++++++++++++++ etc/settings/opencontent.xml | 42 ++++++ etc/settings/sru-test.xml | 30 ++++ etc/settings/sru-voyager.xml | 32 ++++ etc/settings/testserver.xml | 28 ++++ etc/sru-test.xml | 30 ---- etc/sru-voyager.xml | 32 ---- etc/testserver.xml | 28 ---- 27 files changed, 653 insertions(+), 651 deletions(-) delete mode 100644 etc/danish.xml delete mode 100644 etc/edu.xml delete mode 100644 etc/gutenberg-sru.xml delete mode 100644 etc/loc-sru.xml delete mode 100644 etc/loc-xml.xml delete mode 100644 etc/loc.xml delete mode 100644 etc/many.xml delete mode 100644 etc/opencontent.xml create mode 100644 etc/settings/danish.xml create mode 100644 etc/settings/edu.xml create mode 100644 etc/settings/gutenberg-sru.xml create mode 100644 etc/settings/loc-sru.xml create mode 100644 etc/settings/loc-xml.xml create mode 100644 etc/settings/loc.xml create mode 100644 etc/settings/many.xml create mode 100644 etc/settings/opencontent.xml create mode 100644 etc/settings/sru-test.xml create mode 100644 etc/settings/sru-voyager.xml create mode 100644 etc/settings/testserver.xml delete mode 100644 etc/sru-test.xml delete mode 100644 etc/sru-voyager.xml delete mode 100644 etc/testserver.xml diff --git a/NEWS b/NEWS index a0b84fd..086446a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Setting XML files are now stored in etc/settings instead of etc. This +reflects the layout with the Debian package layout. + +Settings may be posted for command=settings. The POSTed settings must +have root element 'settings' like regular setting files. In order to be +recognized, the POST request must use Content-Type=text/xml. + A service may be posted for command=init. This service will be used during the session. The service may have its own target settings, ICU config, timeout, etc. In order to be recognized, the POST request diff --git a/debian/cfg.patch b/debian/cfg.patch index 585e810..fa3c658 100644 --- a/debian/cfg.patch +++ b/debian/cfg.patch @@ -1,7 +1,5 @@ -6,8c6,7 +5,6c5 < < -< --- > -> diff --git a/debian/rules b/debian/rules index 0854b6e..802373f 100755 --- a/debian/rules +++ b/debian/rules @@ -81,7 +81,6 @@ binary-arch: build install cp $(CURDIR)/etc/pazpar2.cfg.dist $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg patch $(CURDIR)/debian/pazpar2/etc/pazpar2/pazpar2.cfg $(CURDIR)/debian/cfg.patch cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/ - cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/ cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/ # pazpar2-apache2 package cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-apache2/etc/pazpar2 diff --git a/doc/book.xml b/doc/book.xml index 0bbd98e..55c4d50 100644 --- a/doc/book.xml +++ b/doc/book.xml @@ -289,21 +289,19 @@ cd etc cp pazpar2.cfg.dist pazpar2.cfg - cp edu.xml settings ../src/pazpar2 -f pazpar2.cfg And on Windows: cd etc copy pazpar2.cfg.dist pazpar2.cfg - copy edu.xml settings ..\bin\pazpar2 -f pazpar2.cfg This will start a Pazpar2 listener on port 9004. It will proxy HTTP requests to localhost - port 80, which we assume will be the regular HTTP server on the system. Inspect and modify pazpar2.cfg as needed if this is to be changed. The pazpar2.cfg includes settings from the - directory settings. + file settings/edu.xml to use for searches. diff --git a/etc/danish.xml b/etc/danish.xml deleted file mode 100644 index 521238a..0000000 --- a/etc/danish.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/edu.xml b/etc/edu.xml deleted file mode 100644 index 954d6ef..0000000 --- a/etc/edu.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/gutenberg-sru.xml b/etc/gutenberg-sru.xml deleted file mode 100644 index 6d01444..0000000 --- a/etc/gutenberg-sru.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/etc/loc-sru.xml b/etc/loc-sru.xml deleted file mode 100644 index 1a098cf..0000000 --- a/etc/loc-sru.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/etc/loc-xml.xml b/etc/loc-xml.xml deleted file mode 100644 index c0930c6..0000000 --- a/etc/loc-xml.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/loc.xml b/etc/loc.xml deleted file mode 100644 index 4aa07e4..0000000 --- a/etc/loc.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/many.xml b/etc/many.xml deleted file mode 100644 index c85cca5..0000000 --- a/etc/many.xml +++ /dev/null @@ -1,324 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/opencontent.xml b/etc/opencontent.xml deleted file mode 100644 index af47845..0000000 --- a/etc/opencontent.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist index 1ef86d5..616d611 100644 --- a/etc/pazpar2.cfg.dist +++ b/etc/pazpar2.cfg.dist @@ -4,7 +4,7 @@ - + diff --git a/etc/settings/danish.xml b/etc/settings/danish.xml new file mode 100644 index 0000000..521238a --- /dev/null +++ b/etc/settings/danish.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/edu.xml b/etc/settings/edu.xml new file mode 100644 index 0000000..954d6ef --- /dev/null +++ b/etc/settings/edu.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/gutenberg-sru.xml b/etc/settings/gutenberg-sru.xml new file mode 100644 index 0000000..6d01444 --- /dev/null +++ b/etc/settings/gutenberg-sru.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/etc/settings/loc-sru.xml b/etc/settings/loc-sru.xml new file mode 100644 index 0000000..1a098cf --- /dev/null +++ b/etc/settings/loc-sru.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/etc/settings/loc-xml.xml b/etc/settings/loc-xml.xml new file mode 100644 index 0000000..c0930c6 --- /dev/null +++ b/etc/settings/loc-xml.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/loc.xml b/etc/settings/loc.xml new file mode 100644 index 0000000..4aa07e4 --- /dev/null +++ b/etc/settings/loc.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/many.xml b/etc/settings/many.xml new file mode 100644 index 0000000..c85cca5 --- /dev/null +++ b/etc/settings/many.xml @@ -0,0 +1,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/opencontent.xml b/etc/settings/opencontent.xml new file mode 100644 index 0000000..af47845 --- /dev/null +++ b/etc/settings/opencontent.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/sru-test.xml b/etc/settings/sru-test.xml new file mode 100644 index 0000000..ae6a52a --- /dev/null +++ b/etc/settings/sru-test.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/sru-voyager.xml b/etc/settings/sru-voyager.xml new file mode 100644 index 0000000..42dae4e --- /dev/null +++ b/etc/settings/sru-voyager.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/settings/testserver.xml b/etc/settings/testserver.xml new file mode 100644 index 0000000..8c0befd --- /dev/null +++ b/etc/settings/testserver.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/sru-test.xml b/etc/sru-test.xml deleted file mode 100644 index ae6a52a..0000000 --- a/etc/sru-test.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/sru-voyager.xml b/etc/sru-voyager.xml deleted file mode 100644 index 42dae4e..0000000 --- a/etc/sru-voyager.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/testserver.xml b/etc/testserver.xml deleted file mode 100644 index 8c0befd..0000000 --- a/etc/testserver.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 1.7.10.4