Changeset 6900
- Timestamp:
- 01/12/16 11:20:59 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java
r6897 r6900 228 228 229 229 // diagnostics 230 writeDiagnosticList(out, ns, request.getDiagnostics()); 230 writeDiagnosticList(out, ns, ns.getResponseNS(), 231 request.getDiagnostics()); 231 232 232 233 // extraResponseData … … 359 360 360 361 // diagnostics 361 writeDiagnosticList(out, ns, request.getDiagnostics());362 writeDiagnosticList(out, ns, ns.getScanNS(), request.getDiagnostics()); 362 363 363 364 // extraResponseData … … 564 565 565 566 // diagnostics 566 writeDiagnosticList(out, ns, request.getDiagnostics()); 567 writeDiagnosticList(out, ns, ns.getResponseNS(), 568 request.getDiagnostics()); 567 569 568 570 // extraResponseData … … 639 641 } 640 642 641 out.setPrefix(ns.getResponsePrefix(), ns.getResponseNS());642 643 switch (operation) { 643 644 case EXPLAIN: 645 out.setPrefix(ns.getResponsePrefix(), ns.getResponseNS()); 644 646 out.writeStartElement(ns.getResponseNS(), "explainResponse"); 647 out.writeNamespace(ns.getResponsePrefix(), ns.getResponseNS()); 648 // version 649 writeVersion(out, ns.getResponseNS(), version); 645 650 break; 646 651 case SCAN: 647 out.writeStartElement(ns.getResponseNS(), "scanResponse"); 652 out.setPrefix(ns.getScanPrefix(), ns.getScanNS()); 653 out.writeStartElement(ns.getScanNS(), "scanResponse"); 654 out.writeNamespace(ns.getScanPrefix(), ns.getScanNS()); 655 // version 656 writeVersion(out, ns.getScanNS(), version); 648 657 break; 649 658 case SEARCH_RETRIEVE: 659 out.setPrefix(ns.getResponsePrefix(), ns.getResponseNS()); 650 660 out.writeStartElement(ns.getResponseNS(), "searchRetrieveResponse"); 661 out.writeNamespace(ns.getResponsePrefix(), ns.getResponseNS()); 662 // version 663 writeVersion(out, ns.getResponseNS(), version); 651 664 break; 652 665 } 653 out.writeNamespace(ns.getResponsePrefix(), ns.getResponseNS()); 654 655 // version 656 writeVersion(out, ns, version); 666 657 667 } 658 668 … … 701 711 // 'explain' requires a complete explain record ... 702 712 writeExplainRecord(out, ns, request); 713 writeDiagnosticList(out, ns, ns.getResponseNS(), diagnotics); 703 714 break; 704 715 case SCAN: 705 716 // 'scan' fortunately does not need any elements ... 717 writeDiagnosticList(out, ns, ns.getScanNS(), diagnotics); 706 718 break; 707 719 case SEARCH_RETRIEVE: … … 710 722 out.writeCharacters("0"); 711 723 out.writeEndElement(); // "numberOfRecords" element 724 writeDiagnosticList(out, ns, ns.getResponseNS(), diagnotics); 712 725 break; 713 726 } 714 writeDiagnosticList(out, ns, diagnotics);715 727 endResponse(out); 716 728 } … … 718 730 719 731 private void writeDiagnosticList(SRUXMLStreamWriter out, SRUNamespaces ns, 720 List<SRUDiagnostic> diagnostics) throws XMLStreamException { 732 String envelopeNs, List<SRUDiagnostic> diagnostics) 733 throws XMLStreamException { 721 734 if ((diagnostics != null) && !diagnostics.isEmpty()) { 722 735 out.setPrefix(ns.getDiagnosticPrefix(), ns.getDiagnosticNS()); 723 out.writeStartElement( ns.getDiagnosticNS(), "diagnostics");736 out.writeStartElement(envelopeNs, "diagnostics"); 724 737 out.writeNamespace(ns.getDiagnosticPrefix(), ns.getDiagnosticNS()); 725 738 for (SRUDiagnostic diagnostic : diagnostics) { … … 952 965 // echoedExplainRequest/version 953 966 if (request.getRawVersion() != null) { 954 writeVersion(out, ns , request.getRawVersion());967 writeVersion(out, ns.getResponseNS(), request.getRawVersion()); 955 968 } 956 969 … … 979 992 // echoedScanRequest/version 980 993 if (request.getRawVersion() != null) { 981 writeVersion(out, ns , request.getRawVersion());994 writeVersion(out, ns.getResponseNS(), request.getRawVersion()); 982 995 } 983 996 … … 1029 1042 // echoedSearchRetrieveRequest/version 1030 1043 if (request.getRawVersion() != null) { 1031 writeVersion(out, ns , request.getRawVersion());1044 writeVersion(out, ns.getResponseNS(), request.getRawVersion()); 1032 1045 } 1033 1046 … … 1159 1172 1160 1173 1161 private void writeVersion(SRUXMLStreamWriter out, S RUNamespaces ns,1174 private void writeVersion(SRUXMLStreamWriter out, String envelopeNs, 1162 1175 SRUVersion version) throws XMLStreamException { 1163 out.writeStartElement( ns.getResponseNS(), "version");1176 out.writeStartElement(envelopeNs, "version"); 1164 1177 switch (version) { 1165 1178 case VERSION_1_1:
Note: See TracChangeset
for help on using the changeset viewer.