OpenMRS

Timestamp:

08/15/08 11:32:45 (3 months ago)

Author:

jegg

Message:

in patientmatching module, updated OpenMRS reader with new method of generating HQL queries

Files:

• openmrs-modules/patientmatching/src/org/regenstrief/linkage/io/OrderedOpenMRSReader.java (modified) (2 diffs)

openmrs-modules/patientmatching/src/org/regenstrief/linkage/io/OrderedOpenMRSReader.java

@@ -182 +182 @@
-                List<Object> ret = null;
-                String query_text = new String();
-// need to see if demographic refers to a data model table value, or an attribute
-if(demographic.contains(".")){
-       // need to query the table name before the . for the field
-       String[] object_field = demographic.split("\\.");
-       String object_name = object_field[0]
-       String field = object_field[object_field.length - 1]
-       for(int i = 1; i < object_field.length - 1; i++){
-               object_name += "." + object_field[i]
-       }
-       
-       query_text = "SELECT DISTINCT o." + field + " FROM " + object_name + " o where o." + field + " IS NOT NULL"
-       Query q = sessionFactory.getCurrentSession().createQuery(query_text);
-       ret = q.list();
-} else 
-if(demographic.indexOf(ATTRIBUTE_PREFIX) != -1){
-       // need to look at attribute type first to get the right query
-String attr = stripType(demographic);
-(attr
+
+List<String> demographics = new ArrayList<String>();
+demographics.add(demographic);
+
+String select_clause = getSelectDistinctValuesClause(demographics)
+String from_clause = getFromClause(demographics)
+String where_clause = getValuesWhereClause(demographics);
+query_text = select_clause + " " + from_clause + " " + where_clause
+log.warn("getting values for " + demographic + " using query of:  " + query_text);
+
+Query q = sessionFactory.getCurrentSession().createQuery(query_text)
+
+// if list of demographics includes attributes or identifiers, need to set types in query text from method
+for(int i = 0; i < demographics.size(); i++)
+String dem = demographics.get(i);
+if(dem.indexOf(ATTRIBUTE_PREFIX) != -1){
+// set o<i>.type equal to pat
+ByName(stripType(demographic)
-                                if(pat != null){
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                                if(pit != null){
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                
-                return ret;
@@ -247 +237 @@
-                List<Integer> ret = null;
-                String query_text = new String();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if(demographic.contains(".")){
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
+                        // if it's attribute or identifier, then it'll have a Person or Patient field
-                        if(demographic.indexOf(ATTRIBUTE_PREFIX) != -1){
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        } else if(demographic.indexOf(IDENT_PREFIX) != -1){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-