View | Details | Raw Unified | Return to bug 3087
Collapse All | Expand All

(-)a/C4/Context.pm (+2 lines)
Lines 656-661 sub Zconn { Link Here
656
        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
656
        $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
657
657
658
        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
658
        $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
659
        $context->{ Zconn }->{ $server }->option(
660
            preferredRecordSyntax => C4::Context->preference("marcflavour") );
659
        return $context->{"Zconn"}->{$server};
661
        return $context->{"Zconn"}->{$server};
660
    }
662
    }
661
}
663
}
(-)a/Makefile.PL (+1 lines)
Lines 500-505 my $pl_files = { Link Here
500
if ($config{'INSTALL_ZEBRA'} eq "yes") {
500
if ($config{'INSTALL_ZEBRA'} eq "yes") {
501
    push @{ $pl_files->{'rewrite-config.PL'} }, (
501
    push @{ $pl_files->{'rewrite-config.PL'} }, (
502
        'blib/ZEBRA_CONF_DIR/etc/passwd',
502
        'blib/ZEBRA_CONF_DIR/etc/passwd',
503
        'blib/ZEBRA_CONF_DIR/etc/usmarc.mar',
503
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
504
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
504
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
505
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
505
        'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
506
        'blib/ZEBRA_CONF_DIR/zebra-authorities-dom.cfg',
(-)a/etc/koha-conf.xml (-23 / +23 lines)
Lines 41-87 __PAZPAR2_TOGGLE_XML_POST__ Link Here
41
     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
41
     <!-- <stylesheet>xsl/default.xsl</stylesheet> -->
42
     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
42
     <!-- <maximumrecordsize>2000000</maximumrecordsize> -->
43
     <retrievalinfo>
43
     <retrievalinfo>
44
       <retrieval syntax="usmarc" name="F"/>
44
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
45
       <retrieval syntax="usmarc" name="B"/>
45
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
46
       <retrieval syntax="xml" name="F"/>
46
       <retrieval syntax="xml" name="F"/>
47
       <retrieval syntax="xml" name="B"/>
47
       <retrieval syntax="xml" name="B"/>
48
       <retrieval syntax="xml" name="marcxml"
48
       <retrieval syntax="xml" name="marcxml"
49
                  identifier="info:srw/schema/1/marcxml-v1.1">
49
                  identifier="info:srw/schema/1/marcxml-v1.1">
50
         <backend syntax="usmarc" name="F">
50
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
51
           <marc inputformat="marc" outputformat="marcxml"
51
           <marc inputformat="marc" outputformat="marcxml"
52
                 inputcharset="utf-8"/>
52
                 inputcharset="utf-8"/>
53
         </backend>
53
         </backend>
54
       </retrieval>
54
       </retrieval>
55
       <retrieval syntax="xml" name="dc">
55
       <retrieval syntax="xml" name="dc">
56
         <backend syntax="usmarc" name="F">
56
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
57
           <marc inputformat="marc" outputformat="marcxml"
57
           <marc inputformat="marc" outputformat="marcxml"
58
                 inputcharset="utf-8"/>
58
                 inputcharset="utf-8"/>
59
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
59
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
60
         </backend>
60
         </backend>
61
       </retrieval>
61
       </retrieval>
62
       <retrieval syntax="xml" name="mods">
62
       <retrieval syntax="xml" name="mods">
63
         <backend syntax="usmarc" name="F">
63
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
64
           <marc inputformat="marc" outputformat="marcxml"
64
           <marc inputformat="marc" outputformat="marcxml"
65
                 inputcharset="utf-8"/>
65
                 inputcharset="utf-8"/>
66
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
66
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
67
         </backend>
67
         </backend>
68
       </retrieval>
68
       </retrieval>
69
       <retrieval syntax="xml" name="rdfdc">
69
       <retrieval syntax="xml" name="rdfdc">
70
         <backend syntax="usmarc" name="F">
70
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
71
           <marc inputformat="marc" outputformat="marcxml"
71
           <marc inputformat="marc" outputformat="marcxml"
72
                 inputcharset="utf-8"/>
72
                 inputcharset="utf-8"/>
73
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
73
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
74
         </backend>
74
         </backend>
75
       </retrieval>
75
       </retrieval>
76
       <retrieval syntax="xml" name="rss2">
76
       <retrieval syntax="xml" name="rss2">
77
         <backend syntax="usmarc" name="F">
77
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
78
           <marc inputformat="marc" outputformat="marcxml"
78
           <marc inputformat="marc" outputformat="marcxml"
79
                 inputcharset="utf-8"/>
79
                 inputcharset="utf-8"/>
80
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
80
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
81
         </backend>
81
         </backend>
82
       </retrieval>
82
       </retrieval>
83
       <retrieval syntax="xml" name="utils">
83
       <retrieval syntax="xml" name="utils">
84
         <backend syntax="usmarc" name="F">
84
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
85
           <marc inputformat="marc" outputformat="marcxml"
85
           <marc inputformat="marc" outputformat="marcxml"
86
                 inputcharset="utf-8"/>
86
                 inputcharset="utf-8"/>
87
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
87
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
Lines 119-156 __PAZPAR2_TOGGLE_XML_POST__ Link Here
119
                xmlns:xi="http://www.w3.org/2001/XInclude">
119
                xmlns:xi="http://www.w3.org/2001/XInclude">
120
      <xi:fallback>
120
      <xi:fallback>
121
     <retrievalinfo>
121
     <retrievalinfo>
122
       <retrieval syntax="usmarc" name="F"/>
122
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
123
       <retrieval syntax="usmarc" name="B"/>
123
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
124
       <retrieval syntax="xml" name="marcxml"
124
       <retrieval syntax="xml" name="marcxml"
125
                  identifier="info:srw/schema/1/marcxml-v1.1">
125
                  identifier="info:srw/schema/1/marcxml-v1.1">
126
         <backend syntax="usmarc" name="F">
126
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
127
           <marc inputformat="marc" outputformat="marcxml"
127
           <marc inputformat="marc" outputformat="marcxml"
128
                 inputcharset="utf-8"/>
128
                 inputcharset="utf-8"/>
129
         </backend>
129
         </backend>
130
       </retrieval>
130
       </retrieval>
131
       <retrieval syntax="xml" name="dc">
131
       <retrieval syntax="xml" name="dc">
132
         <backend syntax="usmarc" name="F">
132
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
133
           <marc inputformat="marc" outputformat="marcxml"
133
           <marc inputformat="marc" outputformat="marcxml"
134
                 inputcharset="utf-8"/>
134
                 inputcharset="utf-8"/>
135
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
135
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
136
         </backend>
136
         </backend>
137
       </retrieval>
137
       </retrieval>
138
       <retrieval syntax="xml" name="mods">
138
       <retrieval syntax="xml" name="mods">
139
         <backend syntax="usmarc" name="F">
139
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
140
           <marc inputformat="marc" outputformat="marcxml"
140
           <marc inputformat="marc" outputformat="marcxml"
141
                 inputcharset="utf-8"/>
141
                 inputcharset="utf-8"/>
142
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
142
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
143
         </backend>
143
         </backend>
144
       </retrieval>
144
       </retrieval>
145
       <retrieval syntax="xml" name="rdfdc">
145
       <retrieval syntax="xml" name="rdfdc">
146
         <backend syntax="usmarc" name="F">
146
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
147
           <marc inputformat="marc" outputformat="marcxml"
147
           <marc inputformat="marc" outputformat="marcxml"
148
                 inputcharset="utf-8"/>
148
                 inputcharset="utf-8"/>
149
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
149
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
150
         </backend>
150
         </backend>
151
       </retrieval>
151
       </retrieval>
152
       <retrieval syntax="xml" name="utils">
152
       <retrieval syntax="xml" name="utils">
153
         <backend syntax="usmarc" name="F">
153
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
154
           <marc inputformat="marc" outputformat="marcxml"
154
           <marc inputformat="marc" outputformat="marcxml"
155
                 inputcharset="utf-8"/>
155
                 inputcharset="utf-8"/>
156
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
156
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
Lines 185-231 __PAZPAR2_TOGGLE_XML_POST__ Link Here
185
    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
185
    <config>__ZEBRA_CONF_DIR__/zebra-biblios.cfg</config>
186
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
186
    <cql2rpn>__ZEBRA_CONF_DIR__/pqf.properties</cql2rpn>
187
     <retrievalinfo>
187
     <retrievalinfo>
188
       <retrieval syntax="usmarc" name="F"/>
188
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
189
       <retrieval syntax="usmarc" name="B"/>
189
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
190
       <retrieval syntax="xml" name="F"/>
190
       <retrieval syntax="xml" name="F"/>
191
       <retrieval syntax="xml" name="B"/>
191
       <retrieval syntax="xml" name="B"/>
192
       <retrieval syntax="xml" name="marcxml"
192
       <retrieval syntax="xml" name="marcxml"
193
                  identifier="info:srw/schema/1/marcxml-v1.1">
193
                  identifier="info:srw/schema/1/marcxml-v1.1">
194
         <backend syntax="usmarc" name="F">
194
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
195
           <marc inputformat="marc" outputformat="marcxml"
195
           <marc inputformat="marc" outputformat="marcxml"
196
                 inputcharset="utf-8"/>
196
                 inputcharset="utf-8"/>
197
         </backend>
197
         </backend>
198
       </retrieval>
198
       </retrieval>
199
       <retrieval syntax="xml" name="dc">
199
       <retrieval syntax="xml" name="dc">
200
         <backend syntax="usmarc" name="F">
200
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
201
           <marc inputformat="marc" outputformat="marcxml"
201
           <marc inputformat="marc" outputformat="marcxml"
202
                 inputcharset="utf-8"/>
202
                 inputcharset="utf-8"/>
203
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
203
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
204
         </backend>
204
         </backend>
205
       </retrieval>
205
       </retrieval>
206
       <retrieval syntax="xml" name="mods">
206
       <retrieval syntax="xml" name="mods">
207
         <backend syntax="usmarc" name="F">
207
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
208
           <marc inputformat="marc" outputformat="marcxml"
208
           <marc inputformat="marc" outputformat="marcxml"
209
                 inputcharset="utf-8"/>
209
                 inputcharset="utf-8"/>
210
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
210
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
211
         </backend>
211
         </backend>
212
       </retrieval>
212
       </retrieval>
213
       <retrieval syntax="xml" name="rdfdc">
213
       <retrieval syntax="xml" name="rdfdc">
214
         <backend syntax="usmarc" name="F">
214
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
215
           <marc inputformat="marc" outputformat="marcxml"
215
           <marc inputformat="marc" outputformat="marcxml"
216
                 inputcharset="utf-8"/>
216
                 inputcharset="utf-8"/>
217
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
217
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
218
         </backend>
218
         </backend>
219
       </retrieval>
219
       </retrieval>
220
       <retrieval syntax="xml" name="rss2">
220
       <retrieval syntax="xml" name="rss2">
221
         <backend syntax="usmarc" name="F">
221
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
222
           <marc inputformat="marc" outputformat="marcxml"
222
           <marc inputformat="marc" outputformat="marcxml"
223
                 inputcharset="utf-8"/>
223
                 inputcharset="utf-8"/>
224
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
224
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
225
         </backend>
225
         </backend>
226
       </retrieval>
226
       </retrieval>
227
       <retrieval syntax="xml" name="utils">
227
       <retrieval syntax="xml" name="utils">
228
         <backend syntax="usmarc" name="F">
228
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
229
           <marc inputformat="marc" outputformat="marcxml"
229
           <marc inputformat="marc" outputformat="marcxml"
230
                 inputcharset="utf-8"/>
230
                 inputcharset="utf-8"/>
231
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
231
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
(-)a/etc/zebradb/etc/usmarc.mar (-3 / +2 lines)
Lines 1-3 Link Here
1
# $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
1
# $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
2
name usmarc
2
name __ZEBRA_MARC_FORMAT__
3
reference USmarc
3
reference __ZEBRA_MARC_FORMAT__
4
- 

Return to bug 3087