Navigation

Changeset 5324

Timestamp:

08/20/08 20:27:40 (3 months ago)

Author:

bwolfe

Message:

occ: Fixed concept search order
Fixed main page multiple name search
Made concept pages available to anonymous users

Files:

r5085	r5324
16	16	import java.util.Collections;
17	17	import java.util.List;
	18	import java.util.Vector;
18	19
19	20	import org.hibernate.Criteria;
…	…
81	82	List<Integer> occConceptIds = getHibernateTemplate().findByCriteria(crit);
82	83
	84	// if we didn't find any concept ids, return an empty list of concepts
	85	if (occConceptIds.size() == 0) {
	86	return new Vector<Concept>();
	87	}
	88
83	89	// get a new criteria object so we can do the query and restrict
84	90	// on the concept ids;
…	…
137	143	crit.createAlias("names", "names");
138	144
139		if (search != null && !search.equals(""))
140		crit.add(Expression.like("names.name", search, MatchMode.ANYWHERE));
	145	if (search != null && !search.equals("")) {
	146	for (String searchPart : search.split(" ")) {
	147	String trimmedPart = searchPart.trim();
	148	if (trimmedPart.length() > 0)
	149	crit.add(Expression.like("names.name", trimmedPart, MatchMode.START));
	150	}
	151	}
141	152
142	153	if (sources != null)

r5160	r5324
28	28	import org.apache.commons.logging.Log;
29	29	import org.apache.commons.logging.LogFactory;
30		~~import org.openmrs.occ.OccConstants;~~
31	30	import org.openmrs.occ.model.Concept;
32	31	import org.openmrs.occ.model.ConceptDescription;
…	…
90	89	if (newConcept == null)
91	90	newConcept = oldConcept;
92		return new ModelAndView(new RedirectView(getFormView().toLowerCase() + ".html?occConceptId=" + newConcept.getOccConceptId()));
	91
	92	return new ModelAndView(new RedirectView("conceptform.html?occConceptId=" + newConcept.getOccConceptId()));
93	93	}
94	94

r5160	r5324
79	79
80	80	}
	81
	82	protected boolean isFormSubmission(HttpServletRequest request) {
	83	return !request.getParameterMap().isEmpty();
	84	}
81	85
82	86	/**
…	…
135	139
136	140	int page = OccWebUtil.getPage(request);
137		int pagesize = 10; // must match the pagesize set in display:tag
	141	int pagesize = 50; // must match the pagesize set in display:tag
138	142
139	143	// do the actual search

r5085	r5324
41	41	</logger>
42	42
43		<logger name="org.~~appfuse~~">
	43	<logger name="org.hibernate.util">
44	44	<level value="DEBUG"/>
45	45	</logger>

r5085	r5324
9	9	<intercept-url pattern="/*/.html*" access="ROLE_USER" />
10	10	<intercept-url pattern="/admin/*" access="ROLE_USER" />
	11	<intercept-url pattern="/concepts.html*" filters="none"/>
	12	<intercept-url pattern="/conceptform.html*" filters="none"/>
11	13	<intercept-url pattern="/signup.html" filters="none"/>
12	14	<intercept-url pattern="/localeform.html" filters="none"/>

r5085	r5324
32	32	<td>
33	33	<spring:bind path="command.selectedSources">
	34	<input type="hidden" name="_${status.expression}" >
34	35	<select name="${status.expression}" size="3" multiple>
35	36	<c:forEach var="source" items="${sources}">
…	…
78	79
79	80	<display:table name="concepts" class="table" requestURI=""
80		id="conceptRow" export="false" pagesize="~~10" sort="external~~"
	81	id="conceptRow" export="false" pagesize="50" sort="external" excludedParams="*"
81	82	decorator="conceptDecorator" partialList="true" size="resultSize">
82	83

r5085	r5324
3	3	<title><fmt:message key="conceptList.title" /></title>
4	4
5		<form action="concept.html" method="get"><fmt:message
	5	<form action="concepts.html" method="get"><fmt:message
6	6	key="concept.searchPhrase" />: <input type="text" id="searchPhrase"
7	7	name="searchPhrase" size="18" value="${fn:escapeXml(param.searchPhrase)}"> <fmt:message