Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15674] weasis/weasis_framework/trunk/weasis-dicom
|
From: <nr...@us...> - 2011-07-08 12:18:28
|
Revision: 15674
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15674&view=rev
Author: nroduit
Date: 2011-07-08 12:18:21 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Add http tags for WADO
Modified Paths:
--------------
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/wado/WadoParameters.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/DownloadManager.java
weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/config/wado_query.xsd
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/wado/WadoParameters.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/wado/WadoParameters.java 2011-07-08 12:17:57 UTC (rev 15673)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-codec/src/main/java/org/weasis/dicom/codec/wado/WadoParameters.java 2011-07-08 12:18:21 UTC (rev 15674)
@@ -23,7 +23,7 @@
public static final String TAG_WADO_ADDITIONNAL_PARAMETERS = "additionnalParameters"; //$NON-NLS-1$
public static final String TAG_WADO_OVERRIDE_TAGS = "overrideDicomTagsList"; //$NON-NLS-1$
public static final String TAG_WADO_WEB_LOGIN = "webLogin"; //$NON-NLS-1$
- public static final String TAG_HTTP_TAG_LIST = "httpTagList"; //$NON-NLS-1$
+ public static final String TAG_HTTP_TAG = "httpTag"; //$NON-NLS-1$
private final String wadoURL;
private final boolean requireOnlySOPInstanceUID;
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/DownloadManager.java
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/DownloadManager.java 2011-07-08 12:17:57 UTC (rev 15673)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/wado/DownloadManager.java 2011-07-08 12:18:21 UTC (rev 15674)
@@ -145,29 +145,10 @@
if (TagW.DICOM_LEVEL.Patient.name().equals(xmler.getName().getLocalPart())) {
patient = readPatient(model, seriesList, xmler, wadoParameters);
pat++;
- } else if (WadoParameters.TAG_HTTP_TAG_LIST.equals(xmler.getName()
- .getLocalPart())) {
- boolean state = true;
- while (xmler.hasNext() && state) {
- eventType = xmler.next();
- switch (eventType) {
- case XMLStreamConstants.START_ELEMENT:
- if ("Tag".equals(xmler.getName().getLocalPart())) {
- String httpkey = getTagAttribute(xmler, "key", null); //$NON-NLS-1$
- String httpvalue = getTagAttribute(xmler, "value", null); //$NON-NLS-1$
- wadoParameters.addHttpTag(httpkey, httpvalue);
- }
- break;
- case XMLStreamConstants.END_ELEMENT:
- if (WadoParameters.TAG_HTTP_TAG_LIST.equals(xmler.getName()
- .getLocalPart())) {
- state = false;
- }
- break;
- default:
- break;
- }
- }
+ } else if (WadoParameters.TAG_HTTP_TAG.equals(xmler.getName().getLocalPart())) {
+ String httpkey = getTagAttribute(xmler, "key", null); //$NON-NLS-1$
+ String httpvalue = getTagAttribute(xmler, "value", null); //$NON-NLS-1$
+ wadoParameters.addHttpTag(httpkey, httpvalue);
}
break;
default:
Modified: weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/config/wado_query.xsd
===================================================================
--- weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/config/wado_query.xsd 2011-07-08 12:17:57 UTC (rev 15673)
+++ weasis/weasis_framework/trunk/weasis-dicom/weasis-dicom-explorer/src/main/resources/config/wado_query.xsd 2011-07-08 12:18:21 UTC (rev 15674)
@@ -108,21 +108,18 @@
</xsd:restriction>
</xsd:simpleType>
- <xsd:group name="httpTagList">
- <xsd:sequence>
- <xsd:element name="Tag" minOccurs="0" maxOccurs="unbounded" >
- <xsd:attribute name="key" type="xsd:string" use="required" />
- <xsd:attribute name="value" type="xsd:string" use="required" />
- </xsd:element>
- </xsd:sequence>
- </xsd:group>
<!-- DESCRIPTION OF WADO_QUERY XML DOCUMENT -->
<xsd:element name="wado_query" type="WADOQuery"/>
<xsd:complexType name="WADOQuery">
- <xsd:group ref="httpTagList"/>
<xsd:sequence>
+ <xsd:element name="httpTag" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="key" type="xsd:string" use="required" />
+ <xsd:attribute name="value" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="Patient" type="Patient" minOccurs="1" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="wadoURL" type="xsd:anyURI" use="required"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
