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 503-508 my $pl_files = { Link Here
503
if ($config{'INSTALL_ZEBRA'} eq "yes") {
503
if ($config{'INSTALL_ZEBRA'} eq "yes") {
504
    push @{ $pl_files->{'rewrite-config.PL'} }, (
504
    push @{ $pl_files->{'rewrite-config.PL'} }, (
505
        'blib/ZEBRA_CONF_DIR/etc/passwd',
505
        'blib/ZEBRA_CONF_DIR/etc/passwd',
506
        'blib/ZEBRA_CONF_DIR/etc/usmarc.mar',
506
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
507
        'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
507
        'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
508
        'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
508
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
509
        'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
(-)a/etc/koha-conf.xml (-23 / +23 lines)
Lines 44-90 __PAZPAR2_TOGGLE_XML_POST__ Link Here
44
                xmlns:xi="http://www.w3.org/2001/XInclude">
44
                xmlns:xi="http://www.w3.org/2001/XInclude">
45
      <xi:fallback>
45
      <xi:fallback>
46
     <retrievalinfo>
46
     <retrievalinfo>
47
       <retrieval syntax="usmarc" name="F"/>
47
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
48
       <retrieval syntax="usmarc" name="B"/>
48
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
49
       <retrieval syntax="xml" name="F"/>
49
       <retrieval syntax="xml" name="F"/>
50
       <retrieval syntax="xml" name="B"/>
50
       <retrieval syntax="xml" name="B"/>
51
       <retrieval syntax="xml" name="marcxml"
51
       <retrieval syntax="xml" name="marcxml"
52
                  identifier="info:srw/schema/1/marcxml-v1.1">
52
                  identifier="info:srw/schema/1/marcxml-v1.1">
53
         <backend syntax="usmarc" name="F">
53
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
54
           <marc inputformat="marc" outputformat="marcxml"
54
           <marc inputformat="marc" outputformat="marcxml"
55
                 inputcharset="utf-8"/>
55
                 inputcharset="utf-8"/>
56
         </backend>
56
         </backend>
57
       </retrieval>
57
       </retrieval>
58
       <retrieval syntax="xml" name="dc">
58
       <retrieval syntax="xml" name="dc">
59
         <backend syntax="usmarc" name="F">
59
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
60
           <marc inputformat="marc" outputformat="marcxml"
60
           <marc inputformat="marc" outputformat="marcxml"
61
                 inputcharset="utf-8"/>
61
                 inputcharset="utf-8"/>
62
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
62
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
63
         </backend>
63
         </backend>
64
       </retrieval>
64
       </retrieval>
65
       <retrieval syntax="xml" name="mods">
65
       <retrieval syntax="xml" name="mods">
66
         <backend syntax="usmarc" name="F">
66
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
67
           <marc inputformat="marc" outputformat="marcxml"
67
           <marc inputformat="marc" outputformat="marcxml"
68
                 inputcharset="utf-8"/>
68
                 inputcharset="utf-8"/>
69
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
69
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
70
         </backend>
70
         </backend>
71
       </retrieval>
71
       </retrieval>
72
       <retrieval syntax="xml" name="rdfdc">
72
       <retrieval syntax="xml" name="rdfdc">
73
         <backend syntax="usmarc" name="F">
73
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
74
           <marc inputformat="marc" outputformat="marcxml"
74
           <marc inputformat="marc" outputformat="marcxml"
75
                 inputcharset="utf-8"/>
75
                 inputcharset="utf-8"/>
76
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
76
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
77
         </backend>
77
         </backend>
78
       </retrieval>
78
       </retrieval>
79
       <retrieval syntax="xml" name="rss2">
79
       <retrieval syntax="xml" name="rss2">
80
         <backend syntax="usmarc" name="F">
80
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
81
           <marc inputformat="marc" outputformat="marcxml"
81
           <marc inputformat="marc" outputformat="marcxml"
82
                 inputcharset="utf-8"/>
82
                 inputcharset="utf-8"/>
83
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
83
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
84
         </backend>
84
         </backend>
85
       </retrieval>
85
       </retrieval>
86
       <retrieval syntax="xml" name="utils">
86
       <retrieval syntax="xml" name="utils">
87
         <backend syntax="usmarc" name="F">
87
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
88
           <marc inputformat="marc" outputformat="marcxml"
88
           <marc inputformat="marc" outputformat="marcxml"
89
                 inputcharset="utf-8"/>
89
                 inputcharset="utf-8"/>
90
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
90
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
Lines 124-161 __PAZPAR2_TOGGLE_XML_POST__ Link Here
124
                xmlns:xi="http://www.w3.org/2001/XInclude">
124
                xmlns:xi="http://www.w3.org/2001/XInclude">
125
      <xi:fallback>
125
      <xi:fallback>
126
     <retrievalinfo>
126
     <retrievalinfo>
127
       <retrieval syntax="usmarc" name="F"/>
127
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
128
       <retrieval syntax="usmarc" name="B"/>
128
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
129
       <retrieval syntax="xml" name="marcxml"
129
       <retrieval syntax="xml" name="marcxml"
130
                  identifier="info:srw/schema/1/marcxml-v1.1">
130
                  identifier="info:srw/schema/1/marcxml-v1.1">
131
         <backend syntax="usmarc" name="F">
131
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
132
           <marc inputformat="marc" outputformat="marcxml"
132
           <marc inputformat="marc" outputformat="marcxml"
133
                 inputcharset="utf-8"/>
133
                 inputcharset="utf-8"/>
134
         </backend>
134
         </backend>
135
       </retrieval>
135
       </retrieval>
136
       <retrieval syntax="xml" name="dc">
136
       <retrieval syntax="xml" name="dc">
137
         <backend syntax="usmarc" name="F">
137
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
138
           <marc inputformat="marc" outputformat="marcxml"
138
           <marc inputformat="marc" outputformat="marcxml"
139
                 inputcharset="utf-8"/>
139
                 inputcharset="utf-8"/>
140
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
140
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
141
         </backend>
141
         </backend>
142
       </retrieval>
142
       </retrieval>
143
       <retrieval syntax="xml" name="mods">
143
       <retrieval syntax="xml" name="mods">
144
         <backend syntax="usmarc" name="F">
144
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
145
           <marc inputformat="marc" outputformat="marcxml"
145
           <marc inputformat="marc" outputformat="marcxml"
146
                 inputcharset="utf-8"/>
146
                 inputcharset="utf-8"/>
147
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
147
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
148
         </backend>
148
         </backend>
149
       </retrieval>
149
       </retrieval>
150
       <retrieval syntax="xml" name="rdfdc">
150
       <retrieval syntax="xml" name="rdfdc">
151
         <backend syntax="usmarc" name="F">
151
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
152
           <marc inputformat="marc" outputformat="marcxml"
152
           <marc inputformat="marc" outputformat="marcxml"
153
                 inputcharset="utf-8"/>
153
                 inputcharset="utf-8"/>
154
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
154
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
155
         </backend>
155
         </backend>
156
       </retrieval>
156
       </retrieval>
157
       <retrieval syntax="xml" name="utils">
157
       <retrieval syntax="xml" name="utils">
158
         <backend syntax="usmarc" name="F">
158
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
159
           <marc inputformat="marc" outputformat="marcxml"
159
           <marc inputformat="marc" outputformat="marcxml"
160
                 inputcharset="utf-8"/>
160
                 inputcharset="utf-8"/>
161
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
161
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
Lines 193-239 __PAZPAR2_TOGGLE_XML_POST__ Link Here
193
                xmlns:xi="http://www.w3.org/2001/XInclude">
193
                xmlns:xi="http://www.w3.org/2001/XInclude">
194
      <xi:fallback>
194
      <xi:fallback>
195
     <retrievalinfo>
195
     <retrievalinfo>
196
       <retrieval syntax="usmarc" name="F"/>
196
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
197
       <retrieval syntax="usmarc" name="B"/>
197
       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
198
       <retrieval syntax="xml" name="F"/>
198
       <retrieval syntax="xml" name="F"/>
199
       <retrieval syntax="xml" name="B"/>
199
       <retrieval syntax="xml" name="B"/>
200
       <retrieval syntax="xml" name="marcxml"
200
       <retrieval syntax="xml" name="marcxml"
201
                  identifier="info:srw/schema/1/marcxml-v1.1">
201
                  identifier="info:srw/schema/1/marcxml-v1.1">
202
         <backend syntax="usmarc" name="F">
202
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
203
           <marc inputformat="marc" outputformat="marcxml"
203
           <marc inputformat="marc" outputformat="marcxml"
204
                 inputcharset="utf-8"/>
204
                 inputcharset="utf-8"/>
205
         </backend>
205
         </backend>
206
       </retrieval>
206
       </retrieval>
207
       <retrieval syntax="xml" name="dc">
207
       <retrieval syntax="xml" name="dc">
208
         <backend syntax="usmarc" name="F">
208
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
209
           <marc inputformat="marc" outputformat="marcxml"
209
           <marc inputformat="marc" outputformat="marcxml"
210
                 inputcharset="utf-8"/>
210
                 inputcharset="utf-8"/>
211
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
211
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
212
         </backend>
212
         </backend>
213
       </retrieval>
213
       </retrieval>
214
       <retrieval syntax="xml" name="mods">
214
       <retrieval syntax="xml" name="mods">
215
         <backend syntax="usmarc" name="F">
215
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
216
           <marc inputformat="marc" outputformat="marcxml"
216
           <marc inputformat="marc" outputformat="marcxml"
217
                 inputcharset="utf-8"/>
217
                 inputcharset="utf-8"/>
218
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
218
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
219
         </backend>
219
         </backend>
220
       </retrieval>
220
       </retrieval>
221
       <retrieval syntax="xml" name="rdfdc">
221
       <retrieval syntax="xml" name="rdfdc">
222
         <backend syntax="usmarc" name="F">
222
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
223
           <marc inputformat="marc" outputformat="marcxml"
223
           <marc inputformat="marc" outputformat="marcxml"
224
                 inputcharset="utf-8"/>
224
                 inputcharset="utf-8"/>
225
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
225
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
226
         </backend>
226
         </backend>
227
       </retrieval>
227
       </retrieval>
228
       <retrieval syntax="xml" name="rss2">
228
       <retrieval syntax="xml" name="rss2">
229
         <backend syntax="usmarc" name="F">
229
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
230
           <marc inputformat="marc" outputformat="marcxml"
230
           <marc inputformat="marc" outputformat="marcxml"
231
                 inputcharset="utf-8"/>
231
                 inputcharset="utf-8"/>
232
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
232
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
233
         </backend>
233
         </backend>
234
       </retrieval>
234
       </retrieval>
235
       <retrieval syntax="xml" name="utils">
235
       <retrieval syntax="xml" name="utils">
236
         <backend syntax="usmarc" name="F">
236
         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
237
           <marc inputformat="marc" outputformat="marcxml"
237
           <marc inputformat="marc" outputformat="marcxml"
238
                 inputcharset="utf-8"/>
238
                 inputcharset="utf-8"/>
239
           <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
239
           <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