dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #07611
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2192: Fix bugs: Same exceptions in Benificiary functions and some bugs.
------------------------------------------------------------
revno: 2192
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-09-22 13:44:36 +0700
message:
Fix bugs: Same exceptions in Benificiary functions and some bugs.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2010-09-09 09:32:23 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2010-09-22 06:44:36 +0000
@@ -45,315 +45,290 @@
* @author Lars Helge Overland
* @version $Id$
*/
-public class TableAlteror
- extends AbstractStartupRoutine
-{
- private static final Log log = LogFactory.getLog( TableAlteror.class );
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private StatementManager statementManager;
-
- public void setStatementManager( StatementManager statementManager )
- {
- this.statementManager = statementManager;
- }
-
- // -------------------------------------------------------------------------
- // Execute
- // -------------------------------------------------------------------------
-
- @Transactional
- public void execute()
- {
- // ---------------------------------------------------------------------
- // Drop outdated tables
- // ---------------------------------------------------------------------
-
- executeSql( "DROP TABLE categoryoptioncomboname" );
- executeSql( "DROP TABLE orgunitgroupsetstructure" );
- executeSql( "DROP TABLE orgunitstructure" );
- executeSql( "DROP TABLE orgunithierarchystructure" );
- executeSql( "DROP TABLE orgunithierarchy" );
- executeSql( "DROP TABLE datavalueaudit" );
- executeSql( "DROP TABLE columnorder" );
- executeSql( "DROP TABLE roworder" );
- executeSql( "DROP TABLE sectionmembers" );
- executeSql( "DROP TABLE reporttable_categoryoptioncombos" );
- executeSql( "ALTER TABLE dataelementcategoryoption drop column categoryid" );
- executeSql( "ALTER TABLE reporttable DROP column dimensiontype" );
- executeSql( "ALTER TABLE categoryoptioncombo DROP COLUMN displayorder" );
- executeSql( "ALTER TABLE dataelementcategoryoption DROP COLUMN shortname" );
- executeSql( "ALTER TABLE section DROP COLUMN label" );
- executeSql( "ALTER TABLE section DROP COLUMN title;" );
- executeSql( "ALTER TABLE organisationunit DROP COLUMN polygoncoordinates" );
- executeSql( "ALTER TABLE dataelementcategory DROP COLUMN conceptName" );
-
- // remove relative period type
- executeSql( "DELETE FROM period WHERE periodtypeid=(select periodtypeid from periodtype where name='Relative')" );
- executeSql( "DELETE FROM periodtype WHERE name='Relative'" );
-
- // ---------------------------------------------------------------------
- // Update tables for dimensional model
- // ---------------------------------------------------------------------
-
- // categories_categoryoptions
- // set to 0 temporarily
- int c1 = executeSql( "UPDATE categories_categoryoptions SET sort_order=0 WHERE sort_order is NULL OR sort_order=0" );
- if ( c1 > 0 )
- {
- updateSortOrder( "categories_categoryoptions", "categoryid", "categoryoptionid" );
- }
- executeSql( "ALTER TABLE categories_categoryoptions DROP CONSTRAINT categories_categoryoptions_pkey" );
- executeSql( "ALTER TABLE categories_categoryoptions ADD CONSTRAINT categories_categoryoptions_pkey PRIMARY KEY (categoryid, sort_order)" );
-
- // categorycombos_categories
- // set to 0 temporarily
- int c2 = executeSql( "update categorycombos_categories SET sort_order=0 where sort_order is NULL OR sort_order=0" );
- if ( c2 > 0 )
- {
- updateSortOrder( "categorycombos_categories", "categorycomboid", "categoryid" );
- }
- executeSql( "ALTER TABLE categorycombos_categories DROP CONSTRAINT categorycombos_categories_pkey" );
- executeSql( "ALTER TABLE categorycombos_categories ADD CONSTRAINT categorycombos_categories_pkey PRIMARY KEY (categorycomboid, sort_order)" );
-
- // categorycombos_optioncombos
- executeSql( "ALTER TABLE categorycombos_optioncombos DROP CONSTRAINT categorycombos_optioncombos_pkey" );
- executeSql( "ALTER TABLE categorycombos_optioncombos ADD CONSTRAINT categorycombos_optioncombos_pkey PRIMARY KEY (categoryoptioncomboid)" );
- executeSql( "ALTER TABLE categorycombos_optioncombos DROP CONSTRAINT fk4bae70f697e49675" );
-
- // categoryoptioncombos_categoryoptions
- // set to 0 temporarily
- int c3 = executeSql( "update categoryoptioncombos_categoryoptions SET sort_order=0 where sort_order is NULL OR sort_order=0" );
- if ( c3 > 0 )
- {
- updateSortOrder( "categoryoptioncombos_categoryoptions", "categoryoptioncomboid", "categoryoptionid" );
- }
- executeSql( "ALTER TABLE categoryoptioncombos_categoryoptions DROP CONSTRAINT categoryoptioncombos_categoryoptions_pkey" );
- executeSql( "ALTER TABLE categoryoptioncombos_categoryoptions ADD CONSTRAINT categoryoptioncombos_categoryoptions_pkey PRIMARY KEY (categoryoptioncomboid, sort_order)" );
-
- // dataelementcategoryoption
- executeSql( "ALTER TABLE dataelementcategoryoption DROP CONSTRAINT fk_dataelement_categoryid" );
- // executeSql(
- // "ALTER TABLE dataelementcategoryoption DROP CONSTRAINT
- // dataelementcategoryoption_name_key"
- // ); will be maintained in transition period
- executeSql( "ALTER TABLE dataelementcategoryoption DROP CONSTRAINT dataelementcategoryoption_shortname_key" );
-
- // minmaxdataelement query index
- executeSql( "CREATE INDEX index_minmaxdataelement ON minmaxdataelement( sourceid, dataelementid, categoryoptioncomboid )" );
-
- // drop code unique constraints
- executeSql( "ALTER TABLE dataelement DROP CONSTRAINT dataelement_code_key" );
- executeSql( "ALTER TABLE indicator DROP CONSTRAINT indicator_code_key" );
- executeSql( "ALTER TABLE organisationunit DROP CONSTRAINT organisationunit_code_key" );
-
- // add mandatory boolean field to patientattribute
- if ( executeSql( "ALTER TABLE patientattribute ADD mandatory bool" ) >= 0 )
- {
- executeSql( "UPDATE patientattribute SET mandatory=false" );
- }
-
- // update periodType field to ValidationRule
- executeSql( "UPDATE validationrule SET periodtypeid = (SELECT periodtypeid FROM periodtype WHERE name='Monthly')" );
-
- // set varchar to text
- executeSql( "ALTER TABLE dataelement ALTER description TYPE text" );
- executeSql( "ALTER TABLE indicator ALTER description TYPE text" );
- executeSql( "ALTER TABLE datadictionary ALTER description TYPE text" );
- executeSql( "ALTER TABLE validationrule ALTER description TYPE text" );
- executeSql( "ALTER TABLE expression ALTER expression TYPE text" );
- executeSql( "ALTER TABLE translation ALTER value TYPE text" );
-
- // orgunit shortname uniqueness
- executeSql( "ALTER TABLE organisationunit DROP CONSTRAINT organisationunit_shortname_key" );
-
-
- // update dataset-dataentryform association and programstage -
- // dataentryform association
- if ( updateDataSetAssociation() && updateProgramStageAssociation() )
- {
- // delete table dataentryformassociation
- executeSql( "DROP TABLE dataentryformassociation" );
- }
-
- executeSql( "ALTER TABLE section DROP CONSTRAINT section_name_key" );
-
- log.info( "Tables updated" );
- }
-
- private List<Integer> getDistinctIdList( String table, String col1 )
- {
- StatementHolder holder = statementManager.getHolder();
-
- List<Integer> distinctIds = new ArrayList<Integer>();
-
- try
- {
- Statement statement = holder.getStatement();
-
- ResultSet resultSet = statement.executeQuery( "SELECT DISTINCT " + col1 + " FROM " + table );
-
- while ( resultSet.next() )
- {
- distinctIds.add( resultSet.getInt( 1 ) );
- }
- }
- catch ( Exception ex )
- {
- log.error( ex );
- }
- finally
- {
- holder.close();
- }
-
- return distinctIds;
- }
-
- private Map<Integer, List<Integer>> getIdMap( String table, String col1, String col2, List<Integer> distinctIds )
- {
- StatementHolder holder = statementManager.getHolder();
-
- Map<Integer, List<Integer>> idMap = new HashMap<Integer, List<Integer>>();
-
- try
- {
- Statement statement = holder.getStatement();
-
- for ( Integer distinctId : distinctIds )
- {
- List<Integer> foreignIds = new ArrayList<Integer>();
-
- ResultSet resultSet = statement.executeQuery( "SELECT " + col2 + " FROM " + table + " WHERE " + col1
- + "=" + distinctId );
-
- while ( resultSet.next() )
- {
- foreignIds.add( resultSet.getInt( 1 ) );
- }
-
- idMap.put( distinctId, foreignIds );
- }
- }
- catch ( Exception ex )
- {
- log.error( ex );
- }
- finally
- {
- holder.close();
- }
-
- return idMap;
- }
-
- private void updateSortOrder( String table, String col1, String col2 )
- {
- List<Integer> distinctIds = getDistinctIdList( table, col1 );
-
- log.info( "Got distinct ids: " + distinctIds.size() );
-
- Map<Integer, List<Integer>> idMap = getIdMap( table, col1, col2, distinctIds );
-
- log.info( "Got id map: " + idMap.size() );
-
- for ( Integer distinctId : idMap.keySet() )
- {
- int sortOrder = 1;
-
- for ( Integer foreignId : idMap.get( distinctId ) )
- {
- String sql = "UPDATE " + table + " SET sort_order=" + sortOrder++ + " WHERE " + col1 + "=" + distinctId
- + " AND " + col2 + "=" + foreignId;
-
- int count = executeSql( sql );
-
- log.info( "Executed: " + count + " - " + sql );
- }
- }
- }
-
- private int executeSql( String sql )
- {
- try
- {
- return statementManager.getHolder().executeUpdate( sql );
- }
- catch ( Exception ex )
- {
- log.debug( ex );
-
- return -1;
- }
- }
-
- private boolean updateDataSetAssociation()
- {
- StatementHolder holder = statementManager.getHolder();
-
- try
- {
- Statement statement = holder.getStatement();
-
- ResultSet _resultSet = statement.executeQuery( "SELECT * FROM dataentryformassociation" );
- if ( _resultSet.next() )
- {
- ResultSet resultSet = statement
- .executeQuery( "SELECT associationid, dataentryformid FROM dataentryformassociation WHERE associationtablename = 'dataset'" );
-
- while ( resultSet.next() )
- {
- executeSql( "UPDATE dataset SET dataentryform=" + resultSet.getInt( 2 ) + " WHERE datasetid="
- + resultSet.getInt( 1 ) );
- }
- return true;
- }
-
- return false;
-
- }
- catch ( Exception ex )
- {
- log.error( ex );
- return false;
- }
- finally
- {
- holder.close();
- }
-
- }
-
- private boolean updateProgramStageAssociation()
- {
- StatementHolder holder = statementManager.getHolder();
-
- try
- {
- Statement statement = holder.getStatement();
-
- ResultSet resultSet = statement
- .executeQuery( "SELECT associationid, dataentryformid FROM dataentryformassociation WHERE associationtablename = 'programstage'" );
-
- while ( resultSet.next() )
- {
- executeSql( "UPDATE programstage SET dataentryform=" + resultSet.getInt( 2 ) + " WHERE programstageid="
- + resultSet.getInt( 1 ) );
- }
- return true;
- }
- catch ( Exception ex )
- {
- log.error( ex );
- return false;
- }
- finally
- {
- holder.close();
- }
-
- }
+public class TableAlteror extends AbstractStartupRoutine {
+ private static final Log log = LogFactory.getLog(TableAlteror.class);
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private StatementManager statementManager;
+
+ public void setStatementManager(StatementManager statementManager) {
+ this.statementManager = statementManager;
+ }
+
+ // -------------------------------------------------------------------------
+ // Execute
+ // -------------------------------------------------------------------------
+
+ @Transactional
+ public void execute() {
+ // ---------------------------------------------------------------------
+ // Drop outdated tables
+ // ---------------------------------------------------------------------
+
+ executeSql("DROP TABLE categoryoptioncomboname");
+ executeSql("DROP TABLE orgunitgroupsetstructure");
+ executeSql("DROP TABLE orgunitstructure");
+ executeSql("DROP TABLE orgunithierarchystructure");
+ executeSql("DROP TABLE orgunithierarchy");
+ executeSql("DROP TABLE datavalueaudit");
+ executeSql("DROP TABLE columnorder");
+ executeSql("DROP TABLE roworder");
+ executeSql("DROP TABLE sectionmembers");
+ executeSql("DROP TABLE reporttable_categoryoptioncombos");
+ executeSql("ALTER TABLE dataelementcategoryoption drop column categoryid");
+ executeSql("ALTER TABLE reporttable DROP column dimensiontype");
+ executeSql("ALTER TABLE categoryoptioncombo DROP COLUMN displayorder");
+ executeSql("ALTER TABLE dataelementcategoryoption DROP COLUMN shortname");
+ executeSql("ALTER TABLE section DROP COLUMN label");
+ executeSql("ALTER TABLE section DROP COLUMN title;");
+ executeSql("ALTER TABLE organisationunit DROP COLUMN polygoncoordinates");
+ executeSql("ALTER TABLE dataelementcategory DROP COLUMN conceptName");
+
+ // remove relative period type
+ executeSql("DELETE FROM period WHERE periodtypeid=(select periodtypeid from periodtype where name='Relative')");
+ executeSql("DELETE FROM periodtype WHERE name='Relative'");
+
+ // ---------------------------------------------------------------------
+ // Update tables for dimensional model
+ // ---------------------------------------------------------------------
+
+ // categories_categoryoptions
+ // set to 0 temporarily
+ int c1 = executeSql("UPDATE categories_categoryoptions SET sort_order=0 WHERE sort_order is NULL OR sort_order=0");
+ if (c1 > 0) {
+ updateSortOrder("categories_categoryoptions", "categoryid",
+ "categoryoptionid");
+ }
+ executeSql("ALTER TABLE categories_categoryoptions DROP CONSTRAINT categories_categoryoptions_pkey");
+ executeSql("ALTER TABLE categories_categoryoptions ADD CONSTRAINT categories_categoryoptions_pkey PRIMARY KEY (categoryid, sort_order)");
+
+ // categorycombos_categories
+ // set to 0 temporarily
+ int c2 = executeSql("update categorycombos_categories SET sort_order=0 where sort_order is NULL OR sort_order=0");
+ if (c2 > 0) {
+ updateSortOrder("categorycombos_categories", "categorycomboid",
+ "categoryid");
+ }
+ executeSql("ALTER TABLE categorycombos_categories DROP CONSTRAINT categorycombos_categories_pkey");
+ executeSql("ALTER TABLE categorycombos_categories ADD CONSTRAINT categorycombos_categories_pkey PRIMARY KEY (categorycomboid, sort_order)");
+
+ // categorycombos_optioncombos
+ executeSql("ALTER TABLE categorycombos_optioncombos DROP CONSTRAINT categorycombos_optioncombos_pkey");
+ executeSql("ALTER TABLE categorycombos_optioncombos ADD CONSTRAINT categorycombos_optioncombos_pkey PRIMARY KEY (categoryoptioncomboid)");
+ executeSql("ALTER TABLE categorycombos_optioncombos DROP CONSTRAINT fk4bae70f697e49675");
+
+ // categoryoptioncombos_categoryoptions
+ // set to 0 temporarily
+ int c3 = executeSql("update categoryoptioncombos_categoryoptions SET sort_order=0 where sort_order is NULL OR sort_order=0");
+ if (c3 > 0) {
+ updateSortOrder("categoryoptioncombos_categoryoptions",
+ "categoryoptioncomboid", "categoryoptionid");
+ }
+ executeSql("ALTER TABLE categoryoptioncombos_categoryoptions DROP CONSTRAINT categoryoptioncombos_categoryoptions_pkey");
+ executeSql("ALTER TABLE categoryoptioncombos_categoryoptions ADD CONSTRAINT categoryoptioncombos_categoryoptions_pkey PRIMARY KEY (categoryoptioncomboid, sort_order)");
+
+ // dataelementcategoryoption
+ executeSql("ALTER TABLE dataelementcategoryoption DROP CONSTRAINT fk_dataelement_categoryid");
+ // executeSql(
+ // "ALTER TABLE dataelementcategoryoption DROP CONSTRAINT
+ // dataelementcategoryoption_name_key"
+ // ); will be maintained in transition period
+ executeSql("ALTER TABLE dataelementcategoryoption DROP CONSTRAINT dataelementcategoryoption_shortname_key");
+
+ // minmaxdataelement query index
+ executeSql("CREATE INDEX index_minmaxdataelement ON minmaxdataelement( sourceid, dataelementid, categoryoptioncomboid )");
+
+ // drop code unique constraints
+ executeSql("ALTER TABLE dataelement DROP CONSTRAINT dataelement_code_key");
+ executeSql("ALTER TABLE indicator DROP CONSTRAINT indicator_code_key");
+ executeSql("ALTER TABLE organisationunit DROP CONSTRAINT organisationunit_code_key");
+
+ // add mandatory boolean field to patientattribute
+ if (executeSql("ALTER TABLE patientattribute ADD mandatory bool") >= 0) {
+ executeSql("UPDATE patientattribute SET mandatory=false");
+ }
+
+ // update periodType field to ValidationRule
+ executeSql("UPDATE validationrule SET periodtypeid = (SELECT periodtypeid FROM periodtype WHERE name='Monthly')");
+
+ // set varchar to text
+ executeSql("ALTER TABLE dataelement ALTER description TYPE text");
+ executeSql("ALTER TABLE indicator ALTER description TYPE text");
+ executeSql("ALTER TABLE datadictionary ALTER description TYPE text");
+ executeSql("ALTER TABLE validationrule ALTER description TYPE text");
+ executeSql("ALTER TABLE expression ALTER expression TYPE text");
+ executeSql("ALTER TABLE translation ALTER value TYPE text");
+
+ // orgunit shortname uniqueness
+ executeSql("ALTER TABLE organisationunit DROP CONSTRAINT organisationunit_shortname_key");
+
+ // update dataset-dataentryform association and programstage -
+ // dataentryform association
+ if (updateDataSetAssociation() && updateProgramStageAssociation()) {
+ // delete table dataentryformassociation
+ executeSql("DROP TABLE dataentryformassociation");
+ }
+
+ executeSql("ALTER TABLE section DROP CONSTRAINT section_name_key");
+
+ executeSql("UPDATE patientattribute set inheritable=false where inheritable is null");
+
+ log.info("Tables updated");
+ }
+
+ private List<Integer> getDistinctIdList(String table, String col1) {
+ StatementHolder holder = statementManager.getHolder();
+
+ List<Integer> distinctIds = new ArrayList<Integer>();
+
+ try {
+ Statement statement = holder.getStatement();
+
+ ResultSet resultSet = statement.executeQuery("SELECT DISTINCT "
+ + col1 + " FROM " + table);
+
+ while (resultSet.next()) {
+ distinctIds.add(resultSet.getInt(1));
+ }
+ } catch (Exception ex) {
+ log.error(ex);
+ } finally {
+ holder.close();
+ }
+
+ return distinctIds;
+ }
+
+ private Map<Integer, List<Integer>> getIdMap(String table, String col1,
+ String col2, List<Integer> distinctIds) {
+ StatementHolder holder = statementManager.getHolder();
+
+ Map<Integer, List<Integer>> idMap = new HashMap<Integer, List<Integer>>();
+
+ try {
+ Statement statement = holder.getStatement();
+
+ for (Integer distinctId : distinctIds) {
+ List<Integer> foreignIds = new ArrayList<Integer>();
+
+ ResultSet resultSet = statement.executeQuery("SELECT " + col2
+ + " FROM " + table + " WHERE " + col1 + "="
+ + distinctId);
+
+ while (resultSet.next()) {
+ foreignIds.add(resultSet.getInt(1));
+ }
+
+ idMap.put(distinctId, foreignIds);
+ }
+ } catch (Exception ex) {
+ log.error(ex);
+ } finally {
+ holder.close();
+ }
+
+ return idMap;
+ }
+
+ private void updateSortOrder(String table, String col1, String col2) {
+ List<Integer> distinctIds = getDistinctIdList(table, col1);
+
+ log.info("Got distinct ids: " + distinctIds.size());
+
+ Map<Integer, List<Integer>> idMap = getIdMap(table, col1, col2,
+ distinctIds);
+
+ log.info("Got id map: " + idMap.size());
+
+ for (Integer distinctId : idMap.keySet()) {
+ int sortOrder = 1;
+
+ for (Integer foreignId : idMap.get(distinctId)) {
+ String sql = "UPDATE " + table + " SET sort_order="
+ + sortOrder++ + " WHERE " + col1 + "=" + distinctId
+ + " AND " + col2 + "=" + foreignId;
+
+ int count = executeSql(sql);
+
+ log.info("Executed: " + count + " - " + sql);
+ }
+ }
+ }
+
+ private int executeSql(String sql) {
+ try {
+ return statementManager.getHolder().executeUpdate(sql);
+ } catch (Exception ex) {
+ log.debug(ex);
+
+ return -1;
+ }
+ }
+
+ private boolean updateDataSetAssociation() {
+ StatementHolder holder = statementManager.getHolder();
+
+ try {
+ Statement statement = holder.getStatement();
+
+ ResultSet isUpdated = statement
+ .executeQuery("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'dataentryformassociation'");
+
+ if (isUpdated.next()) {
+
+ ResultSet resultSet = statement
+ .executeQuery("SELECT associationid, dataentryformid FROM dataentryformassociation WHERE associationtablename = 'dataset'");
+
+ while (resultSet.next()) {
+ executeSql("UPDATE dataset SET dataentryform="
+ + resultSet.getInt(2) + " WHERE datasetid="
+ + resultSet.getInt(1));
+ }
+ return true;
+ }
+
+ return false;
+
+ } catch (Exception ex) {
+ log.error(ex);
+ return false;
+ } finally {
+ holder.close();
+ }
+
+ }
+
+ private boolean updateProgramStageAssociation() {
+ StatementHolder holder = statementManager.getHolder();
+
+ try {
+ Statement statement = holder.getStatement();
+
+ ResultSet isUpdated = statement
+ .executeQuery("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'dataentryformassociation'");
+
+ if (isUpdated.next()) {
+
+ ResultSet resultSet = statement
+ .executeQuery("SELECT associationid, dataentryformid FROM dataentryformassociation WHERE associationtablename = 'programstage'");
+
+ while (resultSet.next()) {
+ executeSql("UPDATE programstage SET dataentryform="
+ + resultSet.getInt(2) + " WHERE programstageid="
+ + resultSet.getInt(1));
+ }
+ }
+ return true;
+ } catch (Exception ex) {
+ log.error(ex);
+ return false;
+ } finally {
+ holder.close();
+ }
+
+ }
+
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java 2010-09-21 07:21:36 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java 2010-09-22 06:44:36 +0000
@@ -131,6 +131,6 @@
String searchText, int min, int max )
{
return getCriteria( Restrictions.eq( "patientAttribute", patientAttribute ),
- Restrictions.ilike( "value", "%" + searchText + "%" ) ).setProjection( Projections.property( "patient" ) ).setFirstResult( min ).setMaxResults( max ).list();
+ Restrictions.ilike( "value", "'%" + searchText + "%'" ) ).setProjection( Projections.property( "patient" ) ).setFirstResult( min ).setMaxResults( max ).list();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2010-06-23 19:59:35 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml 2010-09-22 06:44:36 +0000
@@ -17,7 +17,7 @@
<property name="mandatory" column="mandatory" not-null="true" />
- <property name="inheritable" column="inheritable" not-null="true" />
+ <property name="inheritable" column="inheritable" />
<many-to-one name="patientAttributeGroup" column="patientattributegroupid"
class="org.hisp.dhis.patient.PatientAttributeGroup"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2010-05-26 09:57:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2010-09-22 06:44:36 +0000
@@ -27,6 +27,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import static org.hisp.dhis.system.util.TextUtils.nullIfEmpty;
+
import java.util.Date;
import org.hisp.dhis.i18n.I18nFormat;
@@ -36,8 +38,6 @@
import com.opensymphony.xwork2.ActionSupport;
-import static org.hisp.dhis.system.util.TextUtils.nullIfEmpty;
-
/**
* @author Torgeir Lorange Ostby
* @version $Id: AddOrganisationUnitAction.java 1898 2006-09-22 12:06:56Z torgeilo $
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-21 07:21:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/SearchPatientAction.java 2010-09-22 06:44:36 +0000
@@ -238,9 +238,7 @@
// ---------------------------------------------------------------------
if(sortPatientAttributeId!=null)
{
-
patientAttribute = patientAttributeService.getPatientAttribute(sortPatientAttributeId);
-
}
organisationUnit = selectionManager.getSelectedOrganisationUnit();
