From 8ea1b2ddc95fed6ff2680d226a792b5163d04fe3 Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 20 May 2015 11:17:30 +0000
Subject: [PATCH] always use LCDB_MARC8 database

---
 doc/book.xml                |    6 +++---
 doc/multi.svg               |    2 +-
 doc/multi.xml               |    2 +-
 doc/zoom.xml                |    2 +-
 etc/config-bytarget.xml     |    6 +++---
 etc/config-loc.xml          |   10 +++++-----
 etc/config-simple-multi.xml |    4 ++--
 etc/config-solr.xml         |    2 +-
 etc/config2.xml             |    4 ++--
 etc/config3.xml             |    4 ++--
 etc/example.target-auth     |    2 +-
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/book.xml b/doc/book.xml
index b996b56..fc2829f 100644
--- 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>
-    <target>lx2.loc.gov:210/LCDB</target>
+    <target>lx2.loc.gov:210/LCDB_MARC8</target>
   </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>
-          <target>lx2.loc.gov:210/LCDB</target>
+          <target>lx2.loc.gov:210/LCDB_MARC8</target>
         </virtual>
         <virtual>
           <database>marc</database>
@@ -1441,7 +1441,7 @@ Figure out what additional information we need in:
         </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>
diff --git a/doc/multi.svg b/doc/multi.svg
index 3efbceb..4f3f855 100644
--- a/doc/multi.svg
+++ b/doc/multi.svg
@@ -392,7 +392,7 @@
          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"
diff --git a/doc/multi.xml b/doc/multi.xml
index 3b92293..10efbf0 100644
--- a/doc/multi.xml
+++ b/doc/multi.xml
@@ -69,7 +69,7 @@
    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>
diff --git a/doc/zoom.xml b/doc/zoom.xml
index deb2f23..7b774b1 100644
--- 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>
-              <zurl>lx2.loc.gov:210/LCDB</zurl>
+              <zurl>lx2.loc.gov:210/LCDB_MARC8</zurl>
             </record>
           </records>
         </torus>
diff --git a/etc/config-bytarget.xml b/etc/config-bytarget.xml
index 0475b5d..8ced06a 100644
--- a/etc/config-bytarget.xml
+++ b/etc/config-bytarget.xml
@@ -13,7 +13,7 @@
       <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>
@@ -22,11 +22,11 @@
         <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">
-        <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"/>
diff --git a/etc/config-loc.xml b/etc/config-loc.xml
index 946da74..1225508 100644
--- 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>
-          <target>z3950.loc.gov:7097/LCDB_UTF8</target>
+          <target>z3950.loc.gov:7097/LCDB_MARC8_UTF8</target>
         </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>
@@ -172,7 +172,7 @@ the following databaseNames (virtual databases):
         <!-- 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>
@@ -182,8 +182,8 @@ the following databaseNames (virtual databases):
       <!-- 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 .. -->
diff --git a/etc/config-simple-multi.xml b/etc/config-simple-multi.xml
index 7313d22..902d649 100644
--- a/etc/config-simple-multi.xml
+++ b/etc/config-simple-multi.xml
@@ -10,7 +10,7 @@
       <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>
@@ -18,7 +18,7 @@
         </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>
diff --git a/etc/config-solr.xml b/etc/config-solr.xml
index a76ec9e..19c2697 100644
--- 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>
-	      <zurl>lx2.loc.gov:210/LCDB</zurl>
+	      <zurl>lx2.loc.gov:210/LCDB_MARC8</zurl>
 	    </record>
 	  </records>
 	</torus>
diff --git a/etc/config2.xml b/etc/config2.xml
index e036943..1d78faf 100644
--- a/etc/config2.xml
+++ b/etc/config2.xml
@@ -21,7 +21,7 @@
       <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>
@@ -37,7 +37,7 @@
         </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>
diff --git a/etc/config3.xml b/etc/config3.xml
index db96541..9edc946 100644
--- a/etc/config3.xml
+++ b/etc/config3.xml
@@ -45,13 +45,13 @@
         </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>
-          <target>lx2.loc.gov:210/LCDB</target>
+          <target>lx2.loc.gov:210/LCDB_MARC8</target>
         </virtual>
       </filter>
       <filter type="log">
diff --git a/etc/example.target-auth b/etc/example.target-auth
index 157bfd1..3433ff7 100644
--- 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.
 
-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:*
-- 
1.7.10.4