projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95f63a3
)
always use LCDB_MARC8 database
author
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 20 May 2015 11:17:30 +0000
(11:17 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 20 May 2015 11:17:30 +0000
(11:17 +0000)
doc/book.xml
patch
|
blob
|
history
doc/multi.svg
patch
|
blob
|
history
doc/multi.xml
patch
|
blob
|
history
doc/zoom.xml
patch
|
blob
|
history
etc/config-bytarget.xml
patch
|
blob
|
history
etc/config-loc.xml
patch
|
blob
|
history
etc/config-simple-multi.xml
patch
|
blob
|
history
etc/config-solr.xml
patch
|
blob
|
history
etc/config2.xml
patch
|
blob
|
history
etc/config3.xml
patch
|
blob
|
history
etc/example.target-auth
patch
|
blob
|
history
diff --git
a/doc/book.xml
b/doc/book.xml
index
b996b56
..
fc2829f
100644
(file)
--- a/
doc/book.xml
+++ b/
doc/book.xml
@@
-1393,7
+1393,7
@@
Figure out what additional information we need in:
<screen><![CDATA[<filter type="virt_db">
<virtual>
<database>lc</database>
<screen><![CDATA[<filter type="virt_db">
<virtual>
<database>lc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>marc</database>
</virtual>
<virtual>
<database>marc</database>
@@
-1433,7
+1433,7
@@
Figure out what additional information we need in:
<filter type="virt_db">
<virtual>
<database>lc</database>
<filter type="virt_db">
<virtual>
<database>lc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>marc</database>
</virtual>
<virtual>
<database>marc</database>
@@
-1441,7
+1441,7
@@
Figure out what additional information we need in:
</virtual>
<virtual>
<database>all</database>
</virtual>
<virtual>
<database>all</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
<target>indexdata.com/marc</target>
</virtual>
</filter>
<target>indexdata.com/marc</target>
</virtual>
</filter>
diff --git
a/doc/multi.svg
b/doc/multi.svg
index
3efbceb
..
4f3f855
100644
(file)
--- a/
doc/multi.svg
+++ b/
doc/multi.svg
@@
-392,7
+392,7
@@
sodipodi:role="line"
x="8.8582678"
y="403.56223"
sodipodi:role="line"
x="8.8582678"
y="403.56223"
- id="tspan4371"> lx2.loc.gov:210/LCDB</tspan><tspan
+ id="tspan4371"> lx2.loc.gov:210/LCDB_MARC8</tspan><tspan
sodipodi:role="line"
x="8.8582678"
y="416.06223"
sodipodi:role="line"
x="8.8582678"
y="416.06223"
diff --git
a/doc/multi.xml
b/doc/multi.xml
index
3b92293
..
10efbf0
100644
(file)
--- a/
doc/multi.xml
+++ b/
doc/multi.xml
@@
-69,7
+69,7
@@
A typical configuration looks like this:
<screen><![CDATA[
<filter type="multi">
A typical configuration looks like this:
<screen><![CDATA[
<filter type="multi">
- <target route="route1">lx2.loc.gov:210/LCDB</target>
+ <target route="route1">lx2.loc.gov:210/LCDB_MARC8</target>
<target route="route2">bagel.indexdata.dk/gils</target>
<target route="other">*</target>
</filter>
<target route="route2">bagel.indexdata.dk/gils</target>
<target route="other">*</target>
</filter>
diff --git
a/doc/zoom.xml
b/doc/zoom.xml
index
deb2f23
..
7b774b1
100644
(file)
--- a/
doc/zoom.xml
+++ b/
doc/zoom.xml
@@
-901,7
+901,7
@@
<udb>loc</udb>
<cclmap_term>t=l,r</cclmap_term>
<cclmap_ti>u=4 t=l,r</cclmap_ti>
<udb>loc</udb>
<cclmap_term>t=l,r</cclmap_term>
<cclmap_ti>u=4 t=l,r</cclmap_ti>
- <zurl>lx2.loc.gov:210/LCDB</zurl>
+ <zurl>lx2.loc.gov:210/LCDB_MARC8</zurl>
</record>
</records>
</torus>
</record>
</records>
</torus>
diff --git
a/etc/config-bytarget.xml
b/etc/config-bytarget.xml
index
0475b5d
..
8ced06a
100644
(file)
--- a/
etc/config-bytarget.xml
+++ b/
etc/config-bytarget.xml
@@
-13,7
+13,7
@@
<filter type="virt_db">
<virtual>
<database>loc</database>
<filter type="virt_db">
<virtual>
<database>loc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>idgils</database>
</virtual>
<virtual>
<database>idgils</database>
@@
-22,11
+22,11
@@
<virtual>
<database>all</database>
<target>indexdata.dk/gils</target>
<virtual>
<database>all</database>
<target>indexdata.dk/gils</target>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
</filter>
<filter type="multi">
</virtual>
</filter>
<filter type="multi">
- <target route="group1">lx2.loc.gov:210/LCDB</target>
+ <target route="group1">lx2.loc.gov:210/LCDB_MARC8</target>
<target route="group2">indexdata.dk/gils</target>
</filter>
<filter type="bounce"/>
<target route="group2">indexdata.dk/gils</target>
</filter>
<filter type="bounce"/>
diff --git
a/etc/config-loc.xml
b/etc/config-loc.xml
index
946da74
..
1225508
100644
(file)
--- a/
etc/config-loc.xml
+++ b/
etc/config-loc.xml
@@
-122,11
+122,11
@@
the following databaseNames (virtual databases):
</virtual>
<virtual>
<database>LCDB_UTF8</database>
</virtual>
<virtual>
<database>LCDB_UTF8</database>
- <target>z3950.loc.gov:7097/LCDB_UTF8</target>
+ <target>z3950.loc.gov:7097/LCDB_MARC8_UTF8</target>
</virtual>
<virtual>
<database>LCDB_MARC8</database>
</virtual>
<virtual>
<database>LCDB_MARC8</database>
- <target>z3950.loc.gov:7095/LCDB_MARC8</target>
+ <target>z3950.loc.gov:7095/LCDB_MARC8_MARC8</target>
</virtual>
<virtual>
<database>HLAS_UTF8</database>
</virtual>
<virtual>
<database>HLAS_UTF8</database>
@@
-172,7
+172,7
@@
the following databaseNames (virtual databases):
<!-- merged results -->
<virtual>
<database>AllVoyager</database>
<!-- merged results -->
<virtual>
<database>AllVoyager</database>
- <target>z3950.loc.gov:7097/LCDB_UTF8</target>
+ <target>z3950.loc.gov:7097/LCDB_MARC8_UTF8</target>
<target>z3950.loc.gov:7999/HLAS_UTF8</target>
<target>z3950.loc.gov:7999/NLSBPH_UTF8</target>
</virtual>
<target>z3950.loc.gov:7999/HLAS_UTF8</target>
<target>z3950.loc.gov:7999/NLSBPH_UTF8</target>
</virtual>
@@
-182,8
+182,8
@@
the following databaseNames (virtual databases):
<!-- merge and route -->
<filter type="multi">
<target route="idtest">localhost*</target>
<!-- merge and route -->
<filter type="multi">
<target route="idtest">localhost*</target>
- <target route="lcdb_utf8">z3950.loc.gov:7097/LCDB_UTF8</target>
- <target route="lcdb_marc8">z3950.loc.gov:7095/LCDB_MARC8</target>
+ <target route="lcdb_utf8">z3950.loc.gov:7097/LCDB_MARC8_UTF8</target>
+ <target route="lcdb_marc8">z3950.loc.gov:7095/LCDB_MARC8_MARC8</target>
<target route="utf8">*UTF8</target>
</filter>
<!-- other targets.. MARC-8 and foreign .. -->
<target route="utf8">*UTF8</target>
</filter>
<!-- other targets.. MARC-8 and foreign .. -->
diff --git
a/etc/config-simple-multi.xml
b/etc/config-simple-multi.xml
index
7313d22
..
902d649
100644
(file)
--- a/
etc/config-simple-multi.xml
+++ b/
etc/config-simple-multi.xml
@@
-10,7
+10,7
@@
<filter type="virt_db">
<virtual>
<database>lc</database>
<filter type="virt_db">
<virtual>
<database>lc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>marc</database>
</virtual>
<virtual>
<database>marc</database>
@@
-18,7
+18,7
@@
</virtual>
<virtual>
<database>all</database>
</virtual>
<virtual>
<database>all</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
<target>indexdata.dk/marc</target>
</virtual>
</filter>
<target>indexdata.dk/marc</target>
</virtual>
</filter>
diff --git
a/etc/config-solr.xml
b/etc/config-solr.xml
index
a76ec9e
..
19c2697
100644
(file)
--- a/
etc/config-solr.xml
+++ b/
etc/config-solr.xml
@@
-25,7
+25,7
@@
<udb>loc</udb>
<cclmap_term>t=l,r</cclmap_term>
<cclmap_ti>u=4 t=l,r</cclmap_ti>
<udb>loc</udb>
<cclmap_term>t=l,r</cclmap_term>
<cclmap_ti>u=4 t=l,r</cclmap_ti>
- <zurl>lx2.loc.gov:210/LCDB</zurl>
+ <zurl>lx2.loc.gov:210/LCDB_MARC8</zurl>
</record>
</records>
</torus>
</record>
</records>
</torus>
diff --git
a/etc/config2.xml
b/etc/config2.xml
index
e036943
..
1d78faf
100644
(file)
--- a/
etc/config2.xml
+++ b/
etc/config2.xml
@@
-21,7
+21,7
@@
<filter type="virt_db">
<virtual>
<database>loc</database>
<filter type="virt_db">
<virtual>
<database>loc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>idgils</database>
</virtual>
<virtual>
<database>idgils</database>
@@
-37,7
+37,7
@@
</virtual>
<virtual>
<database>all</database>
</virtual>
<virtual>
<database>all</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
<target>indexdata.dk/gils</target>
<target>localhost:9999/Default</target>
</virtual>
<target>indexdata.dk/gils</target>
<target>localhost:9999/Default</target>
</virtual>
diff --git
a/etc/config3.xml
b/etc/config3.xml
index
db96541
..
9edc946
100644
(file)
--- a/
etc/config3.xml
+++ b/
etc/config3.xml
@@
-45,13
+45,13
@@
</virtual>
<virtual>
<database>loc</database>
</virtual>
<virtual>
<database>loc</database>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
<virtual>
<database>all</database>
<target>localhost:9999/Default</target>
<target>localhost:9998/Slow</target>
</virtual>
<virtual>
<database>all</database>
<target>localhost:9999/Default</target>
<target>localhost:9998/Slow</target>
- <target>lx2.loc.gov:210/LCDB</target>
+ <target>lx2.loc.gov:210/LCDB_MARC8</target>
</virtual>
</filter>
<filter type="log">
</virtual>
</filter>
<filter type="log">
diff --git
a/etc/example.target-auth
b/etc/example.target-auth
index
157bfd1
..
3433ff7
100644
(file)
--- a/
etc/example.target-auth
+++ b/
etc/example.target-auth
@@
-12,7
+12,7
@@
# This file is accessed by an Auth-Simple filter containing a
# <targetRegister> element whose content is the filename.
# This file is accessed by an Auth-Simple filter containing a
# <targetRegister> element whose content is the filename.
-mike:lx2.loc.gov:210/LCDB,indexdata.dk/gils
+mike:lx2.loc.gov:210/LCDB_MARC8,indexdata.dk/gils
adam:indexdata.dk/gils,localhost:9999/Default,something_for_backend_test_to_know
rob:localhost:9999/Default,something_for_backend_test_to_know
AllDbsUser:*
adam:indexdata.dk/gils,localhost:9999/Default,something_for_backend_test_to_know
rob:localhost:9999/Default,something_for_backend_test_to_know
AllDbsUser:*