Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[15664] dcm4chee/dcm4chee-web/trunk
|
From: <jav...@us...> - 2011-07-08 09:58:07
|
Revision: 15664
http://dcm4che.svn.sourceforge.net/dcm4che/?rev=15664&view=rev
Author: javawilli
Date: 2011-07-08 09:57:59 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
[#WEB-411] Make 'AutoWildcard' feature configurable.
Modified Paths:
--------------
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListBean.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListFilter.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListFilter.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/util/QueryUtil.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistBean.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistFilter.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/java/org/dcm4chee/web/service/webcfg/WebCfgService.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/resources/META-INF/xmdesc/webcfg-xmbean.xml
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/config/delegate/WebCfgDelegate.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java
dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListBean.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListBean.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListBean.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -196,7 +196,7 @@
QueryUtil.appendSeriesInstanceUIDFilter(ql, filter.getSeriesInstanceUID());
} else {
appendPatFilter(ql, filter);
- QueryUtil.appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ QueryUtil.appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
QueryUtil.appendPpsWithoutMwlFilter(ql, filter.isWithoutPps(), filter.isPpsWithoutMwl());
QueryUtil.appendStudyDateMinFilter(ql, filter.getStudyDateMin());
QueryUtil.appendStudyDateMaxFilter(ql, filter.getStudyDateMax());
@@ -216,10 +216,10 @@
if (filter.isFuzzyPN()) {
QueryUtil.appendPatientNameFuzzyFilter(ql, filter.getPatientName());
} else {
- QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName()));
+ QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
}
- QueryUtil.appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- QueryUtil.appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ QueryUtil.appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ QueryUtil.appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
if ( filter.isExtendedQuery()) {
QueryUtil.appendPatientBirthDateFilter(ql, filter.getBirthDateMin(), filter.getBirthDateMax());
}
@@ -235,7 +235,7 @@
QueryUtil.setSeriesInstanceUIDQueryParameter(query, filter.getSeriesInstanceUID());
} else {
setPatQueryParameters(query, filter);
- QueryUtil.setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ QueryUtil.setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
QueryUtil.setStudyDateMinQueryParameter(query, filter.getStudyDateMin());
QueryUtil.setStudyDateMaxQueryParameter(query, filter.getStudyDateMax());
QueryUtil.setModalityQueryParameter(query, filter.getModality());
@@ -250,10 +250,10 @@
if (filter.isFuzzyPN()) {
QueryUtil.setPatientNameFuzzyQueryParameter(query, filter.getPatientName());
} else {
- QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName()));
+ QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
}
- QueryUtil.setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- QueryUtil.setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ QueryUtil.setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ QueryUtil.setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
if ( filter.isExtendedQuery()) {
QueryUtil.setPatientBirthDateQueryParameter(query, filter.getBirthDateMin(), filter.getBirthDateMax());
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListFilter.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListFilter.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/folder/StudyListFilter.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -78,6 +78,7 @@
private boolean exactSeriesIuid;
private int autoExpandLevel = -1;
private boolean fuzzyPN;
+ private int autoWildcard = 0;
public StudyListFilter(String forUsername) {
clear();
@@ -281,4 +282,21 @@
public int getAutoExpandLevel() {
return autoExpandLevel;
}
+
+ public boolean isAutoWildcard() {
+ return autoWildcard > 1;
+ }
+
+ public boolean isPNAutoWildcard() {
+ return autoWildcard > 0;
+ }
+ /**
+ * 0..Off
+ * 1..Only Patient name
+ * 2..All 'wildcard' text fields.
+ * @param autoWildcard
+ */
+ public void setAutoWildcard(int autoWildcard) {
+ this.autoWildcard = autoWildcard;
+ }
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListBean.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -98,7 +98,7 @@
return query.setMaxResults(pagesize).setFirstResult(offset).getResultList();
else {
List<Object[]> result = query.setMaxResults(pagesize).setFirstResult(offset).getResultList();
- List<PrivatePatient> patientList = new ArrayList();
+ List<PrivatePatient> patientList = new ArrayList<PrivatePatient>();
PrivatePatient patient = null;
for (Object[] element: result) {
if (!patientList.contains((PrivatePatient) element[0])) {
@@ -125,7 +125,7 @@
} else {
if ( QueryUtil.isUniversalMatch(filter.getStudyInstanceUID()) ) {
appendPatFilter(ql, filter);
- QueryUtil.appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ QueryUtil.appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
} else {
ql.append(" AND s.studyInstanceUID = :studyInstanceUID");
}
@@ -136,9 +136,9 @@
}
private static void appendPatFilter(StringBuilder ql, TrashListFilter filter) {
- QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName()));
- QueryUtil.appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- QueryUtil.appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
+ QueryUtil.appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ QueryUtil.appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
}
private static void setQueryParameters(Query query, TrashListFilter filter, List<String> roles) {
@@ -147,7 +147,7 @@
} else {
if ( QueryUtil.isUniversalMatch(filter.getStudyInstanceUID()) ) {
setPatQueryParameters(query, filter);
- QueryUtil.setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ QueryUtil.setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
} else {
QueryUtil.setStudyInstanceUIDQueryParameter(query, filter.getStudyInstanceUID());
}
@@ -158,9 +158,9 @@
}
private static void setPatQueryParameters(Query query, TrashListFilter filter) {
- QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName()));
- QueryUtil.setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- QueryUtil.setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
+ QueryUtil.setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ QueryUtil.setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
}
public int countStudiesOfPatient(long pk, List<String> roles) {
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListFilter.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListFilter.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/trash/TrashListFilter.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -62,6 +62,7 @@
private String studyInstanceUID;
private String sourceAET;
private boolean patientQuery;
+ private int autoWildcard = 0;
public TrashListFilter(String forUsername) {
clear();
@@ -142,4 +143,21 @@
public void setPatientQuery(boolean patQuery) {
this.patientQuery = patQuery;
}
+
+ public boolean isAutoWildcard() {
+ return autoWildcard > 1;
+ }
+
+ public boolean isPNAutoWildcard() {
+ return autoWildcard > 0;
+ }
+ /**
+ * 0..Off
+ * 1..Only Patient name
+ * 2..All 'wildcard' text fields.
+ * @param autoWildcard
+ */
+ public void setAutoWildcard(int autoWildcard) {
+ this.autoWildcard = autoWildcard;
+ }
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/util/QueryUtil.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/util/QueryUtil.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/util/QueryUtil.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -110,10 +110,10 @@
}
- public static String checkAutoWildcard(String s) {
+ public static String checkAutoWildcard(String s, boolean allowWildcard) {
if (isUniversalMatch(s)) {
return null;
- } else if (s.indexOf('*')!=-1 || s.indexOf('?')!=-1 || s.indexOf('^')!=-1) {
+ } else if (!allowWildcard || s.indexOf('*')!=-1 || s.indexOf('?')!=-1 || s.indexOf('^')!=-1) {
return s;
} else {
return s+'*';
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistBean.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistBean.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistBean.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -118,14 +118,14 @@
if (filter.isFuzzyPN()) {
QueryUtil.appendPatientNameFuzzyFilter(ql, filter.getPatientName());
} else {
- QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName()));
+ QueryUtil.appendPatientNameFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
}
- appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ appendPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ appendIssuerOfPatientIDFilter(ql, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
if (filter.isExtendedQuery()) {
appendPatientBirthDateFilter(ql, filter.getBirthDateMin(), filter.getBirthDateMax());
}
- appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ appendAccessionNumberFilter(ql, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
appendStartDateMinFilter(ql, filter.getStartDateMin());
appendStartDateMaxFilter(ql, filter.getStartDateMax());
appendModalityFilter(ql, filter.getModality());
@@ -143,14 +143,14 @@
if (filter.isFuzzyPN()) {
QueryUtil.setPatientNameFuzzyQueryParameter(query, filter.getPatientName());
} else {
- QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName()));
+ QueryUtil.setPatientNameQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientName(), filter.isPNAutoWildcard()));
}
- setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID()));
- setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID()));
+ setPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getPatientID(), filter.isAutoWildcard()));
+ setIssuerOfPatientIDQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getIssuerOfPatientID(), filter.isAutoWildcard()));
if (filter.isExtendedQuery()) {
setPatientBirthDateQueryParameter(query, filter.getBirthDateMin(), filter.getBirthDateMax());
}
- setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber()));
+ setAccessionNumberQueryParameter(query, QueryUtil.checkAutoWildcard(filter.getAccessionNumber(), filter.isAutoWildcard()));
setStartDateMinQueryParameter(query, filter.getStartDateMin());
setStartDateMaxQueryParameter(query, filter.getStartDateMax());
setModalityQueryParameter(query, filter.getModality());
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistFilter.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistFilter.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-ejb/src/main/java/org/dcm4chee/web/dao/worklist/modality/ModalityWorklistFilter.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -73,6 +73,7 @@
private Date startDateMin;
private Date startDateMax;
private boolean fuzzyPN;
+ private int autoWildcard = 0;
public ModalityWorklistFilter(String forUsername) {
clear();
@@ -229,4 +230,21 @@
public void setStartDateMax(Date startDateMax) {
this.startDateMax = startDateMax;
}
+
+ public boolean isAutoWildcard() {
+ return autoWildcard > 1;
+ }
+
+ public boolean isPNAutoWildcard() {
+ return autoWildcard > 0;
+ }
+ /**
+ * 0..Off
+ * 1..Only Patient name
+ * 2..All 'wildcard' text fields.
+ * @param autoWildcard
+ */
+ public void setAutoWildcard(int autoWildcard) {
+ this.autoWildcard = autoWildcard;
+ }
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/java/org/dcm4chee/web/service/webcfg/WebCfgService.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/java/org/dcm4chee/web/service/webcfg/WebCfgService.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/java/org/dcm4chee/web/service/webcfg/WebCfgService.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -170,6 +170,8 @@
private List<Integer> autoExpandLevelChoices = new ArrayList<Integer>(6);
+ private int autoWildcard;
+
private int hasNotificationListener;
public WebCfgService() throws MalformedObjectNameException {
@@ -437,6 +439,17 @@
updateAutoUpdateTimer();
}
+ public int getAutoWildcard() {
+ return autoWildcard;
+ }
+
+ public void setAutoWildcard(int autoWildcard) {
+ if (autoWildcard < 0 || autoWildcard > 2) {
+ throw new IllegalArgumentException("AutoWildcard must be 0, 1 or 2!");
+ }
+ this.autoWildcard = autoWildcard;
+ }
+
public List<Integer> getPagesizeList() {
return pagesizes;
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/resources/META-INF/xmdesc/webcfg-xmbean.xml
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/resources/META-INF/xmdesc/webcfg-xmbean.xml 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-sar/dcm4chee-web-sar-webcfg/src/main/resources/META-INF/xmdesc/webcfg-xmbean.xml 2011-07-08 09:57:59 UTC (rev 15664)
@@ -459,6 +459,23 @@
<value value="auto;Patient;Study;Series"/>
</descriptors>
</attribute>
+
+ <attribute access="read-write"
+ getMethod="getAutoWildcard"
+ setMethod="setAutoWildcard">
+ <description><![CDATA[AutoWildcard specify if text of search fields should be automatically extended by '*'.<br/>
+ <dl><dt>Possible values:</dt>
+ <dd>0...Disabled</dd>
+ <dd>1...Only patient name</dd>
+ <dd>2...All 'wildcard' search fields</dd>
+ </dl>
+ ]]></description>
+ <name>AutoWildcard</name>
+ <type>int</type>
+ <descriptors>
+ <value value="1"/>
+ </descriptors>
+ </attribute>
<attribute access="read-write"
getMethod="getPagesizes"
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/config/delegate/WebCfgDelegate.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/config/delegate/WebCfgDelegate.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/config/delegate/WebCfgDelegate.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -185,6 +185,19 @@
return getIntegerList("getAutoExpandLevelChoiceList", Arrays.asList(-1));
}
+ public int getAutoWildcard() {
+ if (server != null) {
+ try {
+ return (Integer) server.getAttribute(serviceObjectName, "AutoWildcard");
+ } catch (Exception ignore) {
+ log.debug("Failed to get AutoWildcard attribute!", ignore);
+ }
+ }
+ log.warn("Cant get AutoWildcard attribute! return 1 (only Patient) as default!");
+ return 1;
+
+ }
+
@SuppressWarnings("unchecked")
public List<Integer> getPagesizeList() {
if (server == null) return Arrays.asList(10,25,50);
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/folder/StudyListPage.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -613,6 +613,7 @@
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
viewport.setOffset(0);
+ viewport.getFilter().setAutoWildcard(WebCfgDelegate.getInstance().getAutoWildcard());
queryStudies(target);
target.addComponent(form);
}
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/trash/TrashListPage.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -48,7 +48,6 @@
import javax.management.MBeanException;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxCallDecorator;
@@ -59,7 +58,6 @@
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.CSSPackageResource;
-import org.apache.wicket.markup.html.JavascriptPackageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
@@ -91,6 +89,7 @@
import org.dcm4chee.archive.util.JNDIUtils;
import org.dcm4chee.icons.ImageManager;
import org.dcm4chee.icons.behaviours.ImageSizeBehaviour;
+import org.dcm4chee.web.common.ajax.MaskingAjaxCallBehavior;
import org.dcm4chee.web.common.behaviours.SelectableTableRowBehaviour;
import org.dcm4chee.web.common.behaviours.TooltipBehaviour;
import org.dcm4chee.web.common.markup.BaseForm;
@@ -104,17 +103,11 @@
import org.dcm4chee.web.dao.util.QueryUtil;
import org.dcm4chee.web.service.common.FileImportOrder;
import org.dcm4chee.web.war.AuthenticatedWebSession;
-import org.dcm4chee.web.war.MainPage;
import org.dcm4chee.web.war.StudyPermissionHelper;
-import org.dcm4chee.web.common.ajax.MaskingAjaxCallBehavior;
import org.dcm4chee.web.war.common.IndicatingAjaxFormSubmitBehavior;
import org.dcm4chee.web.war.common.model.AbstractDicomModel;
import org.dcm4chee.web.war.config.delegate.WebCfgDelegate;
import org.dcm4chee.web.war.folder.DicomObjectPanel;
-import org.dcm4chee.web.war.folder.model.PPSModel;
-import org.dcm4chee.web.war.folder.model.PatientModel;
-import org.dcm4chee.web.war.folder.model.SeriesModel;
-import org.dcm4chee.web.war.folder.model.StudyModel;
import org.dcm4chee.web.war.trash.delegate.StoreBridgeDelegate;
import org.dcm4chee.web.war.trash.model.PrivInstanceModel;
import org.dcm4chee.web.war.trash.model.PrivPatientModel;
@@ -333,6 +326,7 @@
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
try {
viewport.setOffset(0);
+ viewport.getFilter().setAutoWildcard(WebCfgDelegate.getInstance().getAutoWildcard());
queryStudies();
} catch (Throwable t) {
log.error("search failed: ", t);
Modified: dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java
===================================================================
--- dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java 2011-07-08 07:55:21 UTC (rev 15663)
+++ dcm4chee/dcm4chee-web/trunk/dcm4chee-web-war/src/main/java/org/dcm4chee/web/war/worklist/modality/ModalityWorklistPanel.java 2011-07-08 09:57:59 UTC (rev 15664)
@@ -613,7 +613,7 @@
searchDS.putString(Tag.PatientName, VR.PN, checkAutoWildcard(filter.getPatientName()));
searchDS.putString(Tag.PatientID, VR.LO, filter.getPatientID());
searchDS.putString(Tag.IssuerOfPatientID, VR.LO, filter.getIssuerOfPatientID());
- searchDS.putString(Tag.AccessionNumber, VR.SH, checkAutoWildcard(filter.getAccessionNumber()));
+ searchDS.putString(Tag.AccessionNumber, VR.SH, filter.getAccessionNumber());
DicomElement spsSq = searchDS.putSequence(Tag.ScheduledProcedureStepSequence);
DicomObject spsSqItem = new BasicDicomObject();
spsSq.addDicomObject(spsSqItem);
@@ -744,6 +744,7 @@
private void doSearch(AjaxRequestTarget target) {
viewport.setOffset(0);
+ viewport.getFilter().setAutoWildcard(WebCfgDelegate.getInstance().getAutoWildcard());
queryMWLItems(target);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
