dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6069
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-21 14:49:13 +0100
message:
  Cleaned import-export module
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties


--
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-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java	2011-09-11 16:32:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java	2012-02-21 13:49:13 +0000
@@ -106,7 +106,6 @@
         throws ImportException
     {
         log.info( "Importing stream" );
-        state.setMessage( "Importing stream" );
 
         File tempZipFile = null;
         ZipFile zipFile = null;
@@ -150,7 +149,6 @@
         catch ( Exception ex )
         {
             log.error( ex );
-            state.setMessage( "Error processing input stream" );
             throw new ImportException( "Error processing input stream", ex );
         }
 
@@ -173,7 +171,6 @@
             else
             {
                 log.info( "Transforming stream" );
-                state.setMessage( "Transforming stream" );
                 transformOutput = File.createTempFile( "TRANSFORM_", ".xml" );
                 Source source = new StreamSource( xmlDataStream );
                 FileOutputStream transformOutStream = new FileOutputStream( transformOutput );

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2012-02-21 13:37:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2012-02-21 13:49:13 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 2.8 Version 1
+# 2.8-SNAPSHOT Version 1
 NETWORK:
 *
 CACHE:

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2011-12-14 08:10:22 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2012-02-21 13:49:13 +0000
@@ -1,12 +1,10 @@
 datavalue=Data Value
-orgunit=Organisation Unit
 import=Import
 select=Select
 period_type=Period Type
 export=Export
 action=Action
 import=Import
-preview_data=Preview data
 preview=Preview
 from=From
 to=To
@@ -17,105 +15,44 @@
 move_all=Move all
 remove_selected=Remove selected
 remove_all=Remove all
-data_values=Data values
 indicators=Indicators
-stored_by=Stored by
-timestamp=Timestamp
 datavalues=Data values
-all_periods=All
-input_periods=Input
-from_date=From date
-to_date=To date
-select_dataset_span=Select data set span
-all_datasets=All data sets
-input_datasets=Input
 available_datasets=Available Datasets
 selected_datasets=Selected Datasets
-information=Information
-available_dataelements=Available Data Elements
-selected_dataelements=Selected Data Elements
-select_dataelementgroup_all=Select Data Element Group / All
 available_indicators=Available Indicators
 selected_indicators=Selected Indicators
-select_indicatorgroup_all=Select Indicator Group / All
-available_organisationunits=Available Organisation Units
-selected_organisationunits=Selected Organisation Units
-select_organisationunit_level_all=Select Organisation Unit Level / All
 level=Level
-available_periods=Available Periods
-selected_periods=Selected Periods
-select_period_type_all=Select Period Type / All
-advanced_indicator_export=Advanced indicator export
-advanced_datavalue_export=Advanced data value export
 clear=Clear
-select_min_indicator=Select at least one indicator
-select_min_dataelement=Select at least one data element
-select_min_orgunit=Select at least one organisation unit
-select_min_period=Select at least one period
-select_period_span=Select period span
 dhis14_import=DHIS 1.4 import
-data_elements_and_indicators=Data elements and Indicators
 organisation_units=Organisation units
 periods=Periods
-data_values=Data values
-indicator_values=Indicator values
 import=Import
 importing=Importing...
 done=Done
 compare=Compare
-configure=Configure
 configuration=Configuration
 source=Source
-source_key=Source key
-country_name=Country name
-country_key=Country key
-level_names=Level names
 del=Del
 up=Up
-down=Down
-select_country=Select country
-country=Country
 specify_file=Please specify a file
-file_must_be_of_type_zip=Please specify a file of type ZIP
 data_sets=Data sets
-aggregated_data_values=Aggregated data values
-aggregated_indicator_values=Aggregated indicator values
-include_datasets=Include Datasets
 include_datavalues=Include Datavalues
 file=File
-import_options=Import Options
 elements=Elements
-strategy_unique_elements=Strategy for unique elements
-strategy_matching_elements=Strategy for matching elements
-import_unique_elements=Import unique elements
-preview_unique_elements=Preview unique elements
-skip_unique_elements=Skip unique elements
-update_matching_elements=Update matching elements
-preview_matching_elements=Preview matching elements
-skip_matching_elements=Skip matching elements
 import_preview=Import Preview
 select_none=Select none
 element=Element
 unique=Unique
 matching=Matching
-previewed_element=Previewed Element
-existing_element=Existing Element
-previewed_elements=Previewed Elements
-existing_elements=Existing Elements
 preview=Preview
 skip=Skip
 dataelement=Data element
-dataelement_group=Data element group
 indicator=Indicator
 indicator_group=Indicator group
 dataset=Dataset
 organisationunit=Organisation unit
-organisationunit_group=Organisation unit group
-element_type=Element Type
-element_status=Element Status
 data_export=DXF Datavalue Export
 metadata_export=DXF Metadata Export
-timespan=Timespan
 data_export=Data Export
 metadata_export=Metadata Export
 data_element_groups=Data element groups
@@ -124,7 +61,6 @@
 organisation_unit_groups=Organisation unit groups
 organisation_unit_group_sets=Organisation unit group sets
 export_to_other_systems=Export to other systems
-DHIS14_import=DHIS 1.4 Import
 DHIS14_metadata_export=DHIS 1.4 Metadata Export
 DHIS14_data_export=DHIS 1.4 Data Export
 accept_incoming_records=Accept incoming records
@@ -138,7 +74,6 @@
 element=Element
 objects=Objects
 discard_selected=Discard selected
-discard_type=Discard type
 discard_all=Discard all
 match_to_existing=Match to existing
 compare_to_existing=Compare to existing
@@ -151,8 +86,6 @@
 import_all=Import all
 factor=Factor
 match=Match
-leave_as_update=Leave as update
-leave_as_new=Leave as new
 discard_update=Discard update
 show_advanced_options=Show advanced options
 hide_advanced_options=Hide advanced options
@@ -162,61 +95,21 @@
 remove_all=Remove all
 pdf_metadata_export=PDF Metadata Export
 xls_metadata_export=XLS Metadata Export
-identifying_and_definitional_attributes=Identifying and Definitional attributes
-mnemonic=Mnemonic
 version=Version
-context=Context
-synonyms=Synonyms
-hononyms=Hononyms
-keywords=Keywords
 status=Status
-status_date=Status date
-data_element_type=Data element type
-textual_formula=Textual formula
-relational_and_representational_attributes=Relational and Representational attributes
-data_type=Data type
-representational_form=Representational form
-representational_layout=Representational layout
-minimum_size=Minimum size
-maximum_size=Maximum size
-data_domain=Data domain
+data_type=Data typemain
 validation_rules=Validation rules
-related_data_references=Related data references
-guide_for_use=Guide for use
-collection_methods=Collection methods
-administrative_attributes=Administrative attributes
-responsible_authority=Responsible authority
-update_rules=Update rules
-access_authority=Access authority
-update_frequency=Update frequency
-location=Location
-reporting_methods=Reporting methods
-version_status=Version status
-previous_version_references=Previous version references
-source_document=Source document
-source_organisation=Source organisation
 saved=Saved
 last_updated=Last updated
-extended_data_element=Extended data element
 validation_rule=Validation rule
 operator=Operator
-equal_to=Equal to
-not_equal_to=Not equal to
-greater_than=Greater than
-greater_than_or_equal_to=Greater than or equal to
-lesser_than=Lesser than
-lesser_than_or_equal_to=Lesser than or equal to
-organisation_unit_hierarchy=Organisation Unit Hierarchy
 data_elements=Data elements
 data_dictionary=Data dictionary
 dhis14_file_configuration=DHIS 1.4 File Configuration
 data_file=Datafile
-data_mart=Datamart
 user_name=Username
 password=Password
 levels=Levels
-data_element_concepts=Data element concepts
-configure_dhis14_import=Configure DHIS 1.4 import
 import_process_done=Import successful
 import_process_failed=Import process failed - See log for details
 importing_concepts=Importing concepts
@@ -267,12 +160,6 @@
 importing_olap_urls=Importing OLAP URLs
 importing_data_set_organisation_unit_associations=Importing data set organisation unit associations
 no_import_process_running=No import process running
-equal_to=Equal to
-not_equal_to=Not equal to
-greater_than=Greater than
-greater_than_or_equal_to=Greater than or equal to
-less_than=Less than
-less_than_or_equal_to=Less than or equal to
 skip_check_matching=Skip check for matching data values
 yes_empty_database=Yes (empty database)
 report_tables=Report tables
@@ -312,7 +199,6 @@
 unique_constraint_violations=Unique constraint violations
 entity=Entity
 value=Value
-import_contains_data_for_locked_periods=Import file contains data for locked periods
 DHIS14_file_import=DHIS 1.4 File Import
 DHIS14_xml_import=DHIS 1.4 XML Import
 DHIS14_detailed_metadata_export=DHIS 1.4 Detailed Metadata Export
@@ -326,23 +212,18 @@
 DXF=DXF
 PDF=PDF
 XLS=XLS
-olap_urls=OLAP URLs
 url=Url
-olap_url=OLAP URL
 table_name=Table name
 mode=Mode
 regression=Regression
 do_indicators=Do indicators
 do_category_option_combos=Crosstab category option combos
 do_periods=Crosstab periods
-do_organisation_units=Crosstab organisation units
 reporting_month=Reporting month
 last_3_months=Last 3 months
 last_6_months=Last 6 months
-last_9_months=Last 9 months
 last_12_months=Last 12 months
 so_far_this_year=So far this year
-so_far_this_financial_year=So far this financial year
 last_3_to_6_months=Last 3 to 6 months
 last_6_to_9_months=Last 6 to 9 months
 last_9_to_12_months=Last 9 to 12 months
@@ -355,11 +236,6 @@
 non_existing_data_element_identifiers=Non-existing data element identifiers
 formula=Formula
 identifier=Identifier
-add_selected=Add selected
-add_all=Add all
-all_data_dictionary=All / Data Dictionary
-all_data_element_group=All / Data Element Group
-all_indicator_group=All / Indicator Group
 error_data_elements_with_different_period_types=There are data elements registered for data sets with different period types, please go to data integrity checks for more information and then correct this before exporting
 data_element_group_sets=Data element group sets
 indicator_group_sets=Indicator group sets
@@ -380,7 +256,6 @@
 design=Design
 report=Report
 chart=Chart
-data_entry_forms=Data entry forms
 intro_DHIS14_xml_import=Do an import from an XML based format. DHIS 1.4 is the predecessor of DHIS 2.
 intro_DHIS14_file_import=Do an import from an Access data file. DHIS 1.4 is the predecessor of DHIS 2.
 intro_DHIS14_metadata_export=Do an export of meta-data or dimensional data describing the facts. DHIS 1.4 is the predecessor of DHIS 2.
@@ -395,4 +270,4 @@
 intro_detailed_metadata_export=Do a detailed meta data export of data elements and indicators to the DHIS 2 exchange format.
 intro_export_to_other_systems=Export data and meta data to formats such as PDF, Excel and DHIS 1.4.
 intro_dhis14_file_configuration=Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
-no_item_to_match=Sorry, there is no any selected item to match.
\ No newline at end of file
+no_item_to_match=Sorry, there is no any selected item to match
\ No newline at end of file