syncing Z-config with head

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@10720 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 3c50aa5..2503608 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -417,8 +417,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Host" name="host" oils_obj:array_position="5" oils_persist:virtual="false"  reporter:datatype="text"/>
                        <field reporter:label="Port" name="port" oils_obj:array_position="6" oils_persist:virtual="false"  reporter:datatype="int"/>
                        <field reporter:label="DB" name="db" oils_obj:array_position="7" oils_persist:virtual="false"  reporter:datatype="text"/>
-                       <field reporter:label="Auth" name="auth" oils_obj:array_position="8" oils_persist:virtual="false"  reporter:datatype="bool"/>
-                       <field reporter:label="Attrs" name="attrs" oils_obj:array_position="9" oils_persist:virtual="true"  reporter:datatype="link"/>
+                       <field reporter:label="Record Format" name="record_format" oils_obj:array_position="8" oils_persist:virtual="false"  reporter:datatype="text"/>
+                       <field reporter:label="Transmission Format" name="transmission_format" oils_obj:array_position="9" oils_persist:virtual="false"  reporter:datatype="text"/>
+                       <field reporter:label="Auth" name="auth" oils_obj:array_position="10" oils_persist:virtual="false"  reporter:datatype="bool"/>
+                       <field reporter:label="Attrs" name="attrs" oils_obj:array_position="11" oils_persist:virtual="true"  reporter:datatype="link"/>
                </fields>
                <links>
                        <link field="attrs" reltype="has_many" key="source" map="" class="cza"/>
@@ -436,6 +438,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field reporter:label="Label" name="label" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="text" oils_persist:i18n="true"/>
                        <field reporter:label="Code" name="code" oils_obj:array_position="7" oils_persist:virtual="false"  reporter:datatype="int"/>
                        <field reporter:label="Format" name="format" oils_obj:array_position="8" oils_persist:virtual="false"  reporter:datatype="int"/>
+                       <field reporter:label="Truncation" name="truncation" oils_obj:array_position="9" oils_persist:virtual="false"  reporter:datatype="int"/>
                </fields>
                <links>
                        <link field="source" reltype="has_a" key="name" map="" class="czs"/>

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
index 8e84488..07fc89a 100755 (executable)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
@@ -99,6 +99,8 @@ sub query_services {
             host => $s->host, 
             port => $s->port, 
             db => $s->db, 
+            record_format => $s->record_format,
+            transmission_format => $s->transmission_format,
             auth => $s->auth, 
         }; 
 
@@ -109,6 +111,7 @@ sub query_services {
                 code => $a->code, 
                 format => $a->format, 
                 source => $a->source, 
+                truncation => $a->truncation, 
             }; 
         } 
     } 

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 4f7676d..264aa1b 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -459,12 +459,13 @@ INSERT INTO config.z3950_source (name,label,host,port,db,auth) VALUES ('loc','Li
 INSERT INTO config.z3950_source (name,label,host,port,db) VALUES ('oclc','OCLC','zcat.oclc.org',210,'OLUCWorldCat');
 
 CREATE TABLE config.z3950_attr (
-       id      SERIAL  PRIMARY KEY,
-       source  TEXT    NOT NULL REFERENCES config.z3950_source (name),
-       name    TEXT    NOT NULL,
-       label   TEXT    NOT NULL,
-       code    INT     NOT NULL,
-       format  INT     NOT NULL,
+       id          SERIAL  PRIMARY KEY,
+       source      TEXT    NOT NULL REFERENCES config.z3950_source (name),
+       name        TEXT    NOT NULL,
+       label       TEXT    NOT NULL,
+       code        INT     NOT NULL,
+       format      INT     NOT NULL,
+       truncation  INT     NOT NULL DEFAULT 0,
        CONSTRAINT z_code_format_once_per_source UNIQUE (code,format,source)
 );
 

diff --git a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
index 158e161..ca63fd6 100644 (file)
--- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
+++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
@@ -345,7 +345,7 @@ BEGIN
     END IF;
 
     IF param_between IS NOT NULL AND array_upper(param_between, 1) > 1 THEN
-        where_clause = where_clause || $$ AND mrd.date1 BETWEEN $$ || array_to_string(param_bib_level, $$' AND '$$) || ' ';
+        where_clause = where_clause || $$ AND mrd.date1 BETWEEN '$$ || array_to_string(param_between, $$' AND '$$) || $$' $$;
     END IF;
 
     core_rel_query := select_clause || from_clause || where_clause ||